Changeset 3792 for branches/libc-0.6

Timestamp:

Mar 23, 2012, 1:48:44 AM (13 years ago)

Author:

bird

Message:

Reinstated FEA_NEEDEA on symbolic links and other special stuff. Only dropping it on directories and regular files.

Location:

branches/libc-0.6/src/emx/src/lib/sys

Files:

• b_fsFileModeSetFH.c (modified) (1 diff)
• b_fsNativeFileModeSet.c (modified) (1 diff)
• b_nativeSymlinkCreate.c (modified) (1 diff)
• fs.c (modified) (1 diff)

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

@@ -159 +159 @@
                 EaOp2.oError = 0;
 
+                if (!S_ISREG(Mode) && !S_ISDIR(Mode))
+                    EAs.fEA = FEA_NEEDEA;
+
                 /* finally, try update / add the EA. */
                 rc = DosSetFileInfo(fh, FIL_QUERYEASIZE, &EaOp2, sizeof(EaOp2));

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

@@ -202 +202 @@
             EaOp2.oError = 0;
 
+            if (!S_ISREG(Mode) && !S_ISDIR(Mode))
+                EAs.fEA = FEA_NEEDEA;
+
             /* finally, try update / add the EA. */
             rc = DosSetPathInfo((PCSZ)pszNativePath, FIL_QUERYEASIZE, &EaOp2, sizeof(EaOp2), 0);

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

@@ -69 +69 @@
     {
         sizeof(__libc_gFsUnixAttribsCreateSymlinkFEA2List),
-        OFF(Core.offGID,    Core.offUID),   0,  sizeof(EA_UID) - 1,   sizeof(uint32_t) + 4, EA_UID,   EAT_BINARY, sizeof(uint32_t), 0, "",
-        OFF(Core.offMode,   Core.offGID),   0,  sizeof(EA_GID) - 1,   sizeof(uint32_t) + 4, EA_GID,   EAT_BINARY, sizeof(uint32_t), 0, "",
-        OFF(Core.offINO,    Core.offMode),  0,  sizeof(EA_MODE) - 1,  sizeof(uint32_t) + 4, EA_MODE,  EAT_BINARY, sizeof(uint32_t), 0, "",
-        OFF(Core.offRDev,   Core.offINO),   0,  sizeof(EA_INO) - 1,   sizeof(uint64_t) + 4, EA_INO,   EAT_BINARY, sizeof(uint64_t), 0, "",
-        OFF(Core.offGen,    Core.offRDev),  0,  sizeof(EA_RDEV) - 1,  sizeof(uint32_t) + 4, EA_RDEV,  EAT_BINARY, sizeof(uint32_t), 0, "",
-        OFF(Core.offFlags,  Core.offGen),   0,  sizeof(EA_GEN) - 1,   sizeof(uint32_t) + 4, EA_GEN,   EAT_BINARY, sizeof(uint32_t), 0, "",
-        OFF(offSymlink,     Core.offFlags), 0,  sizeof(EA_FLAGS) - 1, sizeof(uint32_t) + 4, EA_FLAGS, EAT_BINARY, sizeof(uint32_t), 0, "",
+        OFF(Core.offGID,    Core.offUID),   FEA_NEEDEA,  sizeof(EA_UID) - 1,   sizeof(uint32_t) + 4, EA_UID,   EAT_BINARY, sizeof(uint32_t), 0, "",
+        OFF(Core.offMode,   Core.offGID),   FEA_NEEDEA,  sizeof(EA_GID) - 1,   sizeof(uint32_t) + 4, EA_GID,   EAT_BINARY, sizeof(uint32_t), 0, "",
+        OFF(Core.offINO,    Core.offMode),  FEA_NEEDEA,  sizeof(EA_MODE) - 1,  sizeof(uint32_t) + 4, EA_MODE,  EAT_BINARY, sizeof(uint32_t), 0, "",
+        OFF(Core.offRDev,   Core.offINO),   FEA_NEEDEA,  sizeof(EA_INO) - 1,   sizeof(uint64_t) + 4, EA_INO,   EAT_BINARY, sizeof(uint64_t), 0, "",
+        OFF(Core.offGen,    Core.offRDev),  FEA_NEEDEA,  sizeof(EA_RDEV) - 1,  sizeof(uint32_t) + 4, EA_RDEV,  EAT_BINARY, sizeof(uint32_t), 0, "",
+        OFF(Core.offFlags,  Core.offGen),   FEA_NEEDEA,  sizeof(EA_GEN) - 1,   sizeof(uint32_t) + 4, EA_GEN,   EAT_BINARY, sizeof(uint32_t), 0, "",
+        OFF(offSymlink,     Core.offFlags), FEA_NEEDEA,  sizeof(EA_FLAGS) - 1, sizeof(uint32_t) + 4, EA_FLAGS, EAT_BINARY, sizeof(uint32_t), 0, "",
     },
-    0,                                      0,  sizeof(EA_SYMLINK) - 1, 0              + 4, EA_SYMLINK,EAT_ASCII, 0,                ""
+    0,                                      FEA_NEEDEA,  sizeof(EA_SYMLINK) - 1, 0              + 4, EA_SYMLINK,EAT_ASCII, 0,                ""
 #undef OFF
 };

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

@@ -714 +714 @@
     pFEA->cbName            = sizeof(EA_SYMLINK) - 1;
     pFEA->cbValue           = cchTarget + sizeof(USHORT) * 2;
-    pFEA->fEA               = 0;
+    pFEA->fEA               = FEA_NEEDEA;
     memcpy(pFEA->szName, EA_SYMLINK, sizeof(EA_SYMLINK));
     PUSHORT pus = (PUSHORT)&pFEA->szName[sizeof(EA_SYMLINK)];