app-arch/arc/5.21o/1: arc-5.21o.patch

Makefile

@@ -38 +38 @@
 #SYSTEM = -DBSD=1
 SYSTEM = -DSYSV=1
 
-OPT = -O
+OPT = -O2 -DNEED_ALPHASORT 
 # For MWC 3.0 on the Atari ST, use:
 #CFLAGS = -VCOMPAC -VPEEP
 CFLAGS = $(OPT) $(SYSTEM)
 
 # GNU's gcc is very nice, if you've got it. Otherwise just cc.
 #CC = cgcc -mshort -mbaserel
-CC = cc
+#CC = cc
 
 # tmclock is only needed on Unix systems...
 TMCLOCK = tmclock.o

arcdos.c

@@ -33 +33 @@
 #if     BSD
 #include <sys/time.h>
 #else   
-#include <time.h>               /* Sys V. Bleah. */
+#include <sys/time.h>           /* Sys V. Bleah. */
 #if     NEED_TIMEVAL
 struct  timeval {
         long    tv_sec;

arcmisc.c

@@ -8 +8 @@
 #include "arc.h"
 
 #include <string.h>
+#include <dirent.h>
+#include <errno.h>
 #if     BSD
 #include <strings.h>
 #endif
@@ -211 +213 @@
 
 #endif
 
+#if UNIX
+
+#define DIRSIZ(d) (sizeof(struct dirent) + strlen(d->d_name) + 1)
+#define INITIAL_SIZE 30
+
+int
+scandir(name, dirlist, selector, sorter)
+        const char      *name;
+        struct dirent   ***dirlist;
+        int             (*selector)();
+        int             (*sorter)();
+{
+        static struct dirent *E;
+        struct dirent   **names;
+        DIR             *Dp;
+        int             i;
+        int             size = INITIAL_SIZE;
+
+        if (!(names = (struct dirent **) malloc(size * sizeof names[0])) ||
+             access(name, R_OK | X_OK) || !(Dp = opendir(name)))
+                return -1;
+
+        /* Read entries in the directory. */
+
+        for (i = 0; (E = readdir(Dp)); )
+                if (selector == NULL || (*selector)(E))
+        {
+                /* User wants them all, or he wants this one. */
+                if (++i >= size)
+                {
+                        size <<= 1;
+                        names = (struct dirent **) realloc(names,
+                                                size * sizeof names[0]);
+                        if (names == NULL)
+                        {
+                                closedir(Dp);
+                                free(&names);
+                                return(-1);
+                        }
+                }
+
+                /* Copy the entry. */
+                names[i - 1] = (struct dirent *) malloc(DIRSIZ(E));
+                if (names[i - 1] == NULL)
+                {
+                        closedir(Dp);
+                        free(&names);
+                        return(-1);
+                }
+                strcpy(names[i - 1]->d_name, E->d_name);
+        }
+
+        /* Close things off. */
+        names = (struct dirent **) realloc(names,
+                                        (i + 1) * sizeof names[0]);
+        names[i] = 0;
+        *dirlist = names;
+        closedir(Dp);
+
+        /* Sort? */
+        if (i && sorter)
+                qsort((char *)names, i, sizeof names[0], sorter);
+
+        return i;
+}
+#endif
+
 VOID
 upper(string)
         char           *string;
@@ -309 +378 @@
         static char   **NameList;
         static char     namecopy[STRLEN], *dirname;
 #if     UNIX
-        int             alphasort();
-        int             scandir();
+        //int             alphasort();
+        //int             scandir();
 #endif                          /* UNIX */
+
         int             fmatch();
         static int      Nnum = 0, ii;