didn't get the hack right. REPLACE WITH FNMATCH...

SCCS-vsn: bin/sh/expand.c 5.7

diff --git a/usr/src/bin/sh/expand.c b/usr/src/bin/sh/expand.c
index 1b97802..65c1430 100644 (file)
--- a/usr/src/bin/sh/expand.c
+++ b/usr/src/bin/sh/expand.c
@@ -9,7 +9,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)expand.c   5.6 (Berkeley) %G%";
+static char sccsid[] = "@(#)expand.c   5.7 (Berkeley) %G%";

 #endif /* not lint */
 
 /*
 #endif /* not lint */
 
 /*


@@ -722,8 +722,11 @@ expandmeta(str, flag)
                }
                savelastp = exparg.lastp;
                INTOFF;
                }
                savelastp = exparg.lastp;
                INTOFF;

-               if (expdir == NULL)
-                       expdir = ckmalloc(strlen(str->text)); /* XXX - */
+               if (expdir == NULL) {
+                       int i = strlen(str->text);
+                       expdir = ckmalloc(i < 2048 ? 2048 : i); /* XXX */
+               }
+

                expmeta(expdir, str->text);
                ckfree(expdir);
                expdir = NULL;
                expmeta(expdir, str->text);
                ckfree(expdir);
                expdir = NULL;