Changeset 3777 for trunk

Timestamp:

Mar 22, 2012, 2:01:57 PM (13 years ago)

Author:

bird

Message:

chmod/fchmod: Add unix mode EA if not found and the FS supports it. Fixes #205.

Location:

trunk/libc/src/kNIX/os2

Files:

• b_fsNativeFileModeSet.c (modified) (2 diffs)
• fhOS2File.c (modified) (2 diffs)

trunk/libc/src/kNIX/os2/b_fsNativeFileModeSet.c

@@ -144 +144 @@
         mode_t CurMode;
         rc = __libc_back_fsUnixAttribsGetMode(-1, pszNativePath, &CurMode);
-        if (__predict_true(!rc))
+        if (__predict_true(!rc || rc == -ENOTSUP))
         {
             /* correct the passed in Mode mask. */
             Mode &= ALLPERMS; /** @todo sticky bit and set uid/gid access validation... */
-            Mode |= CurMode & ~ALLPERMS;
+            if (!(CurMode & ~ALLPERMS))
+            {
+#if OFF_MAX > LONG_MAX
+                if ((fLarge ? info.fsts4L.attrFile : info.fsts4.attrFile) & FILE_DIRECTORY)
+#else
+                if (info.fsts4.attrFile & FILE_DIRECTORY)
+#endif
+                    Mode |= S_IFDIR;
+                else
+                    Mode |= S_IFREG;
+            }
+            else
+                Mode |= CurMode & ~ALLPERMS;
 
             /* construct FEA2 stuff. */
@@ -184 +196 @@
             }
         }
-        else if (rc == -ENOTSUP)
-            rc = 0;
-
         if (__predict_false(rc != 0))
         {

trunk/libc/src/kNIX/os2/fhOS2File.c

@@ -608 +608 @@
             mode_t fCurMode;
             rc = __libc_back_fsUnixAttribsGetMode(pFH->fh, pFH->pszNativePath, &fCurMode);
-            if (__predict_true(!rc))
+            if (__predict_true(!rc || rc == -ENOTSUP))
             {
                 /* correct the passed in Mode mask. */
                 fMode &= ALLPERMS; /** @todo sticky bit and set uid/gid access validation... */
-                fMode |= fCurMode & ~ALLPERMS;
+                if (!(fCurMode & ~ALLPERMS))
+                    fMode |= S_IFREG;
+                else
+                    fMode |= fCurMode & ~ALLPERMS;
 
                 /* construct FEA2 stuff. */
@@ -653 +656 @@
                 }
             }
-            else if (rc == -ENOTSUP)
-                rc = 0;
         }
         if (!rc)