rhg@cpsolv.CPS.COM (Richard H. Gumpertz) (09/10/90)
Submitted-by: rhg@cpsolv.cps.com Archive-name: shar3.43/patch02 Here are a few more minor fixes that have trickled in: *** /tmp/,RCSt1a14589 Sun Sep 9 19:21:16 1990 --- shar.c Sun Sep 9 19:14:31 1990 *************** *** 1,5 **** ! char *revision = "3.44"; ! char RCS_ID[] = "$Header: /u/rhg/src/shar/shar.c,v 3.44 90/09/08 22:01:39 rhg Exp $"; /* ** shar.c --- 1,5 ---- ! char *revision = "3.46"; ! char RCS_ID[] = "$Header: /u/rhg/src/shar/shar.c,v 3.46 90/09/09 18:51:11 rhg Exp $"; /* ** shar.c *************** *** 16,21 **** --- 16,23 ---- */ /*+:EDITS:*/ + /*:09-09-1990-18:42-rhg@cps.com-added check for "From" under OptPREFIX */ + /*:09-09-1990-11:55-rhg@cps.com-modified code under NOT STR(N)CMP_IS_FAST */ /*:09-08-1990-21:20-rhg@cps.com-added NO_DIRENT for SunOS 3 sys/dir.h */ /*:09-08-1990-21:04-rhg@cps.com-fixed bug in PREFIX check: strcmp(line,Delim) */ /*:08-06-1990-00:40-rhg@cps.com-revised Cut message to be more explanatory */ *************** *** 1100,1112 **** #ifdef STRCMP_IS_FAST && strcmp(line,Delim) #else /* STRCMP_IS_FAST */ ! && line[0] != Delim[0] #endif /* STRCMP_IS_FAST */ #ifdef STRNCMP_IS_FAST ! && strncmp(line,"exit 0",6)) /* See unshar -e: avoid "exit 0" */ #else /* STRNCMP_IS_FAST */ ! && (line[0] != 'e')) /* See unshar -e: avoid "exit 0" */ #endif /* STRNCMP_IS_FAST */ fputs(line,fpout); else { --- 1102,1119 ---- #ifdef STRCMP_IS_FAST && strcmp(line,Delim) #else /* STRCMP_IS_FAST */ ! && (line[0] != Delim[0] || strcmp(line,Delim)) #endif /* STRCMP_IS_FAST */ #ifdef STRNCMP_IS_FAST ! && strncmp(line,"exit 0",6) /* See unshar -e: avoid "exit 0" */ ! && strncmp(line,"From",4) /* Don't let mail prepend a ">" */ #else /* STRNCMP_IS_FAST */ ! && (line[0] != 'e' /* See unshar -e: avoid "exit 0" */ ! || strncmp(line,"exit 0",6)) ! && (line[0] != 'F' /* Don't let mail prepend a ">" */ ! || strncmp(line,"From",4)) #endif /* STRNCMP_IS_FAST */ + ) fputs(line,fpout); else { *** /tmp/,RCSt1a14593 Sun Sep 9 19:21:48 1990 --- shar.1 Sun Sep 9 19:14:27 1990 *************** *** 14,20 **** \f2\-o\f1 option is given. A wide range of features provide extensive flexibility in manufacturing shars and in specifying shar "smartness." Archives may be "vanilla" or comprehensive. ! This manual page reflects shar version 3.43. .SS OPTIONS .PP Options can be given in any order. Some options depend on each other: --- 14,20 ---- \f2\-o\f1 option is given. A wide range of features provide extensive flexibility in manufacturing shars and in specifying shar "smartness." Archives may be "vanilla" or comprehensive. ! This manual page reflects shar version 3.46. .SS OPTIONS .PP Options can be given in any order. Some options depend on each other: *** /tmp/,RCSt1a14596 Sun Sep 9 19:22:13 1990 --- unshar.c Sun Sep 9 19:19:36 1990 *************** *** 1,5 **** ! char *revision = "3.43"; ! char RCS_ID[] = "$Header: /u/rhg/src/shar/unshar.c,v 3.43 90/08/13 07:50:52 rhg Exp $"; /**************************************************************** * unshar.c: Unpackage one or more shell archive files * --- 1,5 ---- ! char *revision = "3.46"; ! char RCS_ID[] = "$Header: /u/rhg/src/shar/unshar.c,v 3.46 90/09/09 19:19:10 rhg Exp $"; /**************************************************************** * unshar.c: Unpackage one or more shell archive files * -- ========================================================================== | Richard H. Gumpertz rhg@CPS.COM (913) 642-1777 or (816) 891-3561 | | Computer Problem Solving, 8905 Mohawk Lane, Leawood, Kansas 66206-1749 | ==========================================================================