libc5 glob is pretty stupid and doesn't do GLOB_BRACE or GLOB_TILDE

 -Erik

diff --git a/lash.c b/lash.c
index dcec14abae68b07ad18a96344485f10ba3ccf911..3c52e2a28d08a81e3fdc7556ecc4cac28cf22cb0 100644 (file)
--- a/lash.c
+++ b/lash.c
@@ -1010,7 +1010,14 @@ static int expand_arguments(char *command)
         * (char*) into cmd (char**, one word per string) */
        {
         
-               int flags = GLOB_NOCHECK|GLOB_BRACE|GLOB_TILDE;
+               int flags = GLOB_NOCHECK
+#ifdef GLOB_BRACE
+                               | GLOB_BRACE
+#endif 
+#ifdef GLOB_TILDE
+                               | GLOB_TILDE
+#endif 
+                       ;
                char *tmpcmd, *cmd, *cmd_copy;
                /* We need a clean copy, so strsep can mess up the copy while
                 * we write stuff into the original (in a minute) */

diff --git a/sh.c b/sh.c
index dcec14abae68b07ad18a96344485f10ba3ccf911..3c52e2a28d08a81e3fdc7556ecc4cac28cf22cb0 100644 (file)
--- a/sh.c
+++ b/sh.c
@@ -1010,7 +1010,14 @@ static int expand_arguments(char *command)
         * (char*) into cmd (char**, one word per string) */
        {
         
-               int flags = GLOB_NOCHECK|GLOB_BRACE|GLOB_TILDE;
+               int flags = GLOB_NOCHECK
+#ifdef GLOB_BRACE
+                               | GLOB_BRACE
+#endif 
+#ifdef GLOB_TILDE
+                               | GLOB_TILDE
+#endif 
+                       ;
                char *tmpcmd, *cmd, *cmd_copy;
                /* We need a clean copy, so strsep can mess up the copy while
                 * we write stuff into the original (in a minute) */

diff --git a/shell/lash.c b/shell/lash.c
index dcec14abae68b07ad18a96344485f10ba3ccf911..3c52e2a28d08a81e3fdc7556ecc4cac28cf22cb0 100644 (file)
--- a/shell/lash.c
+++ b/shell/lash.c
@@ -1010,7 +1010,14 @@ static int expand_arguments(char *command)
         * (char*) into cmd (char**, one word per string) */
        {
         
-               int flags = GLOB_NOCHECK|GLOB_BRACE|GLOB_TILDE;
+               int flags = GLOB_NOCHECK
+#ifdef GLOB_BRACE
+                               | GLOB_BRACE
+#endif 
+#ifdef GLOB_TILDE
+                               | GLOB_TILDE
+#endif 
+                       ;
                char *tmpcmd, *cmd, *cmd_copy;
                /* We need a clean copy, so strsep can mess up the copy while
                 * we write stuff into the original (in a minute) */