Thanks very much for the prompt help on my earlier question about __GO32__.
It took me off a faint, false trail and lead to a quick resolution of the
problem. With the following changes, zip201 and the latest beta zip will
compile with V2. It's great to watch a good plan come together.
diff -c2 -r -b \djg\tests\zip\msdos/fileio.c \djg\tests\zip/fileio.c
*** \djg\tests\zip\msdos/fileio.c Fri Sep 16 18:14:54 1994
--- \djg\tests\zip/fileio.c Sat Jul 15 14:02:58 1995
***************
*** 318,321 ****
--- 318,322 ----
#ifdef __GO32__
+ # include
/* needed so size of "d" may be determined. fjd */
# include
#else
diff -c2 -r -b \djg\tests\zip\msdos/makefile.gcc \djg\tests\zip/makefile.gcc
*** \djg\tests\zip\msdos/makefile.gcc Thu Feb 11 17:04:14 1993
--- \djg\tests\zip/makefile.gcc Sat Jul 15 19:21:14 1995
***************
*** 1,6 ****
# Makefile for Zip, ZipCloak, ZipNote and ZipSplit for
! # djgcc 1.08
! # ------------- djgcc -------------
CFLAGS=-Wall -O2
UTILFLAGS=-c -DUTIL $(CFLAGS) -o
--- 1,6 ----
# Makefile for Zip, ZipCloak, ZipNote and ZipSplit for
! # djgpp 2.x
! # ------------- djgpp -------------
CFLAGS=-Wall -O2
UTILFLAGS=-c -DUTIL $(CFLAGS) -o
***************
*** 60,80 ****
$(CC) $(UTILFLAGS) $@ crypt.c
zip: $(OBJZ) $(OBJI)
$(LD) $(LDFLAGS) $(OBJZ) $(OBJI) -o $@
! aout2exe $@
del $@
zipcloak: $(OBJC)
$(LD) $(LDFLAGS) $(OBJC) -o $@
! aout2exe $@
del $@
zipnote: $(OBJN)
$(LD) $(LDFLAGS) $(OBJN) -o $@
! aout2exe $@
del $@
zipsplit: $(OBJS)
$(LD) $(LDFLAGS) $(OBJS) -o $@
! aout2exe $@
del $@
--- 60,83 ----
$(CC) $(UTILFLAGS) $@ crypt.c
+ match.o: match.s
+ $(CC) -c -x assembler-with-cpp -o $@ match.s
+
zip: $(OBJZ) $(OBJI)
$(LD) $(LDFLAGS) $(OBJZ) $(OBJI) -o $@
! stubify $@
del $@
zipcloak: $(OBJC)
$(LD) $(LDFLAGS) $(OBJC) -o $@
! stubify $@
del $@
zipnote: $(OBJN)
$(LD) $(LDFLAGS) $(OBJN) -o $@
! stubify $@
del $@
zipsplit: $(OBJS)
$(LD) $(LDFLAGS) $(OBJS) -o $@
! stubify $@
del $@
diff -c2 -r -b \djg\tests\zip\msdos/zip.h \djg\tests\zip/zip.h
*** \djg\tests\zip\msdos/zip.h Fri Sep 16 18:46:14 1994
--- \djg\tests\zip/zip.h Sat Jul 15 13:59:16 1995
***************
*** 43,49 ****
/* Define malloc() and string functions */
#ifdef MODERN
! # ifdef __GO32__
! char *strlwr(char *); /* not in include files of djgcc */
! # endif
# include
#else /* !MODERN */
--- 43,49 ----
/* Define malloc() and string functions */
#ifdef MODERN
! /* # ifdef __GO32__ */
! /* char *strlwr(char *); not in include files of djgcc */
! /* # endif not true for for recent versions. fjd */
# include
#else /* !MODERN */
***************
*** 84,90 ****
# include
# include
! # ifdef __GO32__
! int setmode(int, int); /* not in include files of djgcc */
! # endif
#endif /* MSDOS */
--- 84,90 ----
# include
# include
! /* # ifdef __GO32__ */
! /* int setmode(int, int); not in include files of djgcc */
! /* # endif not true in later versions. fjd */
#endif /* MSDOS */
I wish I could claim credit for the magic rule to make match.o, but that
is from the beta makefile.gcc. I note that the rule
match.o: match.S
doesn't work as I would expect. Is that dos related? Is the difference
file worth posting to djgpp?
Now for the nitty-gritty. In the makefile for unzip one finds the following:
coff2exe -g zipinfo
stubedit zipinfo.exe runfile=unzip.exe globbing=no
What is the switch -g supposed to do? It is not listed for V1.2 and probably
predates my involvement with pc's. I know that globbing is out in V2.
Is it necessary to set dpmi? I compiled zip in a window box. Is it dpmi
aware?
- - - -
Frank Donahoe, Emeritus - Physics fdonahoe@wilkes1.wilkes.edu
Wilkes University, Box 111 717-675-2493 (H)
Wilkes-Barre, PA 18766 717-675-6567 (fax)
USA `Haste makes entropy!' Clausius
- - - -