diff -c gopher+/patchlevel.h:3.2 gopher+/patchlevel.h:3.3 *** gopher+/patchlevel.h:3.2 Tue Aug 3 16:08:18 1993 --- gopher+/patchlevel.h Tue Aug 3 16:08:19 1993 *************** *** 5,8 **** #define GOPHER_MAJOR_VERSION "2" #define GOPHER_MINOR_VERSION "0" ! #define PATCHLEVEL 0 --- 5,8 ---- #define GOPHER_MAJOR_VERSION "2" #define GOPHER_MINOR_VERSION "0" ! #define PATCHLEVEL 1 diff -c gopher+/doc/client.changes:3.5 gopher+/doc/client.changes:3.6 *** gopher+/doc/client.changes:3.5 Tue Aug 3 16:08:20 1993 --- gopher+/doc/client.changes Tue Aug 3 16:08:20 1993 *************** *** 1,4 **** ! $Id: client.changes,v 3.5 1993/07/30 17:27:31 lindner Exp $ * Client supports AskL: and AskP: --- 1,23 ---- ! $Id: client.changes,v 3.6 1993/08/03 21:02:03 lindner Exp $ ! ! Gopher+2.0 patchlevel 1 ! ----------------------- ! ! * Bigger Better Badder Options, inspired by jqj ! ! * Audio file fix from jqj ! ! * Don't allow securemode types to use o ! ! * Bigger Better Badder Options, inspired by jqj ! ! * Fix for VMS unresolved variables ! ! * Change audio/mulaw to audio/basic for MIME ! ! ! Gopher+2.0 ! ---------- * Client supports AskL: and AskP: diff -c gopher+/doc/server.changes:3.5 gopher+/doc/server.changes:3.6 *** gopher+/doc/server.changes:3.5 Tue Aug 3 16:08:21 1993 --- gopher+/doc/server.changes Tue Aug 3 16:08:21 1993 *************** *** 1,7 **** ! $Id: server.changes,v 3.5 1993/07/30 17:27:42 lindner Exp $ ! Changes from 1.2b4 to ? ----------------------- * Debugging can be compiled out, resulting in a smaller executable. (Mitra) --- 1,25 ---- ! $Id: server.changes,v 3.6 1993/08/03 21:03:45 lindner Exp $ ! ! Gopher 2.0 patchlevel 1 ----------------------- + + * Fix for VMS unresolved variables + + * Fix for core dumps on HPUX 8.0 + + * Ignored files are now ignored again + + * Fix for sites that have @ -> for symbolic links + + * Fix for extra slashes in FTP gateway + + * Fix for Debug syntax error when using DL + + * Compatibility fix for hpux and seteguid + + Changes from 1.2b4 to 2.0 + ------------------------- * Debugging can be compiled out, resulting in a smaller executable. (Mitra) diff -c gopher+/gopher/globals.h:3.7 gopher+/gopher/globals.h:3.9 *** gopher+/gopher/globals.h:3.7 Tue Aug 3 16:08:23 1993 --- gopher+/gopher/globals.h Tue Aug 3 16:08:23 1993 *************** *** 1,7 **** /******************************************************************** * $Author: lindner $ ! * $Revision: 3.7 $ ! * $Date: 1993/07/27 05:28:46 $ * $Source: /export/mudhoney/GopherSrc/CVS/gopher+/gopher/globals.h,v $ * $State: Exp $ * --- 1,7 ---- /******************************************************************** * $Author: lindner $ ! * $Revision: 3.9 $ ! * $Date: 1993/08/03 20:48:21 $ * $Source: /export/mudhoney/GopherSrc/CVS/gopher+/gopher/globals.h,v $ * $State: Exp $ * *************** *** 15,20 **** --- 15,26 ---- ********************************************************************* * Revision History: * $Log: globals.h,v $ + * Revision 3.9 1993/08/03 20:48:21 lindner + * Audio file fix from jqj + * + * Revision 3.8 1993/08/03 20:24:16 lindner + * Bigger Better Badder Options, inspired by jqj + * * Revision 3.7 1993/07/27 05:28:46 lindner * Mondo Debug overhaul from Mitra * *************** *** 55,61 **** #include ! #define MAXRESP 9 /* Max size of a response list*/ #define WHOLELINE 80 /* Used in ourutil.c */ /* --- 61,67 ---- #include ! #define MAXRESP 20 /* Max size of a response list*/ #define WHOLELINE 80 /* Used in ourutil.c */ /* *************** *** 75,90 **** /*** Global variables ***/ EXTERN RCobj *GlobalRC; - - EXTERN String *PrinterCommand; /*used for configuration options */ - EXTERN String *PagerCommand; - EXTERN String *TelnetCommand; - EXTERN String *MailCommand; - EXTERN String *PlayCommand; - EXTERN String *EditorCommand; - EXTERN String *TN3270Command; - EXTERN String *MIMECommand; - EXTERN String *ImageCommand; EXTERN boolean ChangedDefs INIT(FALSE); --- 81,86 ---- diff -c gopher+/gopher/gopher.c:3.21 gopher+/gopher/gopher.c:3.25 *** gopher+/gopher/gopher.c:3.21 Tue Aug 3 16:08:24 1993 --- gopher+/gopher/gopher.c Tue Aug 3 16:08:24 1993 *************** *** 1,7 **** /******************************************************************** * $Author: lindner $ ! * $Revision: 3.21 $ ! * $Date: 1993/07/30 17:37:24 $ * $Source: /export/mudhoney/GopherSrc/CVS/gopher+/gopher/gopher.c,v $ * $State: Exp $ * --- 1,7 ---- /******************************************************************** * $Author: lindner $ ! * $Revision: 3.25 $ ! * $Date: 1993/08/03 20:48:27 $ * $Source: /export/mudhoney/GopherSrc/CVS/gopher+/gopher/gopher.c,v $ * $State: Exp $ * *************** *** 15,20 **** --- 15,32 ---- ********************************************************************* * Revision History: * $Log: gopher.c,v $ + * Revision 3.25 1993/08/03 20:48:27 lindner + * Audio file fix from jqj + * + * Revision 3.24 1993/08/03 20:26:50 lindner + * Don't allow securemode types to use o + * + * Revision 3.23 1993/08/03 20:24:18 lindner + * Bigger Better Badder Options, inspired by jqj + * + * Revision 3.22 1993/08/03 04:43:56 lindner + * Fix for VMS unresolved variables + * * Revision 3.21 1993/07/30 17:37:24 lindner * SecureMode fix from Mitra * *************** *** 322,329 **** FILE *Play; int j; char buf[BUFSIZE]; ! if (*STRget(PlayCommand) == '\0') { /*** Hey! no play command, bummer ***/ CursesErrorMsg("Sorry, this machine doesn't support sounds"); --- 334,342 ---- FILE *Play; int j; char buf[BUFSIZE]; + char playCmd[BUFSIZE]; ! if (! RCdisplayCommand(GlobalRC, "Audio/basic", "-", playCmd)) { /*** Hey! no play command, bummer ***/ CursesErrorMsg("Sorry, this machine doesn't support sounds"); *************** *** 330,336 **** return; } ! Play = popen(STRget(PlayCommand), "w"); while(1) { --- 343,349 ---- return; } ! Play = popen(playCmd, "w"); while(1) { *************** *** 648,654 **** --- 661,674 ---- } + #ifdef VMS + #include + #else extern int h_errno; + extern int sys_nerr; + extern char *sys_errlist[]; + extern int errno; + #endif void check_sock(sockfd, host, port) int sockfd; *************** *** 659,668 **** char DispString2[WHOLELINE]; char *DispStrings[4]; - extern int sys_nerr; - extern char *sys_errlist[]; - extern int errno; - /* NULL DispStrings entries here, so can override below */ DispStrings[3] = NULL; --- 679,684 ---- *************** *** 833,841 **** GlobalRC = RCnew(); - PrinterCommand = STRnew(); - MIMECommand = STRnew(); - /** get defaults from the rc file **/ RCfromUser(GlobalRC); --- 849,854 ---- *************** *** 879,893 **** static char *OptionMenu[] = {"General Options", ! "Helper Applications", ! "Change Printer" }; ! static char *GlobalOptions[] = ! {"Pager Command", "Print Command", "Telnet Command", "Sound Command", "Mail Command", "3270 Emulator Command", "MIME pager", "Image Viewer", NULL}; void SetOptions() --- 892,918 ---- + /* + * This stuff will set the options in a nice way... + */ + static char *OptionMenu[] = {"General Options", ! "Edit Display Applications", ! "Edit Printing Applications", ! "Add a New Application Type", ! NULL }; ! static char *OptionNewApp[] = ! {"Content Type Name", ! "Display Application", ! "Printing Application", ! NULL ! }; ! + static char *GlobalOptions[MAXRESP]; void SetOptions() *************** *** 894,900 **** --- 919,930 ---- { static char *Responses[MAXRESP]; static int inited = FALSE; + char *zetitle; + int i, choice; + RCMapObj *rcm; + int numoptions; + if (SecureMode || NoShellMode) { CursesErrorMsg("Sorry, you are not allowed to set options in secure mode."); return; *************** *** 902,910 **** if (inited == FALSE) { - int i; ! for (i=0; i< 8; i++) { Responses[i] = (char *) malloc(sizeof(char) * MAXSTR); } Responses[i] = NULL; --- 932,939 ---- if (inited == FALSE) { ! for (i=0; i< MAXRESP; i++) { Responses[i] = (char *) malloc(sizeof(char) * MAXSTR); } Responses[i] = NULL; *************** *** 913,944 **** /** Options menu **/ - ! strcpy(Responses[0], ""); ! strcpy(Responses[1], STRget(PrinterCommand)); ! strcpy(Responses[2], STRget(TelnetCommand)); ! strcpy(Responses[3], STRget(PlayCommand)); ! strcpy(Responses[4], STRget(MailCommand)); ! strcpy(Responses[5], STRget(TN3270Command)); ! strcpy(Responses[6], STRget(MIMECommand)); ! strcpy(Responses[7], STRget(ImageCommand)); ! ! if (CURRequest(CursesScreen, "Options", GlobalOptions, Responses) == 0) { ! STRset(PrinterCommand, Responses[1]); ! STRset(TelnetCommand, Responses[2]); ! STRset(PlayCommand, Responses[3]); ! STRset(MailCommand, Responses[4]); ! STRset(TN3270Command, Responses[5]); ! STRset(MIMECommand, Responses[6]); ! STRset(ImageCommand, Responses[7]); ! ChangedDefs = TRUE; ! } } GopherDirObj * GDdeleteGS(gd,j) GopherDirObj *gd; --- 942,1026 ---- /** Options menu **/ + choice = CURChoice(CursesScreen, "Gopher Options", OptionMenu, + "Your Choice?", -1); ! if (choice == -1) ! return; ! switch (choice) { ! ! case 0: ! /** General Options **/ ! CursesErrorMsg("Sorry, no general options.... yet"); ! break; ! ! case 1: ! case 2: ! /** Display/Print Applications **/ ! numoptions = RCMAgetNumEntries(GlobalRC->commands); ! if (numoptions >= MAXRESP) ! numoptions = MAXRESP - 1; ! for (i = 0 ; icommands, i); ! GlobalOptions[i] = RCMgetView(rcm); ! if (choice == 1) ! strcpy(Responses[i], RCMgetDisplaycmd(rcm)); ! else if (choice ==2) ! strcpy(Responses[i], RCMgetPrintcmd(rcm)); ! } ! GlobalOptions[i] = NULL; ! ! if (choice == 1) ! zetitle = "Edit Display Applications"; ! else if (choice == 2) ! zetitle = "Edit Printing Applications"; ! ! if (CURRequest(CursesScreen, zetitle, GlobalOptions, ! Responses) == 0) { ! char tmpstr[512]; ! ! while (i-- > 0) { ! rcm = RCMAgetEntry(GlobalRC->commands, i); ! if (choice == 1) ! /** Display Applications **/ ! sprintf(tmpstr, "%s,%s,%s", GlobalOptions[i], ! Responses[i], RCMgetPrintcmd(rcm)); ! else ! /** Print Applications **/ ! sprintf(tmpstr, "%s,%s,%s", GlobalOptions[i], ! RCMgetDisplaycmd(rcm), Responses[i]); ! ! RCMAfromLine(GlobalRC->commands, tmpstr); ! } ! ChangedDefs = TRUE; ! } ! break; ! case 3: ! /** Add a new application **/ ! ! for (i=0; i < MAXRESP; i++) ! if (Responses[i] != NULL) ! *(Responses[i]) = '\0'; ! ! if (CURRequest(CursesScreen, "Add a new Application Type", ! OptionNewApp, Responses) == 0) { ! char tmpstr[512]; ! ! sprintf(tmpstr, "%s,%s,%s", Responses[0], Responses[1], ! Responses[2]); ! RCMAfromLine(GlobalRC->commands, tmpstr); ! ChangedDefs = TRUE; ! } ! break; ! ! } /** End of switch on option type **/ } + + GopherDirObj * GDdeleteGS(gd,j) GopherDirObj *gd; *************** *** 1248,1253 **** --- 1330,1340 ---- char *prompts[4]; char *responses[4]; int i; + + if (SecureMode) { + CursesErrorMsg("Sorry, you're not allowed to do this"); + break; + } prompts[0]="Hostname"; prompts[1]="Port"; diff -c gopher+/gopher/gopherrc.c:3.10 gopher+/gopher/gopherrc.c:3.11 *** gopher+/gopher/gopherrc.c:3.10 Tue Aug 3 16:08:25 1993 --- gopher+/gopher/gopherrc.c Tue Aug 3 16:08:27 1993 *************** *** 1,7 **** /******************************************************************** * $Author: lindner $ ! * $Revision: 3.10 $ ! * $Date: 1993/07/29 17:23:41 $ * $Source: /export/mudhoney/GopherSrc/CVS/gopher+/gopher/gopherrc.c,v $ * $State: Exp $ * --- 1,7 ---- /******************************************************************** * $Author: lindner $ ! * $Revision: 3.11 $ ! * $Date: 1993/08/03 20:00:00 $ * $Source: /export/mudhoney/GopherSrc/CVS/gopher+/gopher/gopherrc.c,v $ * $State: Exp $ * *************** *** 15,20 **** --- 15,23 ---- ********************************************************************* * Revision History: * $Log: gopherrc.c,v $ + * Revision 3.11 1993/08/03 20:00:00 lindner + * Change audio/mulaw to audio/basic for MIME + * * Revision 3.10 1993/07/29 17:23:41 lindner * eliminate non-used variables * *************** *** 488,494 **** sprintf(tmpstr, "Text/plain,%s %%s,%s %%s", PAGER_COMMAND, PRINTER_COMMAND); RCMAfromLine(rc->commands, tmpstr); ! sprintf(tmpstr, "Audio/mulaw,%s,", PLAY_COMMAND); RCMAfromLine(rc->commands, tmpstr); sprintf(tmpstr, "Image,%s %%s,%s %%s", IMAGE_COMMAND, PRINTER_COMMAND); --- 491,497 ---- sprintf(tmpstr, "Text/plain,%s %%s,%s %%s", PAGER_COMMAND, PRINTER_COMMAND); RCMAfromLine(rc->commands, tmpstr); ! sprintf(tmpstr, "Audio/basic,%s,", PLAY_COMMAND); RCMAfromLine(rc->commands, tmpstr); sprintf(tmpstr, "Image,%s %%s,%s %%s", IMAGE_COMMAND, PRINTER_COMMAND); diff -c gopher+/gopher/ourutils.c:3.17 gopher+/gopher/ourutils.c:3.18 *** gopher+/gopher/ourutils.c:3.17 Tue Aug 3 16:08:28 1993 --- gopher+/gopher/ourutils.c Tue Aug 3 16:08:28 1993 *************** *** 1,7 **** /******************************************************************** * $Author: lindner $ ! * $Revision: 3.17 $ ! * $Date: 1993/07/30 17:31:56 $ * $Source: /export/mudhoney/GopherSrc/CVS/gopher+/gopher/ourutils.c,v $ * $State: Exp $ * --- 1,7 ---- /******************************************************************** * $Author: lindner $ ! * $Revision: 3.18 $ ! * $Date: 1993/08/03 04:43:59 $ * $Source: /export/mudhoney/GopherSrc/CVS/gopher+/gopher/ourutils.c,v $ * $State: Exp $ * *************** *** 15,20 **** --- 15,23 ---- ********************************************************************* * Revision History: * $Log: ourutils.c,v $ + * Revision 3.18 1993/08/03 04:43:59 lindner + * Fix for VMS unresolved variables + * * Revision 3.17 1993/07/30 17:31:56 lindner * Mods to support AskP:, AskL: * *************** *** 825,831 **** #ifdef VMS #include descrip int return_status; ! static $DESCRIPTOR(command_desc,command); #endif --- 828,834 ---- #ifdef VMS #include descrip int return_status; ! $DESCRIPTOR(command_desc,command); #endif diff -c gopher+/gopherd/daemon.c:3.5 gopher+/gopherd/daemon.c:3.6 *** gopher+/gopherd/daemon.c:3.5 Tue Aug 3 16:08:30 1993 --- gopher+/gopherd/daemon.c Tue Aug 3 16:08:30 1993 *************** *** 1,7 **** /******************************************************************** * $Author: lindner $ ! * $Revision: 3.5 $ ! * $Date: 1993/07/26 20:28:58 $ * $Source: /export/mudhoney/GopherSrc/CVS/gopher+/gopherd/daemon.c,v $ * $State: Exp $ * --- 1,7 ---- /******************************************************************** * $Author: lindner $ ! * $Revision: 3.6 $ ! * $Date: 1993/08/03 20:43:22 $ * $Source: /export/mudhoney/GopherSrc/CVS/gopher+/gopherd/daemon.c,v $ * $State: Exp $ * *************** *** 15,20 **** --- 15,23 ---- ********************************************************************* * Revision History: * $Log: daemon.c,v $ + * Revision 3.6 1993/08/03 20:43:22 lindner + * Fix for core dumps on HPUX 8.0 + * * Revision 3.5 1993/07/26 20:28:58 lindner * Fixed mode for uopen * *************** *** 205,211 **** */ if (ignsigcld) { ! #if defined(SIGCLD) signal(SIGCLD, SIG_IGN); /* System V */ #endif --- 208,214 ---- */ if (ignsigcld) { ! #if defined(SIGCLD) signal(SIGCLD, SIG_IGN); /* System V */ #endif *************** *** 215,221 **** But to insure no zombies do SIGCLD first, then SIGCHLD... **/ ! #if defined(SIGCHLD) && !defined(_AUX_SOURCE) && !defined(__svr4__) && !defined(USG) && !defined(SYSV)/** BSDish **/ if (signal(SIGCHLD, sig_sigchld)) perror("signal error"); #endif --- 218,224 ---- But to insure no zombies do SIGCLD first, then SIGCHLD... **/ ! #if defined(SIGCHLD) && !defined(_AUX_SOURCE) && !defined(__svr4__) && !defined(USG) && !defined(SYSV) && !defined(hpux) /** BSDish **/ if (signal(SIGCHLD, sig_sigchld)) perror("signal error"); #endif diff -c gopher+/gopherd/ext.c:3.4 gopher+/gopherd/ext.c:3.5 *** gopher+/gopherd/ext.c:3.4 Tue Aug 3 16:08:30 1993 --- gopher+/gopherd/ext.c Tue Aug 3 16:08:31 1993 *************** *** 1,7 **** /******************************************************************** * $Author: lindner $ ! * $Revision: 3.4 $ ! * $Date: 1993/07/31 00:15:37 $ * $Source: /export/mudhoney/GopherSrc/CVS/gopher+/gopherd/ext.c,v $ * $State: Exp $ * --- 1,7 ---- /******************************************************************** * $Author: lindner $ ! * $Revision: 3.5 $ ! * $Date: 1993/08/03 06:03:08 $ * $Source: /export/mudhoney/GopherSrc/CVS/gopher+/gopherd/ext.c,v $ * $State: Exp $ * *************** *** 15,20 **** --- 15,23 ---- ********************************************************************* * Revision History: * $Log: ext.c,v $ + * Revision 3.5 1993/08/03 06:03:08 lindner + * Ignored files are now ignored again + * * Revision 3.4 1993/07/31 00:15:37 lindner * Fixed weird extension problem * *************** *** 193,199 **** if (exttype == EXgetExttype(temp)) { int exlen = strlen(EXgetExt(temp)); ! if (exlen < extlen && strcasecmp(fileext+extlen-exlen, EXgetExt(temp)) == 0) { EXcpy(ext,temp); return(TRUE); --- 196,202 ---- if (exttype == EXgetExttype(temp)) { int exlen = strlen(EXgetExt(temp)); ! if (exlen <= extlen && strcasecmp(fileext+extlen-exlen, EXgetExt(temp)) == 0) { EXcpy(ext,temp); return(TRUE); diff -c gopher+/gopherd/ftp.c:3.5 gopher+/gopherd/ftp.c:3.8 *** gopher+/gopherd/ftp.c:3.5 Tue Aug 3 16:08:31 1993 --- gopher+/gopherd/ftp.c Tue Aug 3 16:08:32 1993 *************** *** 1,7 **** /******************************************************************** * $Author: lindner $ ! * $Revision: 3.5 $ ! * $Date: 1993/07/30 19:21:03 $ * $Source: /export/mudhoney/GopherSrc/CVS/gopher+/gopherd/ftp.c,v $ * $State: Exp $ * --- 1,7 ---- /******************************************************************** * $Author: lindner $ ! * $Revision: 3.8 $ ! * $Date: 1993/08/03 20:43:54 $ * $Source: /export/mudhoney/GopherSrc/CVS/gopher+/gopherd/ftp.c,v $ * $State: Exp $ * *************** *** 15,20 **** --- 15,29 ---- ********************************************************************* * Revision History: * $Log: ftp.c,v $ + * Revision 3.8 1993/08/03 20:43:54 lindner + * Fix for sites that have @ -> for symbolic links + * + * Revision 3.7 1993/08/03 06:40:11 lindner + * none + * + * Revision 3.6 1993/08/03 06:14:12 lindner + * Fix for extra slashes + * * Revision 3.5 1993/07/30 19:21:03 lindner * Removed debug stuff, fix for extra slashes * *************** *** 540,545 **** --- 549,556 ---- xLateList(ftptype, host, path, fp); break; } + + break; default: Abort("XR:","Shouldn't get here!\n"); *************** *** 716,741 **** for (i= 0, gap=0; (gap < kind) && (i < end); gap++) { ! for (;(!isspace(bufptr[i])) && (i < end); i++); /* Skip chars to white */ ! if (i >= end) Abort ("PUL","said it was Unix but wasn't"); ! for (;isspace(bufptr[i]) && (i < end); i++); /* Skip white to chars */ if (i >= end) Abort ("PUL","said Unix but wasn't"); } ! dirname = alias = &bufptr[i]; /* Point at supposed start-of-fileIntName */ ! if (dirname[strlen(dirname)] == '/') ! dirname[strlen(dirname)] = '\0'; switch(bufptr[0]) { case 'l': /* Link? Skip to REAL IntName! */ ! for (dirname = alias ; (*dirname != '>') && (dirname != NULL); dirname++); ! if (dirname == NULL) return(-1); /* No real DirName? Hm. Oh well */ dirname +=2; /* Skip space following arrow */ /* Grab fake name (sans arrow) */ --- 727,759 ---- for (i= 0, gap=0; (gap < kind) && (i < end); gap++) { ! /* Skip chars to white */ ! for (;(!isspace(bufptr[i])) && (i < end); i++); ! if (i >= end) ! Abort ("PUL","said it was Unix but wasn't"); ! /* Skip white to chars */ ! for (;isspace(bufptr[i]) && (i < end); i++); if (i >= end) Abort ("PUL","said Unix but wasn't"); } ! /* Point at supposed start-of-fileIntName */ ! dirname = alias = &bufptr[i]; ! if (dirname[strlen(dirname)-1] == '/') ! dirname[strlen(dirname)-1] = '\0'; switch(bufptr[0]) { case 'l': /* Link? Skip to REAL IntName! */ ! for (dirname = alias ; (*dirname != '>') && (dirname != NULL); ! dirname++) ! ; ! if (dirname == NULL) ! return(-1); /* No real DirName? Hm. Oh well */ dirname +=2; /* Skip space following arrow */ /* Grab fake name (sans arrow) */ *************** *** 747,752 **** --- 765,773 ---- /*Internal name in 'IntName' */ strcpy(IntName,dirname); + if (IntName[strlen(IntName)-1] == '@') + IntName[strlen(IntName)-1] = '\0'; + /* Tag slash on end */ sprintf(bufptr, "%s/", IntName); *************** *** 795,802 **** IntName = (char *)malloc(BUFSIZ); ! if (strncmp(bufptr, "total", 5) == 0) return (-1); /* Skip 'total' line */ ! TrimEnd(bufptr); /* Trim whitespaces */ switch (ftptype) { --- 816,826 ---- IntName = (char *)malloc(BUFSIZ); ! /* Skip 'total' line */ ! if (strncmp(bufptr, "total", 5) == 0) return (-1); ! ! /* Trim whitespaces */ ! TrimEnd(bufptr); switch (ftptype) { *************** *** 835,841 **** Cleanup() { unlink(ftptmp); ! printf("Cleaning up %s\n", ftptmp); exit(1); } --- 859,865 ---- Cleanup() { unlink(ftptmp); ! Debug("Cleaning up %s\n", ftptmp); exit(1); } diff -c gopher+/gopherd/gopherd.c:3.26 gopher+/gopherd/gopherd.c:3.27 *** gopher+/gopherd/gopherd.c:3.26 Tue Aug 3 16:08:33 1993 --- gopher+/gopherd/gopherd.c Tue Aug 3 16:08:33 1993 *************** *** 1,7 **** /******************************************************************** * $Author: lindner $ ! * $Revision: 3.26 $ ! * $Date: 1993/07/29 20:49:25 $ * $Source: /export/mudhoney/GopherSrc/CVS/gopher+/gopherd/gopherd.c,v $ * $State: Exp $ * --- 1,7 ---- /******************************************************************** * $Author: lindner $ ! * $Revision: 3.27 $ ! * $Date: 1993/08/02 17:59:26 $ * $Source: /export/mudhoney/GopherSrc/CVS/gopher+/gopherd/gopherd.c,v $ * $State: Exp $ * *************** *** 15,20 **** --- 15,23 ---- ********************************************************************* * Revision History: * $Log: gopherd.c,v $ + * Revision 3.27 1993/08/02 17:59:26 lindner + * Fix for Debug syntax error when using DL + * * Revision 3.26 1993/07/29 20:49:25 lindner * removed dead vars, test for non-existant binary files, Dump_Core thing.. * *************** *** 1331,1337 **** dlout = getdesc(NULL,dlpath,filename,0); Debug("dl: %s", dlpath); ! Debug(" %s", fileame); Debug(" %s\n", dlout); if (dlout != NULL) { --- 1334,1340 ---- dlout = getdesc(NULL,dlpath,filename,0); Debug("dl: %s", dlpath); ! Debug(" %s", filename); Debug(" %s\n", dlout); if (dlout != NULL) { diff -c gopher+/object/compatible.h:3.8 gopher+/object/compatible.h:3.10 *** gopher+/object/compatible.h:3.8 Tue Aug 3 16:08:39 1993 --- gopher+/object/compatible.h Tue Aug 3 16:08:39 1993 *************** *** 1,7 **** /******************************************************************** * $Author: lindner $ ! * $Revision: 3.8 $ ! * $Date: 1993/07/27 05:30:29 $ * $Source: /export/mudhoney/GopherSrc/CVS/gopher+/object/compatible.h,v $ * $State: Exp $ * --- 1,7 ---- /******************************************************************** * $Author: lindner $ ! * $Revision: 3.10 $ ! * $Date: 1993/08/03 20:57:42 $ * $Source: /export/mudhoney/GopherSrc/CVS/gopher+/object/compatible.h,v $ * $State: Exp $ * *************** *** 15,20 **** --- 15,26 ---- ********************************************************************* * Revision History: * $Log: compatible.h,v $ + * Revision 3.10 1993/08/03 20:57:42 lindner + * Really fix it for hocky pucks + * + * Revision 3.9 1993/08/03 06:43:48 lindner + * Compatibility fix for hpux and seteguid + * * Revision 3.8 1993/07/27 05:30:29 lindner * Mondo Debug overhaul from Mitra * *************** *** 143,149 **** #define seteuid(x) setresuid(-1,x,-1) ! #define setguid(x) setresgid(-1,x,-1) #endif --- 149,155 ---- #define seteuid(x) setresuid(-1,x,-1) ! #define setegid(x) setresgid(-1,x,-1) #endif