NetNews Usenet Archive 1992 #18

home *** CD-ROM | disk | FTP | other *** search

/ NetNews Usenet Archive 1992 #18 / NN_1992_18.iso / spool / comp / sources / bugs / 223 < prev next >

Wrap

Text File | 1992-08-22 | 24.7 KB | 768 lines

Newsgroups: comp.sources.bugs Path: sparky!uunet!mcsun!sun4nl!fwi.uva.nl!gene.fwi.uva.nl!vdlinden From: vdlinden@fwi.uva.nl (Frank van der Linden) Subject: patches for unzip 5.0 zip 1.9 Message-ID: <1992Aug23.131453.27823@fwi.uva.nl> Keywords: late minute fixes Sender: news@fwi.uva.nl Nntp-Posting-Host: gene.fwi.uva.nl Organization: FWI, University of Amsterdam Date: Sun, 23 Aug 1992 13:14:53 GMT Lines: 755 #! /bin/sh # This is a shell archive. Remove anything before this line, then unpack # it by saving it into a file and typing "sh file". To overwrite existing # files, type "sh file -c". You can also feed this as standard input via # unshar, or by typing "sh <file", e.g.. If this archive is complete, you # will see the following message at the end: # "End of shell archive." # Contents: readme crypt.dif unzip.dif zip.dif # Wrapped by vdlinden@fwi.uva.nl on Sun Aug 23 15:11:51 1992 PATH=/bin:/usr/bin:/usr/ucb ; export PATH if test -f 'readme' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'readme'\" else echo shar: Extracting \"'readme'\" $702 characters$ sed "s/^X//" >'readme' <<'END_OF_FILE' X The deadline for zip/unzip beat me so here are a couple of patches for Xzip 1.9 and unzip 5.0. They are important for 386BSD and DOS, they don't matter Xthat much on other systems. X X Fixes for unzip 5.0: X1. Fix one or two compiler warnings X2. Add bcc_dos to the main makefile X3. Change zi_dos to zi_msc X4. Add zi_bcc X5. Add zi_djgcc X6. time calculations in 386BSD X X Fixes for zip 1.9: X1. Fix one or two compiler warnings (const stuff for djgcc) X2. Make things work under 386BSD when using -DCRYPT X3. Fix some dos makefiles (cc -o util_.obj fileio.c among others) X X Small fix for crypt.c with 386BSD: getpid is already defined in <unistd.h>. X XOnno van der Linden c/o vdlinden@fwi.uva.nl END_OF_FILE if test 702 -ne `wc -c <'readme'`; then echo shar: \"'readme'\" unpacked with wrong size! fi # end of 'readme' fi if test -f 'crypt.dif' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'crypt.dif'\" else echo shar: Extracting \"'crypt.dif'\" $228 characters$ sed "s/^X//" >'crypt.dif' <<'END_OF_FILE' X*** crypt.c.old Fri Aug 14 11:27:48 1992 X--- crypt.c Sat Aug 22 13:37:53 1992 X*************** X*** 22,26 **** X--- 22,28 ---- X # include <process.h> X #else X+ #ifndef __386BSD__ X int getpid OF((void)); X+ #endif X #endif X END_OF_FILE if test 228 -ne `wc -c <'crypt.dif'`; then echo shar: \"'crypt.dif'\" unpacked with wrong size! fi # end of 'crypt.dif' fi if test -f 'unzip.dif' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'unzip.dif'\" else echo shar: Extracting \"'unzip.dif'\" $8482 characters$ sed "s/^X//" >'unzip.dif' <<'END_OF_FILE' Xdiff -c2 unzip50o.old/file_io.c unzip50o.new/file_io.c X*** unzip50o.old/file_io.c Wed Aug 19 14:17:34 1992 X--- unzip50o.new/file_io.c Sat Aug 22 14:02:52 1992 X*************** X*** 95,112 **** X # endif /* ?__386BSD__ */ X # endif /* ?TERMIO */ X! int isatty OF((int)); X! char *ttyname OF((int)); X! # if (defined(PROTO) && !defined(__GNUC__) && !defined(_AIX)) X! int open (char *, int, ...); X! # endif X! int close OF((int)); X! int read OF((int, voidp *, int)); X # endif /* ?(DOS_OS2 || VMS) */ X #endif /* CRYPT */ X X X X X- X /******************************/ X /* Function open_input_file() */ X--- 95,116 ---- X # endif /* ?__386BSD__ */ X # endif /* ?TERMIO */ X! # ifndef __386BSD__ X! int isatty OF((int)); X! char *ttyname OF((int)); X! # if (defined(PROTO) && !defined(__GNUC__) && !defined(_AIX)) X! int open (char *, int, ...); X! # endif X! int close OF((int)); X! int read OF((int, voidp *, int)); X! # endif /* !__386BSD__ */ X # endif /* ?(DOS_OS2 || VMS) */ X #endif /* CRYPT */ X X+ #ifdef __386BSD__ X+ # include <utime.h> X+ #endif X X X X /******************************/ X /* Function open_input_file() */ X*************** X*** 817,820 **** X--- 821,825 ---- X long m_time; X int yr, mo, dy, hh, mm, ss, leap, days=0; X+ #ifndef __386BSD__ X struct utimbuf { X time_t actime; /* new access time */ X*************** X*** 821,824 **** X--- 826,832 ---- X time_t modtime; /* new modification time */ X } tp; X+ #else X+ struct utimbuf tp; X+ #endif X #ifdef AMIGA X # define YRBASE 1978 /* in AmigaDos, counting begins 01-Jan-1978 */ X*************** X*** 912,916 **** X X #ifdef __386BSD__ X! m_time += localtime(&m_time)->tm_gmtoff; X #else X if (localtime(&m_time)->tm_isdst) X--- 920,929 ---- X X #ifdef __386BSD__ X! /* GMT offset is in seconds _EAST_ of GMT */ X! /* timezone is in seconds _WEST_ of GMT */ X! /* That's causing the mtime -= tm_gmtoff instead of mtime += timezone */ X! /* Daylight savings time is already added to tm_gmtoff */ X! /* So no check on tm_isdst */ X! m_time -= localtime(&m_time)->tm_gmtoff; X #else X if (localtime(&m_time)->tm_isdst) Xdiff -c2 unzip50o.old/makefile unzip50o.new/makefile X*** unzip50o.old/makefile Thu Aug 20 11:09:22 1992 X--- unzip50o.new/makefile Sat Aug 22 14:20:26 1992 X*************** X*** 105,110 **** X X # list of supported systems/targets in this version X! SYSTEMS1 = 386i 3Bx 7300 amdahl apollo aviion bsd bull c120 c210 coherent X! SYSTEMS2 = convex cray cray_cc cray_v3 cyber_sgi dec dnix encore eta X SYSTEMS3 = gcc gcc_dos generic generic2 gould hk68 hp indigo linux X SYSTEMS4 = minix mips msc_dos next osf1 p_iris pyramid rs6000 rtaix X--- 105,110 ---- X X # list of supported systems/targets in this version X! SYSTEMS1 = 386i 3Bx 7300 amdahl apollo aviion bcc_dos bsd bull c120 c210 X! SYSTEMS2 = coherent convex cray cray_cc cray_v3 cyber_sgi dec dnix encore eta X SYSTEMS3 = gcc gcc_dos generic generic2 gould hk68 hp indigo linux X SYSTEMS4 = minix mips msc_dos next osf1 p_iris pyramid rs6000 rtaix X*************** X*** 112,116 **** X SYSTEMS6 = tahoe ultrix vax wombat xos X X! SYS_UTIL1 = zi_dos zi_gcc zi_indigo zipinfo fu_gcc funzip X # SYS_UTIL2 = ship ship_dos ship_sysv X X--- 112,116 ---- X SYSTEMS6 = tahoe ultrix vax wombat xos X X! SYS_UTIL1 = zi_msc zi_bcc zi_djgcc zi_gcc zi_indigo zipinfo fu_gcc funzip X # SYS_UTIL2 = ship ship_dos ship_sysv X X*************** X*** 370,376 **** X strip unzip X X! # MS-DOS with D.J. Delorie's djgcc 1.06. Note that go32 doesn't support X! # dos function 0x38 (yet); to fix, append to line 400 of exphdlr.c (go32) X! # the following: "case 0x38:". X # X gcc_dos: # may need to add -Uunix to CF X--- 370,375 ---- X strip unzip X X! # MS-DOS with D.J. Delorie's djgcc 1.08. Note that go32 doesn't support X! # dos function 0x38. So your dateformat with -v is the default. X # X gcc_dos: # may need to add -Uunix to CF X*************** X*** 418,421 **** X--- 417,431 ---- X echo $(OBJS2:.o=.obj)/noi/e/st:0x1000; >> rsp X X+ # MSDOS: Borland C++ 3.0 X+ # X+ bcc_dos: bcc_rsp X+ $(MAKE) unzip.exe CF="-O2 $(LOC)" CC=bcc LD=bcc E=.exe O=.obj\ X+ LOBJS="" LF="@bcc_rsp" LF2="" X+ del bcc_rsp X+ X+ bcc_rsp: X+ echo $(OBJS1:.o=.obj) > bcc_rsp X+ echo $(OBJS2:.o=.obj) >> bcc_rsp X+ X # $(LOCAL_UNZIP): math libraries and/or any other personal or debugging X # definitions: e.g., SET LOCAL_UNZIP=-FPi87 -DDEBUG_STRUC X*************** X*** 521,529 **** X $(MAKE) zipinfo CF="-cckr -O -DUNIX $(LOC)" X X! zi_dos: # MSC 6.0 + nmake, MS-DOS X $(MAKE) zipinfo.exe CF="-Ox -nologo $(LOC) -G2" CC=cl\ X LD=link E=.exe O=.obj ZL="/noi /nol" ZL2=",zipinfo;"\ X! LN="copy" RM="DEL" X X X #################### X--- 531,547 ---- X $(MAKE) zipinfo CF="-cckr -O -DUNIX $(LOC)" X X! zi_msc: # MSC 6.0 + nmake, MS-DOS X $(MAKE) zipinfo.exe CF="-Ox -nologo $(LOC) -G2" CC=cl\ X LD=link E=.exe O=.obj ZL="/noi /nol" ZL2=",zipinfo;"\ X! LN="copy" RM="del" X X+ zi_bcc: # BCC 3.0 X+ $(MAKE) zipinfo.exe CF="-O2 $(LOC)" CC=bcc LD=bcc E=.exe O=.obj\ X+ ZL="" ZL2="" LN="copy" RM="del" X+ X+ zi_djgcc: # DJGCC 1.08 X+ $(MAKE) zipinfo CF="-O2" CC=gcc LD=gcc ZL2="" LN="copy" RM="del" X+ aout2exe zipinfo X+ del zipinfo X X #################### Xdiff -c2 unzip50o.old/misc.c unzip50o.new/misc.c X*** unzip50o.old/misc.c Wed Aug 19 14:17:36 1992 X--- unzip50o.new/misc.c Sat Aug 22 14:03:30 1992 X*************** X*** 355,359 **** X X #ifdef __386BSD__ X! m_time += localtime((time_t *) &m_time))->tm_gmtoff; X #else X if (localtime((time_t *)&m_time)->tm_isdst) X--- 355,360 ---- X X #ifdef __386BSD__ X! /* See comments in file_io.c */ X! m_time -= localtime((time_t *) &m_time)->tm_gmtoff; X #else X if (localtime((time_t *)&m_time)->tm_isdst) X*************** X*** 502,512 **** X } X #else /* !OS2 */ X! #if (defined(MSDOS) && !defined(MSWIN)) X unsigned short _CountryInfo[18]; X- #ifdef __GO32__ X- unsigned short *CountryInfo = _CountryInfo; X- X- bdos(0x38, (unsigned)CountryInfo, 0); X- #else /* !__GO32__ */ X unsigned short far *CountryInfo = _CountryInfo; X union REGS regs; X--- 503,508 ---- X } X #else /* !OS2 */ X! #if (defined(MSDOS) && !defined(MSWIN) && !defined(__GO32__)) X unsigned short _CountryInfo[18]; X unsigned short far *CountryInfo = _CountryInfo; X union REGS regs; X*************** X*** 517,521 **** X sregs.ds = FP_SEG(CountryInfo); X int86x(0x21, ®s, ®s, &sregs); X- #endif /* ?__GO32__ */ X X switch(CountryInfo[0]) { X--- 513,516 ---- X*************** X*** 527,531 **** X return DF_YMD; X } X! #endif /* MSDOS && !MSWIN */ X #endif /* ?OS2 */ X X--- 522,526 ---- X return DF_YMD; X } X! #endif /* MSDOS && !MSWIN && !__GO32__ */ X #endif /* ?OS2 */ X Xdiff -c2 unzip50o.old/unzip.h unzip50o.new/unzip.h X*** unzip50o.old/unzip.h Thu Aug 13 10:55:00 1992 X--- unzip50o.new/unzip.h Sat Aug 22 13:04:58 1992 X*************** X*** 138,144 **** X # include <stdlib.h> /* standard library prototypes, malloc(), etc. */ X # else X! # ifdef __EMX__ X # include <stdlib.h> /* emx IS gcc but has stdlib.h */ X # endif X # endif X # include <string.h> /* defines strcpy, strcmp, memcpy, etc. */ X--- 138,147 ---- X # include <stdlib.h> /* standard library prototypes, malloc(), etc. */ X # else X! # if (defined(__EMX__) || defined(__386BSD__)) X # include <stdlib.h> /* emx IS gcc but has stdlib.h */ X # endif X+ # endif X+ # ifdef __386BSD__ X+ # include <unistd.h> X # endif X # include <string.h> /* defines strcpy, strcmp, memcpy, etc. */ Xdiff -c2 unzip50o.old/zipinfo.c unzip50o.new/zipinfo.c X*** unzip50o.old/zipinfo.c Thu Aug 20 11:24:22 1992 X--- unzip50o.new/zipinfo.c Sat Aug 22 12:12:20 1992 X*************** X*** 1273,1278 **** X X if (methnum == IMPLODED) { X! impl[1] = (crec.general_purpose_bit_flag & 2)? '8' : '4'; X! impl[3] = (crec.general_purpose_bit_flag & 4)? '3' : '2'; X } else if (methnum == DEFLATED) { X UWORD dnum=(crec.general_purpose_bit_flag>>1) & 3; X--- 1273,1278 ---- X X if (methnum == IMPLODED) { X! impl[1] = (char) ((crec.general_purpose_bit_flag & 2)? '8' : '4'); X! impl[3] = (char) ((crec.general_purpose_bit_flag & 4)? '3' : '2'); X } else if (methnum == DEFLATED) { X UWORD dnum=(crec.general_purpose_bit_flag>>1) & 3; END_OF_FILE if test 8482 -ne `wc -c <'unzip.dif'`; then echo shar: \"'unzip.dif'\" unpacked with wrong size! fi # end of 'unzip.dif' fi if test -f 'zip.dif' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'zip.dif'\" else echo shar: Extracting \"'zip.dif'\" $12508 characters$ sed "s/^X//" >'zip.dif' <<'END_OF_FILE' Xdiff -c2 -r zip19d.old/fileio.c zip19d.new/fileio.c X*** zip19d.old/fileio.c Tue Aug 18 12:34:34 1992 X--- zip19d.new/fileio.c Sat Aug 22 18:48:00 1992 X*************** X*** 138,155 **** X # define STTY(f,s) ioctl(f,TCSETAW,s) X # else /* !TERMIO */ X! # ifndef MINIX X # include <sys/ioctl.h> X! # endif /* !MINIX */ X # include <sgtty.h> X! int gtty OF((int, struct sgttyb *)); X! int stty OF((int, struct sgttyb *)); X! # define GTTY gtty X! # define STTY stty X # endif /* ?TERMIO */ X! int isatty OF((int)); X! char *ttyname OF((int)); X! int open OF((char *, int, ...)); X! int close OF((int)); X! int read OF((int, voidp *, int)); X # endif /* ?MSVMS */ X #endif /* ?CRYPT */ X--- 138,164 ---- X # define STTY(f,s) ioctl(f,TCSETAW,s) X # else /* !TERMIO */ X! # if (!defined(MINIX) && !defined(__386BSD__)) X # include <sys/ioctl.h> X! # endif /* !MINIX && !__386BSD__ */ X # include <sgtty.h> X! # ifdef __386BSD__ X! # define GTTY(f, s) ioctl(f, TIOCGETP, (voidp *) s) X! # define STTY(f, s) ioctl(f, TIOCSETP, (voidp *) s) X! # else /* !__386BSD__ */ X! # define GTTY gtty X! # define STTY stty X! int gtty OF((int, struct sgttyb *)); X! int stty OF((int, struct sgttyb *)); X! # endif /* ?__386BSD__ */ X # endif /* ?TERMIO */ X! # ifdef __386BSD__ X! # include <fcntl.h> X! # else /* !__386BSD__ */ X! int isatty OF((int)); X! char *ttyname OF((int)); X! int open OF((char *, int, ...)); X! int close OF((int)); X! int read OF((int, voidp *, int)); X! # endif /* ?__386BSD */ X # endif /* ?MSVMS */ X #endif /* ?CRYPT */ X*************** X*** 296,299 **** X--- 305,309 ---- X #endif /* !__TURBOC__ */ X #ifndef MSDOS X+ #ifndef __386BSD__ X int open OF((char *, int, ...)); X int close OF((int)); X*************** X*** 301,304 **** X--- 311,315 ---- X int rmdir OF((char *)); X # endif /* !RMDIR */ X+ #endif /* !__386BSD__ */ X #endif /* !MSDOS */ X X*************** X*** 323,328 **** X # endif /* DIRENT */ X local char *readd(dstrm *); X! local int fqcmp(voidp *, voidp *); X! local int fqcmpz(voidp *, voidp *); X local char *last(char *); X local char *msname(char *); X--- 334,339 ---- X # endif /* DIRENT */ X local char *readd(dstrm *); X! local int fqcmp(const voidp *, const voidp *); X! local int fqcmpz(const voidp *, const voidp *); X local char *last(char *); X local char *msname(char *); X*************** X*** 804,808 **** X X local int fqcmp(a, b) X! voidp *a, *b; /* pointers to pointers to found entries */ X /* Used by qsort() to compare entries in the found list by name. */ X { X--- 815,819 ---- X X local int fqcmp(a, b) X! const voidp *a, *b; /* pointers to pointers to found entries */ X /* Used by qsort() to compare entries in the found list by name. */ X { X*************** X*** 813,817 **** X X local int fqcmpz(a, b) X! voidp *a, *b; /* pointers to pointers to found entries */ X /* Used by qsort() to compare entries in the found list by zname. */ X { X--- 824,828 ---- X X local int fqcmpz(a, b) X! const voidp *a, *b; /* pointers to pointers to found entries */ X /* Used by qsort() to compare entries in the found list by zname. */ X { Xdiff -c2 -r zip19d.old/tailor.h zip19d.new/tailor.h X*** zip19d.old/tailor.h Tue Aug 18 13:14:44 1992 X--- zip19d.new/tailor.h Sat Aug 22 17:48:50 1992 X*************** X*** 137,140 **** X--- 137,143 ---- X # endif /* !M_XENIX */ X # include <stdlib.h> X+ # ifdef __386BSD__ X+ # include <unistd.h> X+ # endif X typedef size_t extent; X typedef void voidp; Xdiff -c2 -r zip19d.old/trees.c zip19d.new/trees.c X*** zip19d.old/trees.c Tue Aug 18 11:54:30 1992 X--- zip19d.new/trees.c Sat Aug 22 16:53:46 1992 X*************** X*** 57,61 **** X * Save the match info and tally the frequency counts. X * X! * long flush_block (char *buf, ulg stored_len, int eof) X * Determine the best encoding for the current block: dynamic trees, X * static trees or store, and output the encoded block to the zip X--- 57,61 ---- X * Save the match info and tally the frequency counts. X * X! * long flush_block (char far *buf, ulg stored_len, int eof) X * Determine the best encoding for the current block: dynamic trees, X * static trees or store, and output the encoded block to the zip X*************** X*** 861,865 **** X */ X ulg flush_block(buf, stored_len, eof) X! char *buf; /* input block, or NULL if too old */ X ulg stored_len; /* length of input block */ X int eof; /* true if this is the last block for a file */ X--- 861,865 ---- X */ X ulg flush_block(buf, stored_len, eof) X! char far *buf; /* input block, or NULL if too old */ X ulg stored_len; /* length of input block */ X int eof; /* true if this is the last block for a file */ Xdiff -c2 -r zip19d.old/util.c zip19d.new/util.c X*** zip19d.old/util.c Thu Aug 20 20:28:02 1992 X--- zip19d.new/util.c Sat Aug 22 18:04:34 1992 X*************** X*** 30,34 **** X--- 30,36 ---- X #ifdef PROTO X local int recmatch(char *, char *); X+ #if (defined(MSDOS) && !defined(OS2) && !defined(__GO32__) && !defined(WIN32)) X local unsigned ident(unsigned chr); X+ #endif X #endif /* PROTO */ X X*************** X*** 187,191 **** X voidp far **a; /* table of pointers to values, sorted */ X extent n; /* number of pointers in a[] */ X! int (*cmp) OF((voidp *, voidp far *)); /* comparison function for search */ X /* Search for b in the pointer list a[0..n-1] using the compare function X cmp(b, c) where c is an element of a[i] and cmp() returns negative if X--- 189,194 ---- X voidp far **a; /* table of pointers to values, sorted */ X extent n; /* number of pointers in a[] */ X! /* comparison function for search */ X! int (*cmp) OF((const voidp *, const voidp far *)); X /* Search for b in the pointer list a[0..n-1] using the compare function X cmp(b, c) where c is an element of a[i] and cmp() returns negative if Xdiff -c2 -r zip19d.old/zip.h zip19d.new/zip.h X*** zip19d.old/zip.h Tue Aug 18 11:54:32 1992 X--- zip19d.new/zip.h Sat Aug 22 18:05:08 1992 X*************** X*** 295,299 **** X int namecmp OF((char *string1, char *string2)); X voidp far **search OF((voidp *, voidp far **, extent, X! int (*)(voidp *, voidp far *))); X ulg crc32 OF((ulg, int)); X ulg updcrc OF((char *, extent)); X--- 295,299 ---- X int namecmp OF((char *string1, char *string2)); X voidp far **search OF((voidp *, voidp far **, extent, X! int (*)(const voidp *, const voidp far *))); X ulg crc32 OF((ulg, int)); X ulg updcrc OF((char *, extent)); Xdiff -c2 -r zip19d.old/zipfile.c zip19d.new/zipfile.c X*** zip19d.old/zipfile.c Tue Aug 18 11:54:32 1992 X--- zip19d.new/zipfile.c Sat Aug 22 17:09:42 1992 X*************** X*** 79,85 **** X /* Local functions */ X #ifdef PROTO X! local int zqcmp(voidp *, voidp *); X # ifndef UTIL X! local int zbcmp(voidp *, voidp far *); X local char *cutpath(char *); X # endif /* !UTIL */ X--- 79,85 ---- X /* Local functions */ X #ifdef PROTO X! local int zqcmp(const voidp *, const voidp *); X # ifndef UTIL X! local int zbcmp(const voidp *, const voidp far *); X local char *cutpath(char *); X # endif /* !UTIL */ X*************** X*** 88,92 **** X X local int zqcmp(a, b) X! voidp *a, *b; /* pointers to pointers to zip entries */ X /* Used by qsort() to compare entries in the zfile list. */ X { X--- 88,92 ---- X X local int zqcmp(a, b) X! const voidp *a, *b; /* pointers to pointers to zip entries */ X /* Used by qsort() to compare entries in the zfile list. */ X { X*************** X*** 99,104 **** X X local int zbcmp(n, z) X! voidp *n; /* string to search for */ X! voidp far *z; /* pointer to a pointer to a zip entry */ X /* Used by search() to compare a target to an entry in the zfile list. */ X { X--- 99,104 ---- X X local int zbcmp(n, z) X! const voidp *n; /* string to search for */ X! const voidp far *z; /* pointer to a pointer to a zip entry */ X /* Used by search() to compare a target to an entry in the zfile list. */ X { Xdiff -c2 -r zip19d.old/zipsplit.c zip19d.new/zipsplit.c X*** zip19d.old/zipsplit.c Thu Aug 20 05:06:36 1992 X--- zip19d.new/zipsplit.c Sat Aug 22 17:19:08 1992 X*************** X*** 34,38 **** X local void help(void); X local extent simple(ulg *, extent, ulg, ulg); X! local int descmp(voidp *, voidp *); X local extent greedy(ulg *, extent, ulg, ulg); X void main(int, char **); X--- 34,38 ---- X local void help(void); X local extent simple(ulg *, extent, ulg, ulg); X! local int descmp(const voidp *, const voidp *); X local extent greedy(ulg *, extent, ulg, ulg); X void main(int, char **); X*************** X*** 172,176 **** X X local int descmp(a, b) X! voidp *a, *b; /* pointers to pointers to ulg's to compare */ X /* Used by qsort() in greedy() to do a descending sort. */ X { X--- 172,176 ---- X X local int descmp(a, b) X! const voidp *a, *b; /* pointers to pointers to ulg's to compare */ X /* Used by qsort() in greedy() to do a descending sort. */ X { Xdiff -c2 -r zip19d.old/zipup.c zip19d.new/zipup.c X*** zip19d.old/zipup.c Tue Aug 18 11:54:32 1992 X--- zip19d.new/zipup.c Sat Aug 22 18:51:42 1992 X*************** X*** 44,51 **** X # define fhow (O_RDONLY|O_BINARY) X # else /* !MSDOS */ X! int open OF((char *, int)); X! int read OF((int, char *, int)); X! int close OF((int)); X! int lseek OF((int, long, int)); X # define fhow 0 X # endif /* ?MSDOS */ X--- 44,55 ---- X # define fhow (O_RDONLY|O_BINARY) X # else /* !MSDOS */ X! # ifdef __386BSD__ X! # include <fcntl.h> X! # else X! int open OF((char *, int)); X! int read OF((int, char *, int)); X! int close OF((int)); X! int lseek OF((int, long, int)); X! # endif /* ?__386BSD__ */ X # define fhow 0 X # endif /* ?MSDOS */ Xdiff -c2 -r zip19d.old/msdos/makefile.bor zip19d.new/msdos/makefile.bor X*** zip19d.old/msdos/makefile.bor Thu Aug 20 04:19:56 1992 X--- zip19d.new/msdos/makefile.bor Sat Aug 22 16:17:18 1992 X*************** X*** 107,111 **** X X util_.obj: util.c zip.h ziperr.h tailor.h X! $(CC) -c $(UTILFLAGS)$* fileio.c X X crypt_.obj: crypt.c zip.h ziperr.h tailor.h X--- 107,111 ---- X X util_.obj: util.c zip.h ziperr.h tailor.h X! $(CC) -c $(UTILFLAGS)$* util.c X X crypt_.obj: crypt.c zip.h ziperr.h tailor.h Xdiff -c2 -r zip19d.old/msdos/makefile.gcc zip19d.new/msdos/makefile.gcc X*** zip19d.old/msdos/makefile.gcc Thu Aug 20 04:18:24 1992 X--- zip19d.new/msdos/makefile.gcc Sat Aug 22 20:14:16 1992 X*************** X*** 1,4 **** X # Makefile for Zip, ZipCloak, ZipNote and ZipSplit for X! # djgcc 1.06 X X CRYPTO= X--- 1,4 ---- X # Makefile for Zip, ZipCloak, ZipNote and ZipSplit for X! # djgcc 1.08 X X CRYPTO= X*************** X*** 8,16 **** X # *** For encryption version, remove the # at the front of next 3 lines *** X #CRYPTO=crypt.o X! #CLOAK=zipcloak.exe X #CRFLAG=-DCRYPT X X # ------------- djgcc ------------- X! CFLAGS=-Wall -O2 -DNO_ASM $(CRFLAG) X UTILFLAGS=-DUTIL $(CFLAGS) -o X CC=gcc X--- 8,16 ---- X # *** For encryption version, remove the # at the front of next 3 lines *** X #CRYPTO=crypt.o X! #CLOAK=zipcloak X #CRFLAG=-DCRYPT X X # ------------- djgcc ------------- X! CFLAGS=-Wall -O2 $(CRFLAG) X UTILFLAGS=-DUTIL $(CFLAGS) -o X CC=gcc X*************** X*** 20,24 **** X # variables X OBJZ = zip.o zipfile.o zipup.o fileio.o util.o globals.o $(CRYPTO) X! X OBJU = zipfile_.o zipup_.o fileio_.o util_.o globals.o X OBJN = zipnote.o $(OBJU) X--- 20,24 ---- X # variables X OBJZ = zip.o zipfile.o zipup.o fileio.o util.o globals.o $(CRYPTO) X! OBJI = deflate.o trees.o bits.o match.o X OBJU = zipfile_.o zipup_.o fileio_.o util_.o globals.o X OBJN = zipnote.o $(OBJU) X*************** X*** 64,68 **** X X util_.o: util.c zip.h ziperr.h tailor.h X! $(CC) -c $(UTILFLAGS) $@ fileio.c X X crypt_.o: crypt.c zip.h X--- 64,68 ---- X X util_.o: util.c zip.h ziperr.h tailor.h X! $(CC) -c $(UTILFLAGS) $@ util.c X X crypt_.o: crypt.c zip.h X*************** X*** 85,89 **** X X zipsplit: $(OBJS) X! $(LD) $(LDFAGS) $(OBJS) -o $@ X aout2exe $@ X del $@ X--- 85,89 ---- X X zipsplit: $(OBJS) X! $(LD) $(LDFLAGS) $(OBJS) -o $@ X aout2exe $@ X del $@ END_OF_FILE if test 12508 -ne `wc -c <'zip.dif'`; then echo shar: \"'zip.dif'\" unpacked with wrong size! fi # end of 'zip.dif' fi echo shar: End of shell archive. exit 0 -- Frank van der Linden. Internet : vdlinden@fwi.uva.nl * WARNING ---- The author of this message has once seen some AT&T Unix source * * code, so now this message is probably copyrighted by them! You have been * * reading this entirely at your own risk.. *