Changeset 2652 in kBuild for trunk/src/kash/shfile.c

Timestamp:

Sep 9, 2012 5:21:48 PM (12 years ago)

Author:

bird

Message:

kash: Fixes for hash-bang-scripts on windows. Related debug tracing fix. Another CWD slash fix. Fixed a couple of assertions.

File:

• trunk/src/kash/shfile.c (modified) (12 diffs)

trunk/src/kash/shfile.c

@@ -164 +164 @@
 static void shfile_native_close(intptr_t native, unsigned flags)
 {
-#if K_OS == K_OS_WINDOWS
+# if K_OS == K_OS_WINDOWS
     BOOL fRc = CloseHandle((HANDLE)native);
     assert(fRc); (void)fRc;
-#else
+# else
     int s = errno;
     close(native);
     errno = s;
-#endif
+# endif
     (void)flags;
 }
@@ -289 +289 @@
 }
 
-#if K_OS != K_OS_WINDOWS
+# if K_OS != K_OS_WINDOWS
 /**
  * Makes a copy of the native file, closes the original, and inserts the copy
@@ -318 +318 @@
     return fd;
 }
-#endif /* !K_OS_WINDOWS */
+# endif /* !K_OS_WINDOWS */
 
 /**
@@ -385 +385 @@
     }
     if (    *path == '/'
-#if K_OS == K_OS_WINDOWS || K_OS == K_OS_OS2
+# if K_OS == K_OS_WINDOWS || K_OS == K_OS_OS2
         ||  *path == '\\'
         ||  (   *path
@@ -391 +391 @@
              && (   (*path >= 'A' && *path <= 'Z')
                  || (*path >= 'a' && *path <= 'z')))
-#endif
+# endif
         )
     {
@@ -419 +419 @@
     }
 
-#if K_OS == K_OS_WINDOWS || K_OS == K_OS_OS2
+# if K_OS == K_OS_WINDOWS || K_OS == K_OS_OS2
     if (!strcmp(buf, "/dev/null"))
         strcpy(buf, "NUL");
-#endif
+# endif
     return 0;
 }
@@ -528 +528 @@
 
 /**
+ * Converts DOS slashes to UNIX slashes if necessary.
+ *
+ * @param   pszPath             The path to fix.
+ */
+static void shfile_fix_slashes(char *pszPath)
+{
+#if K_OS == K_OS_WINDOWS || K_OS == K_OS_OS2
+    while ((pszPath = strchr(pszPath, '\\')))
+        *pszPath++ = '/';
+#else
+    (void)pszPath;
+#endif
+}
+
+/**
  * Initializes the global variables in this file.
  */
@@ -574 +589 @@
         if (getcwd(buf, sizeof(buf)))
         {
-# if K_OS == K_OS_WINDOWS || K_OS == K_OS_OS2
-            char *pszSlash = strchr(buf, '\\');
-            while (pszSlash)
-            {
-                *pszSlash = '/';
-                pszSlash = strchr(pszSlash + 1, '\\');
-            }
-# endif
+            shfile_fix_slashes(buf);
 
             pfdtab->cwd = sh_strdup(NULL, buf);
@@ -1390 +1398 @@
         rc = -1;
 
-#else
+# ifdef DEBUG
     if (fd != shthread_get_shell()->tracefd)
-    {
+        TRACE2((NULL, "shfile_write(%d,,%d) -> %d [%d]\n", fd, len, rc, errno));
+# endif
+
+#else
+    if (fd != shthread_get_shell()->tracefd)
+    {
+        int iSavedErrno = errno;
         struct stat s;
         int x;
@@ -1398 +1412 @@
         TRACE2((NULL, "shfile_write(%d) - %lu bytes (%d) - pos %lu - before; %o\n",
                 fd, (long)s.st_size, x, (long)lseek(fd, 0, SEEK_CUR), s.st_mode ));
-        errno = 0;
+        errno = iSavedErrno;
     }
 
     rc = write(fd, buf, len);
-#endif
-
-#ifdef DEBUG
-    if (fd != shthread_get_shell()->tracefd)
-    {
-        struct stat s;
-        int x;
-        TRACE2((NULL, "shfile_write(%d,,%d) -> %d [%d]\n", fd, len, rc, errno));
-        x=fstat(fd, &s);
-        TRACE2((NULL, "shfile_write(%d) - %lu bytes (%d) - pos %lu - after\n", fd, (long)s.st_size, x, (long)lseek(fd, 0, SEEK_CUR) ));
-    }
 #endif
     return rc;
@@ -1601 +1604 @@
         char *abspath_copy = sh_strdup(psh, abspath);
         char *free_me = abspath_copy;
-        rc = chdir(path);
+        rc = chdir(abspath);
         if (!rc)
         {
@@ -1607 +1610 @@
             shmtx_enter(&pfdtab->mtx, &tmp);
 
+            shfile_fix_slashes(abspath_copy);
             free_me = pfdtab->cwd;
             pfdtab->cwd = abspath_copy;