Changeset 2317 for trunk

Timestamp:

Sep 25, 2005, 5:28:44 AM (20 years ago)

Author:

bird

Message:

unix attrs only for unix mode.

File:

• trunk/src/emx/src/lib/sys/b_ioFileOpen.c (modified) (5 diffs, 1 prop)

trunk/src/emx/src/lib/sys/b_ioFileOpen.c

@@ -186 +186 @@
                  */
                 case S_IFREG:
+                {
                     /** @todo handle st_flags. */
                     break;
+                }
 
                 /*
@@ -241 +243 @@
                  */
                 default:
-                    __libc_Back_panic(0, NULL, "Invalid file type returned in st_mode=0x%x for '%s'\n", st.st_mode, szNativePath);
+                    __libc_Back_panic(0, NULL, "Invalid file type returned in st_mode=%x for '%s'\n", st.st_mode, szNativePath);
                     break;
             }
@@ -250 +252 @@
          * Create Unix attributes for a file which is potentially created / replaced.
          */
+        Mode &= ~__libc_gfsUMask;
+        Mode &= ACCESSPERMS;
+        Mode |= S_IFREG;
         if (flOpenFlags & (OPEN_ACTION_CREATE_IF_NEW | OPEN_ACTION_REPLACE_IF_EXISTS))
         {
@@ -262 +267 @@
         }
     }
-
-    /*
-     * Normalize the mode mask and calc the file attributes.
-     */
-    Mode &= ~__libc_gfsUMask;
-    Mode &= ACCESSPERMS;
-    Mode |= S_IFREG;
-
-    ULONG flAttr = Mode & S_IWUSR ? FILE_NORMAL : FILE_READONLY;
+    else
+    {
+        /* Normalize the mode mask and calc the file attributes. */
+        Mode &= ~__libc_gfsUMask;
+        Mode &= ACCESSPERMS;
+        Mode |= S_IFREG;
+    }
 
     /*
@@ -276 +279 @@
      */
     FS_VAR_SAVE_LOAD();
-    ULONG   cExpandRetries;
-    ULONG   ulAction;
-    HFILE   hFile;
-    for (cExpandRetries = 0;;)
+    ULONG       flAttr = Mode & S_IWUSR || !Mode ? FILE_NORMAL : FILE_READONLY;
+    ULONG       ulAction;
+    HFILE       hFile;
+    unsigned    cExpandRetries = 0;
+    for (;;)
     {
 #if OFF_MAX > LONG_MAX