Path: blob/main/archivers/arc/files/patch-arcmisc.c
16461 views
--- arcmisc.c.orig 2013-06-27 02:00:19 UTC1+++ arcmisc.c2@@ -6,7 +6,9 @@3*/45#include <stdio.h>6+#include <stdarg.h>7#include <ctype.h>8+#include <unistd.h>9#include "arc.h"1011#include <string.h>12@@ -68,7 +70,6 @@ chdir(dirname)13#define DIRECT direct14#endif15#include <sys/stat.h>16- int rename(), unlink();17#include <fcntl.h>18#endif1920@@ -110,7 +111,7 @@ move(oldnam, newnam)21move(oldnam, newnam)22char *oldnam, *newnam;23{24- FILE *fopen(), *old, *new;25+ FILE *old, *new;26#if !_MTS27struct stat oldstat;28#endif29@@ -225,11 +226,13 @@ VOID30}31/* VARARGS1 */32VOID33-arcdie(s, arg1, arg2, arg3)34- char *s;35+arcdie(const char *s, ...)36{37+ va_list args;38fprintf(stderr, "ARC: ");39- fprintf(stderr, s, arg1, arg2, arg3);40+ va_start(args, s);41+ vfprintf(stderr, s, args);42+ va_end(args);43fprintf(stderr, "\n");44#if UNIX45perror("UNIX");46@@ -247,7 +250,6 @@ gcdir(dirname)47char *dirname;4849{50- char *getcwd();51#if GEMDOS52int drv;53char *buf;54@@ -310,11 +312,7 @@ dir(filename) /* get files, one by one */55static struct DIRECT **namelist;56static char **NameList;57static char namecopy[STRLEN], *dirname;58-#if UNIX59- int alphasort();60- int scandir();61-#endif /* UNIX */62- int fmatch();63+ int fmatch(const struct DIRECT *);64static int Nnum = 0, ii;656667@@ -354,10 +352,9 @@ int68*/6970int71-fmatch(direntry)72- struct DIRECT *direntry;73+fmatch(const struct DIRECT *direntry)74{75- char *string;76+ const char *string;7778string = direntry->d_name;79808182