Import Dev86src-0.16.3.tar.gzv0.16.3

3 files changed, 9 insertions, 6 deletions

diff --git a/ar/Makefile b/ar/Makefile
index 61772df..792a77a 100644
--- a/ar/Makefile
+++ b/ar/Makefile
@@ -18,7 +18,7 @@ install: ar86
 	install -m 755 ar86 $(LIBDIR)
 
 clean realclean clobber:
-	rm -f *.o ar86 ar.h rel_aout.h
+	rm -f *.o ar86 ar ar.h rel_aout.h
 
 $(OBJS): ar.h rel_aout.h
 
diff --git a/ar/ar b/ar/ar
deleted file mode 100755
index 48da838..0000000
--- a/ar/ar
+++ /dev/null
diff --git a/ar/ar.c b/ar/ar.c
index 319331d..28cf6e4 100644
--- a/ar/ar.c
+++ b/ar/ar.c
@@ -293,7 +293,7 @@ extern void replace_members (void);
 extern void touch_symdef_member (int outdesc, char *outname);
 extern void two_operations (void);
 extern void update_symdefs (struct mapelt *map, int archive_indesc);
-extern void usage (char *s1, char *s2);
+extern void usage (char *s1, int val);
 extern void write_archive (struct mapelt *map, int appendflag);
 extern void write_symdef_member (struct mapelt *mapelt, struct mapelt *map, int outdesc, char *outname);
 #endif
@@ -507,7 +507,7 @@ main (argc, argv)
 	break;
 
     default:
-	usage ("invalid operation %d", (void*)operation);
+	usage ("invalid operation %d", operation);
     }
 
   exit (0);
@@ -1994,10 +1994,13 @@ update_symdefs (map, archive_indesc)
 /* Print error message and usage message, and exit.  */
 
 void
-usage (s1, s2)
-     char *s1, *s2;
+usage (s1, val)
+     char *s1;
+     int val;
 {
-  error (s1, s2);
+  char vbuf[16];
+  sprintf(vbuf, "%d", val);
+  error (s1, vbuf);
   fprintf (stderr, "\
 Usage: %s [d|m|p|q|r|t|x [[abi [position-name] [cilouv]] archive file...\n",
 	   program_name);