Changeset 2653 for trunk/src/kash/expand.c

Timestamp:

Sep 9, 2012, 8:02:54 PM (13 years ago)

Author:

bird

Message:

kash: fixed shfile_opendir on windows, and thereby argument expansion.

File:

• trunk/src/kash/expand.c (modified) (3 diffs)

trunk/src/kash/expand.c

@@ -143 +143 @@
         STPUTC(psh, '\0', psh->expdest);
         p = grabstackstr(psh, psh->expdest);
+        TRACE2((psh, "expandarg: p='%s'\n", p));
         psh->exparg.lastp = &psh->exparg.list;
         /*
@@ -1204 +1205 @@
                 if (metaflag == 0 || shfile_lstat(&psh->fdtab, psh->expdir, &statb) >= 0)
                         addfname(psh, psh->expdir);
+                TRACE2((psh, "expandarg: return #1 (metaflag=%d)\n", metaflag));
                 return;
         }
@@ -1225 +1227 @@
                 enddir[-1] = '\0';
         }
-        if ((dirp = shfile_opendir(&psh->fdtab, cp)) == NULL)
+        if ((dirp = shfile_opendir(&psh->fdtab, cp)) == NULL) {
+                TRACE2((psh, "expandarg: return #2 (shfile_opendir(,%s) failed)\n", cp));
                 return;
+        }
         if (enddir != psh->expdir)
                 enddir[-1] = '/';