home *** CD-ROM | disk | FTP | other *** search
/ Internet Info 1994 March / Internet Info CD-ROM (Walnut Creek) (March 1994).iso / networking / info-service / gopher / Unix / gopher2.0-patches / patch2 < prev    next >
Encoding:
Text File  |  1993-08-12  |  16.1 KB  |  594 lines
  1. diff -c gopher+/conf.h:3.5 gopher+/conf.h:3.6
  2. *** gopher+/conf.h:3.5    Thu Aug 12 02:24:43 1993
  3. --- gopher+/conf.h    Thu Aug 12 02:24:43 1993
  4. ***************
  5. *** 1,7 ****
  6.   /********************************************************************
  7.    * $Author: lindner $
  8. !  * $Revision: 3.5 $
  9. !  * $Date: 1993/07/27 05:35:30 $
  10.    * $Source: /tmp_mnt/home/mudhoney/GopherSrc/CVS/gopher+/conf.h,v $
  11.    * $State: Exp $
  12.    *
  13. --- 1,7 ----
  14.   /********************************************************************
  15.    * $Author: lindner $
  16. !  * $Revision: 3.6 $
  17. !  * $Date: 1993/08/04 22:07:42 $
  18.    * $Source: /tmp_mnt/home/mudhoney/GopherSrc/CVS/gopher+/conf.h,v $
  19.    * $State: Exp $
  20.    *
  21. ***************
  22. *** 15,20 ****
  23. --- 15,23 ----
  24.    *********************************************************************
  25.    * Revision History:
  26.    * $Log: conf.h,v $
  27. +  * Revision 3.6  1993/08/04  22:07:42  lindner
  28. +  * Use /bin/mail instead of ucbmail
  29. +  *
  30.    * Revision 3.5  1993/07/27  05:35:30  lindner
  31.    * reading material for VMS, dead code removal
  32.    *
  33. ***************
  34. *** 76,85 ****
  35.   #define PLAY_COMMAND "play -v 40 -"
  36.   #endif
  37.   
  38. - #if defined(hpux) || defined(_AUX_SOURCE) || defined(_SEQUENT_) || defined(USG)
  39. - #define MAIL_COMMAND "mailx"
  40. - #endif
  41. - 
  42.   #if defined(REMOTEUSER)
  43.   #define PAGER_COMMAND "Less -f -r"
  44.   #endif
  45. --- 79,84 ----
  46. ***************
  47. *** 131,137 ****
  48.   #endif
  49.   
  50.   #ifndef MAIL_COMMAND
  51. ! #define MAIL_COMMAND "mail"
  52.   #endif
  53.   
  54.   #ifndef TELNET_COMMAND
  55. --- 130,136 ----
  56.   #endif
  57.   
  58.   #ifndef MAIL_COMMAND
  59. ! #define MAIL_COMMAND "/bin/mail"
  60.   #endif
  61.   
  62.   #ifndef TELNET_COMMAND
  63. diff -c gopher+/doc/client.changes:3.6 gopher+/doc/client.changes:3.7
  64. *** gopher+/doc/client.changes:3.6    Thu Aug 12 02:24:46 1993
  65. --- gopher+/doc/client.changes    Thu Aug 12 02:24:46 1993
  66. ***************
  67. *** 1,4 ****
  68. ! $Id: client.changes,v 3.6 1993/08/03 21:02:03 lindner Exp $
  69.   
  70.   Gopher+2.0 patchlevel 1
  71.   -----------------------
  72. --- 1,14 ----
  73. ! $Id: client.changes,v 3.7 1993/08/04 22:23:41 lindner Exp $
  74. ! 
  75. ! Gopher+2.0 patchlevel 2
  76. ! -----------------------
  77. ! 
  78. !  * Use /bin/mail instead of ucbmail
  79. ! 
  80. !  * Rebuild client if patchlevel.h changes
  81. ! 
  82. !  * Fix for problems with '=' and '?' and /bin/mail Gripe mods
  83. ! 
  84.   
  85.   Gopher+2.0 patchlevel 1
  86.   -----------------------
  87. diff -c gopher+/doc/server.changes:3.6 gopher+/doc/server.changes:3.7
  88. *** gopher+/doc/server.changes:3.6    Thu Aug 12 02:24:47 1993
  89. --- gopher+/doc/server.changes    Thu Aug 12 02:24:48 1993
  90. ***************
  91. *** 1,4 ****
  92. ! $Id: server.changes,v 3.6 1993/08/03 21:03:45 lindner Exp $
  93.   
  94.   
  95.   Gopher 2.0 patchlevel 1
  96. --- 1,11 ----
  97. ! $Id: server.changes,v 3.7 1993/08/04 22:23:45 lindner Exp $
  98. ! 
  99. ! Gopher 2.0 patchlevel 2
  100. ! -----------------------
  101. ! 
  102. !  * Rebuild server if patchlevel.h changes
  103. ! 
  104. !  * Mods to use secure popen
  105.   
  106.   
  107.   Gopher 2.0 patchlevel 1
  108. diff -c gopher+/gopher/Makefile:3.4 gopher+/gopher/Makefile:3.5
  109. *** gopher+/gopher/Makefile:3.4    Thu Aug 12 02:24:51 1993
  110. --- gopher+/gopher/Makefile    Thu Aug 12 02:24:51 1993
  111. ***************
  112. *** 1,7 ****
  113.   #********************************************************************
  114.   # $Author: lindner $
  115. ! # $Revision: 3.4 $
  116. ! # $Date: 1993/07/27 05:28:45 $
  117.   # $Source: /tmp_mnt/home/mudhoney/GopherSrc/CVS/gopher+/gopher/Makefile,v $
  118.   # $State: Exp $
  119.   #
  120. --- 1,7 ----
  121.   #********************************************************************
  122.   # $Author: lindner $
  123. ! # $Revision: 3.5 $
  124. ! # $Date: 1993/08/04 22:06:35 $
  125.   # $Source: /tmp_mnt/home/mudhoney/GopherSrc/CVS/gopher+/gopher/Makefile,v $
  126.   # $State: Exp $
  127.   #
  128. ***************
  129. *** 15,20 ****
  130. --- 15,23 ----
  131.   #*********************************************************************
  132.   # Revision History:
  133.   # $Log: Makefile,v $
  134. + # Revision 3.5  1993/08/04  22:06:35  lindner
  135. + # Rebuild client if patchlevel.h changes
  136. + #
  137.   # Revision 3.4  1993/07/27  05:28:45  lindner
  138.   # Mondo Debug overhaul from Mitra
  139.   #
  140. ***************
  141. *** 76,78 ****
  142. --- 79,83 ----
  143.   
  144.   $(OBJS): gopher.h ../conf.h
  145.   globals.o: globals.h
  146. + gopherrc.o: ../patchlevel.h
  147. + manager.o: ../patchlevel.h
  148. diff -c gopher+/gopher/gopher.c:3.25 gopher+/gopher/gopher.c:3.26
  149. *** gopher+/gopher/gopher.c:3.25    Thu Aug 12 02:24:52 1993
  150. --- gopher+/gopher/gopher.c    Thu Aug 12 02:24:52 1993
  151. ***************
  152. *** 1,7 ****
  153.   /********************************************************************
  154.    * $Author: lindner $
  155. !  * $Revision: 3.25 $
  156. !  * $Date: 1993/08/03 20:48:27 $
  157.    * $Source: /tmp_mnt/home/mudhoney/GopherSrc/CVS/gopher+/gopher/gopher.c,v $
  158.    * $State: Exp $
  159.    *
  160. --- 1,7 ----
  161.   /********************************************************************
  162.    * $Author: lindner $
  163. !  * $Revision: 3.26 $
  164. !  * $Date: 1993/08/04 22:08:47 $
  165.    * $Source: /tmp_mnt/home/mudhoney/GopherSrc/CVS/gopher+/gopher/gopher.c,v $
  166.    * $State: Exp $
  167.    *
  168. ***************
  169. *** 15,20 ****
  170. --- 15,23 ----
  171.    *********************************************************************
  172.    * Revision History:
  173.    * $Log: gopher.c,v $
  174. +  * Revision 3.26  1993/08/04  22:08:47  lindner
  175. +  * Fix for problems with '=' and '?' and /bin/mail Gripe mods
  176. +  *
  177.    * Revision 3.25  1993/08/03  20:48:27  lindner
  178.    * Audio file fix from jqj
  179.    *
  180. ***************
  181. *** 273,281 ****
  182.         return;
  183.        }
  184.   
  185. !      sprintf(mailcmd, "%s -s \"%s\" %s", MAIL_COMMAND, gripemess[0], email);
  186.        
  187.        f = popen(mailcmd, "w");
  188.        for (i=1; i< 10; i++) {
  189.         fprintf(f, "%s\n", gripemess[i]);
  190.         free(gripemess[i]);
  191. --- 276,290 ----
  192.         return;
  193.        }
  194.   
  195. !      sprintf(mailcmd, "%s %s", MAIL_COMMAND, email);
  196.        
  197.        f = popen(mailcmd, "w");
  198. +      if (f == NULL) {
  199. +       CursesErrorMsg("Cannot send mail...");
  200. +       return;
  201. +      }
  202. + 
  203. +      fprintf(f, "Subject: %s\n\n", gripemess[0]);
  204.        for (i=1; i< 10; i++) {
  205.         fprintf(f, "%s\n", gripemess[i]);
  206.         free(gripemess[i]);
  207. ***************
  208. *** 519,525 ****
  209.        char    *view = NULL;
  210.        boolean WritePipe = FALSE,
  211.                ForkOff   = FALSE;
  212. !      boolean GS2FileSucceeded;
  213.        int     Child;
  214.   
  215.        DebugGSplusPrint(ZeGopher, "showfile:start");
  216. --- 528,534 ----
  217.        char    *view = NULL;
  218.        boolean WritePipe = FALSE,
  219.                ForkOff   = FALSE;
  220. !      boolean GS2FileSucceeded = TRUE;
  221.        int     Child;
  222.   
  223.        DebugGSplusPrint(ZeGopher, "showfile:start");
  224. diff -c gopher+/gopher/ourutils.c:3.18 gopher+/gopher/ourutils.c:3.19
  225. *** gopher+/gopher/ourutils.c:3.18    Thu Aug 12 02:24:53 1993
  226. --- gopher+/gopher/ourutils.c    Thu Aug 12 02:24:54 1993
  227. ***************
  228. *** 1,7 ****
  229.   /********************************************************************
  230.    * $Author: lindner $
  231. !  * $Revision: 3.18 $
  232. !  * $Date: 1993/08/03 04:43:59 $
  233.    * $Source: /tmp_mnt/home/mudhoney/GopherSrc/CVS/gopher+/gopher/ourutils.c,v $
  234.    * $State: Exp $
  235.    *
  236. --- 1,7 ----
  237.   /********************************************************************
  238.    * $Author: lindner $
  239. !  * $Revision: 3.19 $
  240. !  * $Date: 1993/08/04 22:07:23 $
  241.    * $Source: /tmp_mnt/home/mudhoney/GopherSrc/CVS/gopher+/gopher/ourutils.c,v $
  242.    * $State: Exp $
  243.    *
  244. ***************
  245. *** 15,20 ****
  246. --- 15,23 ----
  247.    *********************************************************************
  248.    * Revision History:
  249.    * $Log: ourutils.c,v $
  250. +  * Revision 3.19  1993/08/04  22:07:23  lindner
  251. +  * Use /bin/mail instead of ucbmail
  252. +  *
  253.    * Revision 3.18  1993/08/03  04:43:59  lindner
  254.    * Fix for VMS unresolved variables
  255.    *
  256. ***************
  257. *** 167,172 ****
  258. --- 170,177 ----
  259.   {
  260.        static char *SaveName = NULL;
  261.        char command[512];
  262. +      FILE *infile, *mailit;
  263. +      char buf[512];
  264.        
  265.        if (SaveName==NULL) {
  266.         if ((SaveName = (char *) malloc(sizeof(char)*256)) == NULL)
  267. ***************
  268. *** 200,210 ****
  269.   #ifdef VMS
  270.        sprintf(command, "%s/subject=\"%s\" %s %s", 
  271.              MAIL_COMMAND, Realname, Filename, SaveName);
  272.   #else
  273. !      sprintf(command, "%s -s \"%s\" %s < %s", 
  274. !          MAIL_COMMAND, Realname, SaveName, Filename);
  275.   #endif
  276. -      system(command);
  277.   
  278.   }
  279.   
  280. --- 205,229 ----
  281.   #ifdef VMS
  282.        sprintf(command, "%s/subject=\"%s\" %s %s", 
  283.              MAIL_COMMAND, Realname, Filename, SaveName);
  284. +      system(command);
  285.   #else
  286. !      sprintf(command, "%s %s", 
  287. !          MAIL_COMMAND, SaveName);
  288. !      
  289. !      infile = fopen(Filename, "r");
  290. !      mailit = popen(command, "w");
  291. !      
  292. !      fprintf(mailit, "Subject: %s\n\n", Realname);
  293. ! 
  294. !      while (readline(fileno(infile), buf, sizeof(buf))) {
  295. !       twirl();
  296. !       fprintf(mailit, "%s", buf);
  297. !      }
  298. ! 
  299. !      pclose(mailit);
  300. !      fclose(infile);
  301. ! 
  302.   #endif
  303.   
  304.   }
  305.   
  306. diff -c gopher+/gopherd/Makefile:3.5 gopher+/gopherd/Makefile:3.6
  307. *** gopher+/gopherd/Makefile:3.5    Thu Aug 12 02:24:57 1993
  308. --- gopher+/gopherd/Makefile    Thu Aug 12 02:24:57 1993
  309. ***************
  310. *** 1,7 ****
  311.   #********************************************************************
  312.   # $Author: lindner $
  313. ! # $Revision: 3.5 $
  314. ! # $Date: 1993/07/27 05:27:34 $
  315.   # $Source: /tmp_mnt/home/mudhoney/GopherSrc/CVS/gopher+/gopherd/Makefile,v $
  316.   # $State: Exp $
  317.   #
  318. --- 1,7 ----
  319.   #********************************************************************
  320.   # $Author: lindner $
  321. ! # $Revision: 3.6 $
  322. ! # $Date: 1993/08/04 22:12:01 $
  323.   # $Source: /tmp_mnt/home/mudhoney/GopherSrc/CVS/gopher+/gopherd/Makefile,v $
  324.   # $State: Exp $
  325.   #
  326. ***************
  327. *** 15,20 ****
  328. --- 15,23 ----
  329.   #*********************************************************************
  330.   # Revision History:
  331.   # $Log: Makefile,v $
  332. + # Revision 3.6  1993/08/04  22:12:01  lindner
  333. + # Rebuild server if patchlevel.h changes
  334. + #
  335.   # Revision 3.5  1993/07/27  05:27:34  lindner
  336.   # Mondo Debug overhaul from Mitra
  337.   #
  338. ***************
  339. *** 101,107 ****
  340.   waisgopher.o: waisgopher.c
  341.       $(CC) $(CCFLAGS) -c waisgopher.c
  342.   
  343. ! gopherd.o: gopherd.c
  344.       $(CC) $(CCFLAGS) -DCONF_FILE=\"$(SERVERDIR)/gopherd.conf\" -c gopherd.c
  345.   
  346.   
  347. --- 104,110 ----
  348.   waisgopher.o: waisgopher.c
  349.       $(CC) $(CCFLAGS) -c waisgopher.c
  350.   
  351. ! gopherd.o: gopherd.c ../patchlevel.h
  352.       $(CC) $(CCFLAGS) -DCONF_FILE=\"$(SERVERDIR)/gopherd.conf\" -c gopherd.c
  353.   
  354.   
  355. diff -c gopher+/gopherd/globals.h:3.5 gopher+/gopherd/globals.h:3.6
  356. *** gopher+/gopherd/globals.h:3.5    Thu Aug 12 02:24:57 1993
  357. --- gopher+/gopherd/globals.h    Thu Aug 12 02:24:58 1993
  358. ***************
  359. *** 1,7 ****
  360.   /********************************************************************
  361.    * $Author: lindner $
  362. !  * $Revision: 3.5 $
  363. !  * $Date: 1993/07/27 05:27:44 $
  364.    * $Source: /tmp_mnt/home/mudhoney/GopherSrc/CVS/gopher+/gopherd/globals.h,v $
  365.    * $State: Exp $
  366.    *
  367. --- 1,7 ----
  368.   /********************************************************************
  369.    * $Author: lindner $
  370. !  * $Revision: 3.6 $
  371. !  * $Date: 1993/08/04 22:12:37 $
  372.    * $Source: /tmp_mnt/home/mudhoney/GopherSrc/CVS/gopher+/gopherd/globals.h,v $
  373.    * $State: Exp $
  374.    *
  375. ***************
  376. *** 15,20 ****
  377. --- 15,23 ----
  378.    *********************************************************************
  379.    * Revision History:
  380.    * $Log: globals.h,v $
  381. +  * Revision 3.6  1993/08/04  22:12:37  lindner
  382. +  * Mods to use Gpopen
  383. +  *
  384.    * Revision 3.5  1993/07/27  05:27:44  lindner
  385.    * Mondo Debug overhaul from Mitra
  386.    *
  387. ***************
  388. *** 103,108 ****
  389. --- 106,112 ----
  390.   void send_binary();
  391.   FILE *specialfile();
  392.   char *fixfile();
  393. + FILE *Gpopen();
  394.   
  395.   /*** From index.c ***/
  396.   void NeXTIndexQuery();
  397. diff -c gopher+/gopherd/index.c:3.7 gopher+/gopherd/index.c:3.8
  398. *** gopher+/gopherd/index.c:3.7    Thu Aug 12 02:24:58 1993
  399. --- gopher+/gopherd/index.c    Thu Aug 12 02:24:59 1993
  400. ***************
  401. *** 1,7 ****
  402.   /********************************************************************
  403.    * $Author: lindner $
  404. !  * $Revision: 3.7 $
  405. !  * $Date: 1993/07/27 05:27:50 $
  406.    * $Source: /tmp_mnt/home/mudhoney/GopherSrc/CVS/gopher+/gopherd/index.c,v $
  407.    * $State: Exp $
  408.    *
  409. --- 1,7 ----
  410.   /********************************************************************
  411.    * $Author: lindner $
  412. !  * $Revision: 3.8 $
  413. !  * $Date: 1993/08/04 22:12:43 $
  414.    * $Source: /tmp_mnt/home/mudhoney/GopherSrc/CVS/gopher+/gopherd/index.c,v $
  415.    * $State: Exp $
  416.    *
  417. ***************
  418. *** 15,20 ****
  419. --- 15,23 ----
  420.    *********************************************************************
  421.    * Revision History:
  422.    * $Log: index.c,v $
  423. +  * Revision 3.8  1993/08/04  22:12:43  lindner
  424. +  * Mods to use Gpopen
  425. +  *
  426.    * Revision 3.7  1993/07/27  05:27:50  lindner
  427.    * Mondo Debug overhaul from Mitra
  428.    *
  429. ***************
  430. *** 309,315 ****
  431.        sprintf(command, "egrep \"%s\" \"%s\"/*", Searchstr, Indexdir);
  432.        Debug("Grep command is %s\n", command);
  433.   
  434. !      moocow = popen(command, "r");
  435.        
  436.        if (moocow == NULL) {
  437.         writestring(sockfd, ".\r\n");
  438. --- 312,318 ----
  439.        sprintf(command, "egrep \"%s\" \"%s\"/*", Searchstr, Indexdir);
  440.        Debug("Grep command is %s\n", command);
  441.   
  442. !      moocow = Gpopen(command, "r");
  443.        
  444.        if (moocow == NULL) {
  445.         writestring(sockfd, ".\r\n");
  446. diff -c gopher+/gopherd/serverutil.c:3.8 gopher+/gopherd/serverutil.c:3.10
  447. *** gopher+/gopherd/serverutil.c:3.8    Thu Aug 12 02:24:59 1993
  448. --- gopher+/gopherd/serverutil.c    Thu Aug 12 02:25:00 1993
  449. ***************
  450. *** 1,7 ****
  451.   /********************************************************************
  452.    * $Author: lindner $
  453. !  * $Revision: 3.8 $
  454. !  * $Date: 1993/07/27 05:27:56 $
  455.    * $Source: /tmp_mnt/home/mudhoney/GopherSrc/CVS/gopher+/gopherd/serverutil.c,v $
  456.    * $State: Exp $
  457.    *
  458. --- 1,7 ----
  459.   /********************************************************************
  460.    * $Author: lindner $
  461. !  * $Revision: 3.10 $
  462. !  * $Date: 1993/08/04 22:14:51 $
  463.    * $Source: /tmp_mnt/home/mudhoney/GopherSrc/CVS/gopher+/gopherd/serverutil.c,v $
  464.    * $State: Exp $
  465.    *
  466. ***************
  467. *** 15,20 ****
  468. --- 15,26 ----
  469.    *********************************************************************
  470.    * Revision History:
  471.    * $Log: serverutil.c,v $
  472. +  * Revision 3.10  1993/08/04  22:14:51  lindner
  473. +  * Mods to use Gpopen
  474. +  *
  475. +  * Revision 3.9  1993/08/04  22:12:48  lindner
  476. +  * Mods to use Gpopen
  477. +  *
  478.    * Revision 3.8  1993/07/27  05:27:56  lindner
  479.    * Mondo Debug overhaul from Mitra
  480.    *
  481. ***************
  482. *** 471,473 ****
  483. --- 477,534 ----
  484.        ;
  485.   }
  486.   
  487. + FILE*
  488. + Gpopen(cmd, rw)
  489. +   char *cmd;
  490. +   char *rw;
  491. + {
  492. +      int inquote = 0;
  493. +      int i;
  494. + 
  495. +      /** Strip out the naughty bits..  **/
  496. +      for (i=0; cmd[i] != '\0'; i++) {
  497. +       switch (cmd[i]) {
  498. +       case '"':
  499. +            inquote = 1-inquote;
  500. +            break;
  501. +            
  502. +       case '*':
  503. +       case '&':
  504. +       case '|':
  505. +       case ';':
  506. +       case '=':
  507. +       case '?':
  508. +       case '<':
  509. +       case '>':
  510. +       case '!':
  511. +       case '(':
  512. +       case ')':
  513. +       case '{':
  514. +       case '}':
  515. +       case '[':
  516. +       case ']':
  517. +       case '^':
  518. +            /*** Stuff that's okay if quoted.. ***/
  519. + 
  520. +            if (!inquote) {
  521. +             LOGGopher("Possible Security Violation '%s'", cmd);
  522. +             return(NULL);
  523. +            }
  524. +            
  525. +            break;
  526. + 
  527. +       case '\\':
  528. +       case '`':
  529. +       case '\n':
  530. +       case '$':
  531. +            /*** Stuff that shouldn't be in there at all! **/
  532. + 
  533. +            LOGGopher("Possible Security Violation '%s'", cmd);
  534. +            return(NULL);
  535. + 
  536. +            break;
  537. +       }
  538. +      }
  539. + 
  540. +      return(popen(cmd, rw));
  541. + }
  542. diff -c gopher+/gopherd/special.c:3.9 gopher+/gopherd/special.c:3.11
  543. *** gopher+/gopherd/special.c:3.9    Thu Aug 12 02:25:00 1993
  544. --- gopher+/gopherd/special.c    Thu Aug 12 02:25:01 1993
  545. ***************
  546. *** 1,7 ****
  547.   /********************************************************************
  548.    * $Author: lindner $
  549. !  * $Revision: 3.9 $
  550. !  * $Date: 1993/07/27 05:27:59 $
  551.    * $Source: /tmp_mnt/home/mudhoney/GopherSrc/CVS/gopher+/gopherd/special.c,v $
  552.    * $State: Exp $
  553.    *
  554. --- 1,7 ----
  555.   /********************************************************************
  556.    * $Author: lindner $
  557. !  * $Revision: 3.11 $
  558. !  * $Date: 1993/08/04 22:14:54 $
  559.    * $Source: /tmp_mnt/home/mudhoney/GopherSrc/CVS/gopher+/gopherd/special.c,v $
  560.    * $State: Exp $
  561.    *
  562. ***************
  563. *** 15,20 ****
  564. --- 15,26 ----
  565.    *********************************************************************
  566.    * Revision History:
  567.    * $Log: special.c,v $
  568. +  * Revision 3.11  1993/08/04  22:14:54  lindner
  569. +  * Mods to use Gpopen
  570. +  *
  571. +  * Revision 3.10  1993/08/04  22:12:51  lindner
  572. +  * Mods to use Gpopen
  573. +  *
  574.    * Revision 3.9  1993/07/27  05:27:59  lindner
  575.    * Mondo Debug overhaul from Mitra
  576.    *
  577. ***************
  578. *** 150,156 ****
  579.         
  580.         Debug("Executing %s\n", buf);
  581.   
  582. !       if (! (pp = popen(buf, "r")))
  583.              return (FILE *)0;
  584.         ispipe = 1;
  585.         
  586. --- 156,162 ----
  587.         
  588.         Debug("Executing %s\n", buf);
  589.   
  590. !       if (! (pp = Gpopen(buf, "r")))
  591.              return (FILE *)0;
  592.         ispipe = 1;
  593.         
  594.