Changeset 2653 in kBuild for trunk

Timestamp:

Sep 9, 2012 6:02:54 PM (12 years ago)

Author:

bird

Message:

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

Location:

trunk/src/kash

Files:

trunk/src/kash/eval.c

-              r2424
+              r2653
         psh->back_exitstatus = 0;
+        /** @todo r=bird: Why is arguments and envvars expanded in this
+         * particular order?  It would be both faster and simpler to do the
+         * envvars first and then continue with the arguments... */
         arglist.lastp = &arglist.list;
         varflag = 1;

-              r2306
+              r2653
         STPUTC(psh, '\0', psh->expdest);
         p = grabstackstr(psh, psh->expdest);
+        TRACE2((psh, "expandarg: p='%s'\n", p));
         psh->exparg.lastp = &psh->exparg.list;
         /*
 …
                 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;
+        }
 …
                 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] = '/';

-              r2652
+              r2653
     shdir  *pdir = NULL;
+    TRACE2((NULL, "shfile_opendir: dir='%s'\n", dir));
+    shfile_init_globals();
     if (g_pfnNtQueryDirectoryFile)
+    {
 …
+            }
             else
+                shfile_dos2errno(GetLastError());
+            {
+                errno = shfile_dos2errno(GetLastError());
+                TRACE2((NULL, "shfile_opendir: CreateFileA(%s) -> %d/%d\n", abspath, GetLastError(), errno));
+            }
+        }
+    }
 …
     return pdir;
 #else
+    TRACE2((NULL, "shfile_opendir: dir='%s'\n", dir));
     return (shdir *)opendir(dir);
 #endif

Note: See TracChangeset for help on using the changeset viewer.