File dice.patch of Package dice-libs
diff -ru dice-rel-3.15/lib/version.h dice-rel-3.15.new/lib/version.h
--- dice-rel-3.15/lib/version.h 1997-09-09 23:18:39.000000000 +0200
+++ dice-rel-3.15.new/lib/version.h 2007-10-27 21:45:44.000000000 +0200
@@ -40,7 +40,7 @@
#define DCC "dcc:"
#define DCC_CONFIG "dcc_config:"
#else
-#define DCC "/home/dice/"
+#define DCC "/usr/lib/dice/"
#define DCC_CONFIG DCC "config/"
#endif
diff -ru dice-rel-3.15/src/das/Makefile dice-rel-3.15.new/src/das/Makefile
--- dice-rel-3.15/src/das/Makefile 1997-09-09 19:20:35.000000000 +0200
+++ dice-rel-3.15.new/src/das/Makefile 2007-10-27 22:09:04.000000000 +0200
@@ -12,7 +12,7 @@
EXED= ../../ubin/das
EXE= das
-CFLAGS= -Wall -Wstrict-prototypes -O2 -I../.. -L../../ulib -DREGISTERED -DCOMMERCIAL -DNO_ASM -DINTELBYTEORDER -DDEBUG
+CFLAGS= -m32 -Wall -Wstrict-prototypes -O2 -I../.. -L../../ulib -DREGISTERED -DCOMMERCIAL -DNO_ASM -DINTELBYTEORDER -DDEBUG
PROTOS= protos.h
diff -ru dice-rel-3.15/src/dc1/asm1.c dice-rel-3.15.new/src/dc1/asm1.c
--- dice-rel-3.15/src/dc1/asm1.c 1997-09-09 22:57:34.000000000 +0200
+++ dice-rel-3.15.new/src/dc1/asm1.c 2007-10-27 21:58:55.000000000 +0200
@@ -232,7 +232,7 @@
printf("\tdc.l\t0\n"); /* next pointer */
printf("\tdc.l\t0\n"); /* siblings */
printf("\tdc.l\t0\n"); /* our parent */
- printf("\tdc.w\t%d\n", (40 + strlen(prefix) + strlen(SymToString(var->Sym)) + (1 + 3)) & ~3); /* size of structure */
+ printf("\tdc.w\t%ld\n", (40 + strlen(prefix) + strlen(SymToString(var->Sym)) + (1 + 3)) & ~3); /* size of structure */
printf("\tdc.w\t0\n");
printf("\tdc.l\t0\n"); /* time stamp */
printf("\tdc.l\t0\n"); /* accum time */
diff -ru dice-rel-3.15/src/dc1/Makefile dice-rel-3.15.new/src/dc1/Makefile
--- dice-rel-3.15/src/dc1/Makefile 1997-09-09 19:21:14.000000000 +0200
+++ dice-rel-3.15.new/src/dc1/Makefile 2007-10-27 22:09:08.000000000 +0200
@@ -17,7 +17,7 @@
EXED= ../../ubin/dc1
EXE= dc1
-CFLAGS= -Wall -Wstrict-prototypes -O2 -I../.. -L../../ulib -DREGISTERED -DCOMMERCIAL -DNO_ASM -DINTELBYTEORDER -DDEBUG
+CFLAGS= -m32 -Wall -Wstrict-prototypes -g -O2 -fno-strict-aliasing -I../.. -L../../ulib -DREGISTERED -DCOMMERCIAL -DNO_ASM -DINTELBYTEORDER -DDEBUG
#CFLAGS= -Wall -Wstrict-prototypes -g -I../.. -L../../ulib -DREGISTERED -DCOMMERCIAL -DNO_ASM -DINTELBYTEORDER -DDEBUG
#CFLAGS= -Wall -Wstrict-prototypes -O2 -I../.. -L../../ulib -DNO_ASM -DINTELBYTEORDER -DDEBUG
@@ -34,7 +34,6 @@
install:
install -m 0755 $(EXE) $(EXED)
- strip $(EXED)
clean:
rm -f $(PROTOS) $(OBJS) $(EXE)
diff -ru dice-rel-3.15/src/dcc/defs.h dice-rel-3.15.new/src/dcc/defs.h
--- dice-rel-3.15/src/dcc/defs.h 1997-09-09 22:46:11.000000000 +0200
+++ dice-rel-3.15.new/src/dcc/defs.h 2007-10-27 21:45:44.000000000 +0200
@@ -31,7 +31,7 @@
#else
-#define DLIBPRE "/home/dice/"
+#define DLIBPRE "/usr/lib/dice/"
#define DLIBPOS "dlib/"
#include <suplib/lists.h>
diff -ru dice-rel-3.15/src/dcc/main.c dice-rel-3.15.new/src/dcc/main.c
--- dice-rel-3.15/src/dcc/main.c 1997-09-09 23:17:01.000000000 +0200
+++ dice-rel-3.15.new/src/dcc/main.c 2007-10-27 21:42:43.000000000 +0200
@@ -127,7 +127,7 @@
short NoHeirOpt;
short NoEnvOpt;
short NoCtlOpt;
-short SlashSlashOpt;
+short SlashSlashOpt = 1;
short ProfOpt;
short DLinkPostFixOpt;
short UnixOpt;
diff -ru dice-rel-3.15/src/dcc/Makefile dice-rel-3.15.new/src/dcc/Makefile
--- dice-rel-3.15/src/dcc/Makefile 1997-09-09 19:20:12.000000000 +0200
+++ dice-rel-3.15.new/src/dcc/Makefile 2007-10-27 22:09:10.000000000 +0200
@@ -12,7 +12,7 @@
EXED= ../../ubin/dcc
EXE= dcc
-CFLAGS= -Wall -Wstrict-prototypes -O2 -I../.. -L../../ulib -DREGISTERED -DCOMMERCIAL -DNO_ASM -DINTELBYTEORDER
+CFLAGS= -m32 -Wall -Wstrict-prototypes -O2 -I../.. -L../../ulib -DREGISTERED -DCOMMERCIAL -DNO_ASM -DINTELBYTEORDER
PROTOS= DCC-protos.h
diff -ru dice-rel-3.15/src/dcpp/main.c dice-rel-3.15.new/src/dcpp/main.c
--- dice-rel-3.15/src/dcpp/main.c 1997-09-09 23:17:07.000000000 +0200
+++ dice-rel-3.15.new/src/dcpp/main.c 2007-10-27 21:45:44.000000000 +0200
@@ -109,7 +109,7 @@
if (getenv("DINCLUDE")) {
DefIncludePath = getenv("DINCLUDE");
} else {
- DefIncludePath = mergestr("/home/dice/", Prefix);
+ DefIncludePath = mergestr("/usr/lib/dice/", Prefix);
DefIncludePath = mergestr(DefIncludePath, "include/");
}
#endif
@@ -223,7 +223,7 @@
ptr[1]
);
#else
- sprintf(ABuf, "/home/dice/%sinclude/amiga%c%c",
+ sprintf(ABuf, "/usr/lib/dice/%sinclude/amiga%c%c",
Prefix,
ptr[-1],
ptr[1]
diff -ru dice-rel-3.15/src/dcpp/Makefile dice-rel-3.15.new/src/dcpp/Makefile
--- dice-rel-3.15/src/dcpp/Makefile 1997-09-09 19:19:58.000000000 +0200
+++ dice-rel-3.15.new/src/dcpp/Makefile 2007-10-27 22:09:13.000000000 +0200
@@ -12,7 +12,7 @@
EXED= ../../ubin/dcpp
EXE= dcpp
-CFLAGS= -Wall -Wstrict-prototypes -O2 -I../.. -L../../ulib -DREGISTERED -DCOMMERCIAL -DNO_ASM -DINTELBYTEORDER -DDEBUG
+CFLAGS= -m32 -Wall -Wstrict-prototypes -O2 -I../.. -L../../ulib -DREGISTERED -DCOMMERCIAL -DNO_ASM -DINTELBYTEORDER -DDEBUG
PROTOS= protos.h
diff -ru dice-rel-3.15/src/dcpp/subs.c dice-rel-3.15.new/src/dcpp/subs.c
--- dice-rel-3.15/src/dcpp/subs.c 1997-09-09 22:57:35.000000000 +0200
+++ dice-rel-3.15.new/src/dcpp/subs.c 2007-10-27 21:38:30.000000000 +0200
@@ -95,6 +95,7 @@
zalloc(bytes)
long bytes;
{
+#if 0
static char *Buf;
static long Bytes;
void *ptr;
@@ -114,6 +115,8 @@
Buf += bytes;
Bytes -= bytes;
return(ptr);
+#endif
+ return calloc(1, bytes);
}
void *
diff -ru dice-rel-3.15/src/dlink/main.c dice-rel-3.15.new/src/dlink/main.c
--- dice-rel-3.15/src/dlink/main.c 1997-09-09 23:17:20.000000000 +0200
+++ dice-rel-3.15.new/src/dlink/main.c 2007-10-27 21:45:44.000000000 +0200
@@ -196,7 +196,7 @@
#ifdef AMIGA
sprintf(DLib, "%.*sdlib:", p2 - ptr, ptr);
#else
- sprintf(DLib, "/home/dice/%.*sdlib/", p2 - ptr, ptr);
+ sprintf(DLib, "/usr/lib/dice/%.*sdlib/", p2 - ptr, ptr);
#endif
}
@@ -778,8 +778,10 @@
if (ExitCode < code)
ExitCode = code;
if (ExitCode > 5) {
+#if 0
if (Fo)
fclose(Fo);
+#endif
remove(OutName);
}
exit(ExitCode);
diff -ru dice-rel-3.15/src/dlink/Makefile dice-rel-3.15.new/src/dlink/Makefile
--- dice-rel-3.15/src/dlink/Makefile 1997-09-09 19:21:34.000000000 +0200
+++ dice-rel-3.15.new/src/dlink/Makefile 2007-10-27 22:09:16.000000000 +0200
@@ -12,7 +12,7 @@
EXED= ../../ubin/dlink
EXE= dlink
-CFLAGS= -Wall -Wstrict-prototypes -O2 -I../.. -L../../ulib -DREGISTERED -DCOMMERCIAL -DNO_ASM -DINTELBYTEORDER
+CFLAGS= -m32 -Wall -Wstrict-prototypes -O2 -I../.. -L../../ulib -DREGISTERED -DCOMMERCIAL -DNO_ASM -DINTELBYTEORDER
#CFLAGS= -Wall -Wstrict-prototypes -O2 -I../.. -L../../ulib -DNO_ASM -DINTELBYTEORDER
PROTOS= protos.h
diff -ru dice-rel-3.15/src/dlink/subs.c dice-rel-3.15.new/src/dlink/subs.c
--- dice-rel-3.15/src/dlink/subs.c 1997-09-09 22:57:36.000000000 +0200
+++ dice-rel-3.15.new/src/dlink/subs.c 2007-10-27 21:37:33.000000000 +0200
@@ -172,6 +172,7 @@
zalloc(bytes)
long bytes;
{
+#if 0
void *ptr;
static char *BufPtr1;
static char *BufPtr2;
@@ -229,6 +230,8 @@
BufLen2 = BLOCK_SIZE - bytes;
return(ptr);
+#endif
+ return calloc(1, bytes);
}
void
@@ -236,6 +239,7 @@
void *ptr;
long bytes;
{
+#if 0
long index = (bytes + 7) >> 2;
if (bytes == 0) {
@@ -246,6 +250,7 @@
FreeList[index] = (long **)ptr;
MemReclaimed += index << 2;
}
+#endif
}
void
diff -ru dice-rel-3.15/src/dmake/Makefile dice-rel-3.15.new/src/dmake/Makefile
--- dice-rel-3.15/src/dmake/Makefile 1997-09-09 19:21:48.000000000 +0200
+++ dice-rel-3.15.new/src/dmake/Makefile 2007-10-27 22:09:18.000000000 +0200
@@ -11,7 +11,7 @@
EXED= ../../ubin/dmake
EXE= dmake
-CFLAGS= -Wall -Wstrict-prototypes -O2 -I../.. -L../../ulib -DREGISTERED -DCOMMERCIAL -DNO_ASM -DINTELBYTEORDER
+CFLAGS= -m32 -Wall -Wstrict-prototypes -O2 -I../.. -L../../ulib -DREGISTERED -DCOMMERCIAL -DNO_ASM -DINTELBYTEORDER
PROTOS= dmake-protos.h
diff -ru dice-rel-3.15/src/dobj/Makefile dice-rel-3.15.new/src/dobj/Makefile
--- dice-rel-3.15/src/dobj/Makefile 1997-09-09 19:21:55.000000000 +0200
+++ dice-rel-3.15.new/src/dobj/Makefile 2007-10-27 22:09:19.000000000 +0200
@@ -11,7 +11,7 @@
EXED= ../../ubin/dobj
EXE= dobj
-CFLAGS= -Wall -Wstrict-prototypes -O2 -I../.. -L../../ulib -DREGISTERED -DCOMMERCIAL -DNO_ASM -DINTELBYTEORDER
+CFLAGS= -m32 -Wall -Wstrict-prototypes -O2 -I../.. -L../../ulib -DREGISTERED -DCOMMERCIAL -DNO_ASM -DINTELBYTEORDER
PROTOS= protos.h
diff -ru dice-rel-3.15/src/dutil/Makefile dice-rel-3.15.new/src/dutil/Makefile
--- dice-rel-3.15/src/dutil/Makefile 1997-09-09 19:39:17.000000000 +0200
+++ dice-rel-3.15.new/src/dutil/Makefile 2007-10-27 22:09:21.000000000 +0200
@@ -10,7 +10,7 @@
ED= ../../ubin/
-CFLAGS= -Wall -Wstrict-prototypes -O2 -I../.. -DREGISTERED -DCOMMERCIAL -DNO_ASM -DINTELBYTEORDER
+CFLAGS= -m32 -Wall -Wstrict-prototypes -O2 -I../.. -DREGISTERED -DCOMMERCIAL -DNO_ASM -DINTELBYTEORDER
LDFLAGS= -L../../ulib -lamiga
all: $(EXES)
diff -ru dice-rel-3.15/src/uprev/Makefile dice-rel-3.15.new/src/uprev/Makefile
--- dice-rel-3.15/src/uprev/Makefile 1997-09-09 19:22:43.000000000 +0200
+++ dice-rel-3.15.new/src/uprev/Makefile 2007-10-27 22:09:24.000000000 +0200
@@ -12,7 +12,7 @@
EXED= ../../ubin/uprev
EXE= uprev
-CFLAGS= -Wall -Wstrict-prototypes -O2 -I../.. -L../../ulib -DREGISTERED -DCOMMERCIAL -DNO_ASM -DINTELBYTEORDER
+CFLAGS= -m32 -Wall -Wstrict-prototypes -O2 -I../.. -L../../ulib -DREGISTERED -DCOMMERCIAL -DNO_ASM -DINTELBYTEORDER
all: $(EXE)
diff -ru dice-rel-3.15/suplib/Makefile dice-rel-3.15.new/suplib/Makefile
--- dice-rel-3.15/suplib/Makefile 1997-09-09 21:54:59.000000000 +0200
+++ dice-rel-3.15.new/suplib/Makefile 2007-10-27 22:09:33.000000000 +0200
@@ -1,5 +1,5 @@
-CFLAGS= -O2 -Wall -I.. -DINTELBYTEORDER
+CFLAGS= -m32 -O2 -Wall -I.. -DINTELBYTEORDER
OBJS= addhead.o addtail.o newlist.o remhead.o \
gethead.o strdup.o getsucc.o gettail.o \
getpred.o remove.o strnicmp.o getcwd.o \
diff -ru dice-rel-3.15/suplib/memory.h dice-rel-3.15.new/suplib/memory.h
--- dice-rel-3.15/suplib/memory.h 1992-10-25 22:09:00.000000000 +0100
+++ dice-rel-3.15.new/suplib/memory.h 2007-10-27 21:39:31.000000000 +0200
@@ -4,7 +4,7 @@
*/
#define setmem(ptr,len,c) memset(ptr,c,len)
-#define movmem(s,d,len) memcpy(d,s,len)
+#define movmem(s,d,len) memmove(d,s,len)
#define clrmem(d,n) memset(d,0,n)
#define cmpmem(s,d,n) bcmp(s,d,n)
diff -ru dice-rel-3.15/suplib/strdup.c dice-rel-3.15.new/suplib/strdup.c
--- dice-rel-3.15/suplib/strdup.c 1993-09-04 00:19:19.000000000 +0200
+++ dice-rel-3.15.new/suplib/strdup.c 2007-10-27 21:39:44.000000000 +0200
@@ -2,6 +2,7 @@
#include <stdlib.h>
#include <string.h>
+#undef strdup
char *
strdup(const char *str)
{
diff -ru dice-rel-3.15/suplib/string.h dice-rel-3.15.new/suplib/string.h
--- dice-rel-3.15/suplib/string.h 1992-10-25 21:49:32.000000000 +0100
+++ dice-rel-3.15.new/suplib/string.h 2007-10-27 21:39:53.000000000 +0200
@@ -3,6 +3,7 @@
* SUPLIB/STRING.H
*/
+#undef strdup
extern char *strdup(const char *);
extern int stricmp(const char *, const char *);
extern int strnicmp(const char *, const char *, int);
