Changeset 3912 for trunk

Timestamp:

Oct 24, 2014, 1:03:46 PM (11 years ago)

Author:

bird

Message:

trunk,0.6: Added check that the UNIXROOT_OUTSIDE env var is not set before checking whether we're inside the unixroot or not. This allowes a half chrooted setup, like if you first chroot($UNIXROOT) and chdired to it with a drive letter specified.

File:

• trunk/libc/src/kNIX/os2/fs-os2.c (modified) (1 diff)

trunk/libc/src/kNIX/os2/fs-os2.c

@@ -303 +303 @@
                 __libc_gcchUnixRoot = cch;
 
-                ULONG ulDisk, ulIgnored;
-                rc = DosQueryCurrentDisk(&ulDisk, &ulIgnored);
-                if (   rc == NO_ERROR
-                    && ulDisk + 'A' - 1 == __libc_gszUnixRoot[0])
+                if (!getenv("UNIXROOT_OUTSIDE"))
                 {
-                    if (cch == 3)
-                        __libc_gfInUnixTree = 1;
-                    else
+                    ULONG ulDisk, ulIgnored;
+                    rc = DosQueryCurrentDisk(&ulDisk, &ulIgnored);
+                    if (   rc == NO_ERROR
+                        && ulDisk + 'A' - 1 == __libc_gszUnixRoot[0])
                     {
-                        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] == '\\');
+                        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");