[PD-cvs] pd/src s_inter.c,1.5.4.10.2.8,1.5.4.10.2.9

[Thomas Grill]

Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23787/src

Modified Files:
      Tag: devel_0_39
	s_inter.c 
Log Message:
Windows: also try wish application in system path, if not found in pd distro

Index: s_inter.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_inter.c,v
retrieving revision 1.5.4.10.2.8
retrieving revision 1.5.4.10.2.9
diff -C2 -d -r1.5.4.10.2.8 -r1.5.4.10.2.9
*** s_inter.c	11 Sep 2005 12:01:48 -0000	1.5.4.10.2.8
--- s_inter.c	8 Oct 2005 07:56:54 -0000	1.5.4.10.2.9
***************
*** 1159,1174 ****
                  sprintf(portbuf, "%d", portno);
  
          strcpy(wishbuf, sys_libdir->s_name);
          strcat(wishbuf, "/" PDBINDIR WISHAPP);
          sys_bashfilename(wishbuf, wishbuf);
          
          spawnret = _spawnl(P_NOWAIT, wishbuf, WISHAPP, scriptbuf, portbuf, 0);
!         if (spawnret < 0)
!         {
!             perror("spawnl");
!             fprintf(stderr, "%s: couldn't load TCL\n", wishbuf);
!             exit(1);
!         }
  
  #endif /* MSW */
      }
--- 1159,1180 ----
                  sprintf(portbuf, "%d", portno);
  
+         /* try WISHAPP in PD path */
          strcpy(wishbuf, sys_libdir->s_name);
          strcat(wishbuf, "/" PDBINDIR WISHAPP);
+         strcat(wishbuf,WISHAPP);
          sys_bashfilename(wishbuf, wishbuf);
          
          spawnret = _spawnl(P_NOWAIT, wishbuf, WISHAPP, scriptbuf, portbuf, 0);
!         if(spawnret >= 0) goto ok;
  
+         /* try WISHAPP in system path */
+         spawnret = _spawnlp(P_NOWAIT, WISHAPP, WISHAPP, scriptbuf, portbuf, 0);
+         if(spawnret >= 0) goto ok;
+ 
+         perror("spawnl");
+         fprintf(stderr, "%s: couldn't load TCL\n", wishbuf);
+         exit(1);
+ ok:
+         ;
  #endif /* MSW */
      }