diff -ur --exclude ID --exclude modutils-2.3.prj --exclude .modutils-2.3.prcs_aux modutils-2.3.2/ChangeLog modutils-2.3.3/ChangeLog
--- modutils-2.3.2/ChangeLog	Thu Aug 26 23:12:04 1999
+++ modutils-2.3.3/ChangeLog	Fri Oct  8 16:31:33 1999
@@ -1,3 +1,12 @@
+1999-10-08  Keith Owens  <kaos@ocs.com.au>
+
+	modutils 2.3.3
+
+	* Minor bug fixes.
+	  Do not malloc zero bytes.
+	  Return correct error message for modprobe -r.
+	  Remove spurious Makefile variables.
+
 1999-08-25  Keith Owens  <kaos@ocs.com.au>
 
 	modutils 2.3.2
diff -ur --exclude ID --exclude modutils-2.3.prj --exclude .modutils-2.3.prcs_aux modutils-2.3.2/depmod/Makefile.in modutils-2.3.3/depmod/Makefile.in
--- modutils-2.3.2/depmod/Makefile.in	Wed Aug 25 16:26:49 1999
+++ modutils-2.3.3/depmod/Makefile.in	Fri Oct  8 16:12:37 1999
@@ -26,7 +26,7 @@
 all: .depend depmod
 
 depmod: $(OBJS) ../util/libutil.a ../obj/libobj.a
-	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^
+	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
 
 clean:
 	rm -f *.o
diff -ur --exclude ID --exclude modutils-2.3.prj --exclude .modutils-2.3.prcs_aux modutils-2.3.2/genksyms/Makefile.in modutils-2.3.3/genksyms/Makefile.in
--- modutils-2.3.2/genksyms/Makefile.in	Wed Aug 25 16:26:49 1999
+++ modutils-2.3.3/genksyms/Makefile.in	Fri Oct  8 16:12:53 1999
@@ -23,7 +23,7 @@
 all: genksyms
 
 genksyms: genksyms.o parse.o lex.o ../util/libutil.a
-	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^
+	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
 
 $(srcdir)/parse.c $(srcdir)/parse.h: parse.y
 	@echo "expect 6 shift/reduce conflicts and 5 reduce/reduce conflicts."
diff -ur --exclude ID --exclude modutils-2.3.prj --exclude .modutils-2.3.prcs_aux modutils-2.3.2/include/version.h modutils-2.3.3/include/version.h
--- modutils-2.3.2/include/version.h	Thu Aug 26 09:47:00 1999
+++ modutils-2.3.3/include/version.h	Fri Oct  8 16:19:35 1999
@@ -1 +1 @@
-#define MODUTILS_VERSION "2.3.2"
+#define MODUTILS_VERSION "2.3.3"
diff -ur --exclude ID --exclude modutils-2.3.prj --exclude .modutils-2.3.prcs_aux modutils-2.3.2/insmod/Makefile.in modutils-2.3.3/insmod/Makefile.in
--- modutils-2.3.2/insmod/Makefile.in	Wed Aug 25 16:26:49 1999
+++ modutils-2.3.3/insmod/Makefile.in	Fri Oct  8 16:13:09 1999
@@ -31,23 +31,23 @@
 
 # Rule for building "normal" modutils executables (non-combined)
 %: %.c ../util/libutil.a
-	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o $@ $< ../util/libutil.a
+	$(CC) $(CFLAGS) $(DEFS) -o $@ $< ../util/libutil.a $(LDFLAGS)
 
 #=====================================================================
 
 all: .depend $(TARGETS)
 
 insmod: insmod.o $(COMBOBJS) ../obj/libobj.a ../util/libutil.a
-	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^
+	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
 
 insmod.static: insmod.o $(COMBOBJS) ../obj/libobj.a ../util/libutil.a
-	$(CC) -static $(LDFLAGS) $(CFLAGS) -o $@ $^
+	$(CC) -static $(CFLAGS) -o $@ $^ $(LDFLAGS)
 
 $(COMB): insmod
 	ln -sf $^ $@
 
 modinfo: modinfo.c ../obj/libobj.a ../util/libutil.a
-	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o $@ $^
+	$(CC) $(CFLAGS) $(DEFS) -o $@ $^ $(LDFLAGS)
 
 install install-bin: all
 	@set -x;\
diff -ur --exclude ID --exclude modutils-2.3.prj --exclude .modutils-2.3.prcs_aux modutils-2.3.2/insmod/modprobe.c modutils-2.3.3/insmod/modprobe.c
--- modutils-2.3.2/insmod/modprobe.c	Wed Aug 25 16:26:49 1999
+++ modutils-2.3.3/insmod/modprobe.c	Fri Oct  8 16:07:27 1999
@@ -850,8 +850,10 @@
 
 	for (m = module_stat, i = 0; i < n_module_stat; ++i, ++m) {
 		if (strcmp(m->name, kname) == 0) {
-			if (m->nrefs != 0 || m->usecount != 0)
+			if (m->nrefs != 0 || m->usecount != 0) {
+				errno = EBUSY;
 				return -1; /* Busy */
+			}
 			break;
 		}
 	}
diff -ur --exclude ID --exclude modutils-2.3.prj --exclude .modutils-2.3.prcs_aux modutils-2.3.2/kerneld/Makefile.in modutils-2.3.3/kerneld/Makefile.in
--- modutils-2.3.2/kerneld/Makefile.in	Wed Aug 25 16:26:49 1999
+++ modutils-2.3.3/kerneld/Makefile.in	Fri Oct  8 16:13:20 1999
@@ -47,7 +47,7 @@
 all: .depend $(PROGS)
 
 kerneld: kerneld.o ../util/libutil.a
-	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ $(LDLIBS)
+	$(CC) $(CFLAGS) -o $@ $^ $(LDLIBS) $(LDFLAGS)
 
 install install-bin: all
 	for i in $(PROGS); do \
diff -ur --exclude ID --exclude modutils-2.3.prj --exclude .modutils-2.3.prcs_aux modutils-2.3.2/obj/Makefile.in modutils-2.3.3/obj/Makefile.in
--- modutils-2.3.2/obj/Makefile.in	Wed Aug 25 16:26:49 1999
+++ modutils-2.3.3/obj/Makefile.in	Fri Oct  8 16:14:55 1999
@@ -10,8 +10,6 @@
 ARCH = @ARCH@
 CC = @CC@
 CFLAGS = @CFLAGS@ -Wall
-LDFLAGS = @LDFLAGS@
-INSTALL = @INSTALL@
 RANLIB = @RANLIB@
 
 DEFS = -I$(srcdir)/../include -D_GNU_SOURCE @DEFS@
diff -ur --exclude ID --exclude modutils-2.3.prj --exclude .modutils-2.3.prcs_aux modutils-2.3.2/obj/obj_reloc.c modutils-2.3.3/obj/obj_reloc.c
--- modutils-2.3.2/obj/obj_reloc.c	Wed Aug 25 16:26:49 1999
+++ modutils-2.3.3/obj/obj_reloc.c	Fri Oct  8 16:36:25 1999
@@ -217,8 +217,11 @@
       struct obj_section *s = f->sections[i];
       if (s->header.sh_type == SHT_NOBITS)
 	{
-	  s->contents = memset(xmalloc(s->header.sh_size),
-			       0, s->header.sh_size);
+	  if (s->header.sh_size)
+	    s->contents = memset(xmalloc(s->header.sh_size),
+				 0, s->header.sh_size);
+	  else
+	    s->contents = NULL;
 	  s->header.sh_type = SHT_PROGBITS;
 	}
     }
diff -ur --exclude ID --exclude modutils-2.3.prj --exclude .modutils-2.3.prcs_aux modutils-2.3.2/util/Makefile.in modutils-2.3.3/util/Makefile.in
--- modutils-2.3.2/util/Makefile.in	Wed Aug 25 17:22:12 1999
+++ modutils-2.3.3/util/Makefile.in	Fri Oct  8 16:15:07 1999
@@ -10,8 +10,6 @@
 ARCH = @ARCH@
 CC = @CC@
 CFLAGS = @CFLAGS@ -Wall
-LDFLAGS = @LDFLAGS@
-INSTALL = @INSTALL@
 RANLIB = @RANLIB@
 
 DEFS = -I$(srcdir)/../include -D_GNU_SOURCE @DEFS@