Changeset 3697 for branches/libc-0.6/src/emx

Timestamp:

Mar 16, 2011, 2:11:32 AM (14 years ago)

Author:

bird

Message:

libc: Added new env.var. LIBC_UNIX_EAS for controlling where EAs are used. Fixes #43.

File:

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

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

@@ -226 +226 @@
 static _fmutex        g_mtxFSInfoVolumes = _FMUTEX_INITIALIZER_EX(_FMC_MUST_COMPLETE, "mtxFSInfoVolumes");
 
+/** Array of Unix EA settings overrides for all possible OS/2 volumes.
+ * Tristate: -1 force off, 0 default, 1 force on.
+ */
+static char           g_achUnixEAsOverrides['Z' - 'A' + 1];
+
 
 /*******************************************************************************
@@ -436 +441 @@
     }
     DosFreeModule(hmod);
+    
+    /*
+     * Look for the UNIX EAs control environment variable.
+     * The value form: !a, c, !d-e
+     */
+    const char *pszUnixEAs = getenv("LIBC_UNIX_EAS");
+    if (pszUnixEAs)
+    {
+        while (*pszUnixEAs)
+        {
+            char chDrv;
+            while ((chDrv = *pszUnixEAs) == ',' || chDrv == ';' || chDrv == ' ' || chDrv == '\t')
+                pszUnixEAs++;
+            if (!chDrv)
+                break;
+
+            /* check for the operator. */
+            int fOverride = 1;
+            if (chDrv == '!')
+            {
+                fOverride = -1;
+                chDrv = *++pszUnixEAs;
+            }
+
+            /* check for the first drive letter, upper case it. */
+            if (chDrv >= 'a' && chDrv <= 'z')
+                chDrv -= 'a' - 'A';
+            if (chDrv < 'A' || chDrv > 'Z')
+                LIBCLOG_ERROR_RETURN_MSG(-1, "Bad LIBC_UNIX_EAS value; ch=%c\n", chDrv);
+            pszUnixEAs++;
+            if (*pszUnixEAs == ':')
+                pszUnixEAs++;
+
+            /* check if it is a range spec. */
+            char chDrv2;
+            while ((chDrv2 = *pszUnixEAs) == ' ' || chDrv2 == '\t')
+                pszUnixEAs++;
+            if (chDrv2 == '-')
+            {
+                pszUnixEAs++;
+                while ((chDrv2 = *pszUnixEAs) == ' ' || chDrv2 == '\t')
+                    pszUnixEAs++;
+
+                if (chDrv >= 'a' && chDrv <= 'z')
+                    chDrv -= 'a' - 'A';
+                if (chDrv < 'A' || chDrv > 'Z')
+                    LIBCLOG_ERROR_RETURN_MSG(-1, "Bad LIBC_UNIX_EAS value; ch=%c\n", chDrv2);
+                pszUnixEAs++;
+                if (*pszUnixEAs == ':')
+                    pszUnixEAs++;
+            }
+            else
+                chDrv2 = chDrv;
+
+            /* Be nice and swap the values if they are not in ascending order. */
+            if (chDrv2 < chDrv)
+            {
+                char chDrvTmp = chDrv2;
+                chDrv2 = chDrv;
+                chDrv = chDrvTmp;
+            }
+
+            /* apply them. */
+            do
+                g_achUnixEAsOverrides[chDrv - 'A'] = fOverride;
+            while (chDrv++ < chDrv2);
+        }
+    }
+
     LIBCLOG_RETURN_INT(0);
 }
@@ -1859 +1933 @@
     /*else if (!strcmp(pFsInfo->szName, "FAT32"))
     { } */
+
+    /* check the Unix EAs overrides. */
+    if (g_achUnixEAsOverrides[minor(Dev) - 'A'] != 0)
+        pFsInfo->fUnixEAs = g_achUnixEAsOverrides[minor(Dev) - 'A'] > 0;
 
     LIBCLOG_MSG2("fsInfoObjUpdate: dev:%#x mp:%s fsd:%s fZeroNewBytes=%d fUnixEAs=%d\n",