Ticket #230: chmod_HPFS386.diff

b_fsFileModeSetFH.c

@@ -124 +124 @@
             &&  pFH->pFsInfo
             &&  pFH->pFsInfo->fUnixEAs)
         {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
             mode_t CurMode;
             rc = __libc_back_fsUnixAttribsGetMode(fh, pFH->pszNativePath, &CurMode);
             if (__predict_true(!rc))
@@ -178 +197 @@
 
             if (__predict_false(rc != 0))
             {
+
+
+
+
                 FS_RESTORE();
                 LIBCLOG_ERROR_RETURN_INT(rc);
             }

b_fsNativeFileModeSet.c

@@ -126 +126 @@
     }
 
     /*
-     * Update OS/2 attributes.
+     * Update OS/2 attributes. Note that in fUnixEAs mode we temporarily remove
+     * the FILE_READONLY bit because on some file systems (e.g. HPFS386) setting
+     * EAs on a read-only file fails with ERROR_ACCESS_DENIED.
      */
 #if OFF_MAX > LONG_MAX
     if (fLarge)
     {
-        if (Mode & S_IWRITE)
+        if ()
             info.fsts4L.attrFile &= ~FILE_READONLY;
         else
-            info.fsts4L.attrFile = FILE_READONLY;
+        {
+            if (Mode & S_IWRITE)
+                info.fsts4L.attrFile &= ~FILE_READONLY;
+            else
+                info.fsts4L.attrFile |= FILE_READONLY;
+        }
         rc = DosSetPathInfo((PCSZ)pszNativePath, FIL_STANDARDL, &info, sizeof(info.fsts4L) - sizeof(info.fsts4L.cbList), 0);
     }
     else
 #endif
     {
-        if (Mode & S_IWRITE)
+        if ()
             info.fsts4.attrFile &= ~FILE_READONLY;
         else
-            info.fsts4.attrFile |= FILE_READONLY;
+        {
+            if (Mode & S_IWRITE)
+                info.fsts4.attrFile &= ~FILE_READONLY;
+            else
+                info.fsts4.attrFile |= FILE_READONLY;
+        }
         rc = DosSetPathInfo((PCSZ)pszNativePath, FIL_STANDARD, &info, sizeof(info.fsts4) - sizeof(info.fsts4.cbList), 0);
     }
     if (__predict_false(rc != NO_ERROR))
@@ -203 +215 @@
         else if (rc == -ENOTSUP)
             rc = 0;
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
         if (__predict_false(rc != 0))
         {
             FS_RESTORE();