source: npl/system/netkit-ftp/patches/22-netkit-ftp-0.17-arg_max.patch @ f9ce31e

netkit-ftp-0.17/ftp/glob.c

@@ -50 +50 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 #include "ftp_var.h"  /* for protos only */
 #include "glob.h"
@@ -57 +58 @@
 #define QUOTE 0200
 #define TRIM 0177
 #define eq(a,b)         (strcmp(a, b)==0)
-#define GAVSIZ          (ARG_MAX/6)
+#define GAVSIZ          (sysconf(_SC_ARG_MAX)/6)
 #define isdir(d)        ((d.st_mode & S_IFMT) == S_IFDIR)
 
 const char *globerr;
@@ -115 +116 @@
 ftpglob(const char *v)
 {
         char agpath[BUFSIZ];
-        entry agargv[GAVSIZ];
+        entry *agargv;
         centry vv[2];
         vv[0].text = v;
         vv[1].text = NULL;
@@ -133 +134 @@
         /* added ()'s to sizeof, (ambigious math for the compiler) */
         lastgpathp = agpath + (sizeof(agpath)- 2);
 
+        agargv = (entry *)malloc(sizeof (entry) * GAVSIZ);
+        if (agargv == NULL) fatal("Out of memory");
         ginit(agargv); 
         globcnt = 0;
         collect(v);
@@ -156 +159 @@
         gargv = agargv; 
         sortbas = agargv; 
         gargc = 0;
-        gnleft = ARG_MAX - 4;
+        gnleft = sysconf(_SC_ARG_MAX) - 4;
 }
 
 static 
@@ -674 +677 @@
 {
     int i;
     for (i=0; av[i].text; i++) free(av[i].text);
+    free((void *)av);
 }
 
 static