Changeset 3911 for branches/libc-0.6/src

Timestamp:

Oct 24, 2014, 12:49:58 PM (11 years ago)

Author:

bird

Message:

0.6,trunk: Introducing env var UNIXROOT_CHROOTED for faking chroot chdir (the latter for preserving whatever is the current dir + drive, unless we're inside (under) the unixroot).

File:

• branches/libc-0.6/src/emx/src/lib/sys/fs.c (modified) (2 diffs)

branches/libc-0.6/src/emx/src/lib/sys/fs.c

@@ -320 +320 @@
              */
             const char *psz = getenv("UNIXROOT");
-            if (psz)
+            if (   psz
+                && ((psz[0] >= 'A' && psz[0] <= 'Z') || (psz[0] >= 'a' && psz[0] <= 'z'))
+                && psz[1] == ':'
+                && (psz[2] == '\\' || psz[2] == '/')
+                )
             {
                 LIBCLOG_MSG("Unofficial unixroot=%s\n", psz);
@@ -331 +335 @@
                 memcpy(&__libc_gszUnixRoot[0], psz, cch + 1);
 
+                /* Clean it up a tiny little bit. */
+                if (__libc_gszUnixRoot[0] >= 'a')
+                    __libc_gszUnixRoot[0] -= 'a' - 'A';
+
+                size_t off = cch;
+                while (off-- > 0)
+                    if (__libc_gszUnixRoot[off] == '\\')
+                        __libc_gszUnixRoot[off] = '/';
+
                 /* Register the rewrite rule. */
                 gUnixRootRewriteRule.cchTo = cch;
                 if (__libc_PathRewriteAdd(&gUnixRootRewriteRule, 1))
                     LIBCLOG_RETURN_INT(-1);
-            }
+
+                /* Should we pretend chroot($UNIXROOT) + chdir()? */
+                psz = getenv("UNIXROOT_CHROOTED");
+                if (psz && *psz != '\0')
+                {
+                    __libc_gcchUnixRoot = cch;
+
+                    ULONG ulDisk, ulIgnored;
+                    rc = DosQueryCurrentDisk(&ulDisk, &ulIgnored);
+                    if (   rc == NO_ERROR
+                        && ulDisk + 'A' - 1 == __libc_gszUnixRoot[0])
+                    {
+                        if (cch == 3)
+                            __libc_gfInUnixTree = 1;
+                        else
+                        {
+                            char szCurDir[PATH_MAX];
+                            ULONG cbCurDir = sizeof(szCurDir);
+                            rc = DosQueryCurrentDir(0, (PSZ)&szCurDir[0], &cbCurDir);
+                            __libc_gfInUnixTree = rc == NO_ERROR
+                                               && cch <= cbCurDir + 3
+                                               && memicmp(&__libc_gszUnixRoot[3], szCurDir, cch - 3) == 0
+                                               && (   cch == cbCurDir + 3
+                                                   || szCurDir[cch - 3] == '\\');
+                        }
+
+                    }
+                    LIBCLOG_MSG(__libc_gfInUnixTree ? "Inside unixroot chroot.\n" : "Outside unixroot chroot.\n");
+                }
+            }
+            else if (psz)
+                LIBCLOG_MSG("Invalid UNIXROOT=\"%s\" - must start with drive letter and root slash.\n", psz);
         }
     }