Changeset 3812

Timestamp:

Feb 17, 2014, 2:25:58 PM (11 years ago)

Author:

bird

Message:

b_fsNativeFileStat.c: Don't check rc for FILE_READONLY but rather fAttributes. Fixed typo. Fixes #213

Files:

• branches/libc-0.6/src/emx/src/lib/sys/b_fsNativeFileStat.c (modified) (3 diffs)
• trunk/libc/src/kNIX/os2/b_fsNativeFileStat.c (modified) (3 diffs)

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

@@ -180 +180 @@
 
 #if OFF_MAX > LONG_MAX
-    ULONG fAttributtes = fLarge ? info.fsts4L.attrFile : info.fsts4.attrFile;
+    ULONG fAttributes = fLarge ? info.fsts4L.attrFile : info.fsts4.attrFile;
 #else
-    ULONG fAttributtes = info.fsts4.attrFile;
-#endif
-    pStat->st_attr = fAttributtes;
+    ULONG fAttributes = info.fsts4.attrFile;
+#endif
+    pStat->st_attr = fAttributes;
 #if OFF_MAX > LONG_MAX
     if (fLarge)
@@ -197 +197 @@
         pStat->st_blocks = info.fsts4.cbFileAlloc / S_BLKSIZE;
     }
-    if (fAttributtes & FILE_DIRECTORY)
+    if (fAttributes & FILE_DIRECTORY)
     {
         /* directory */
@@ -205 +205 @@
     {
         pStat->st_mode = S_IFREG;
-        if (rc & FILE_READONLY)
+        if (fAttributes & FILE_READONLY)
             pStat->st_mode |= (S_IREAD >> 6) * 0111;
         else

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

@@ -162 +162 @@
 
 #if OFF_MAX > LONG_MAX
-    ULONG fAttributtes = fLarge ? info.fsts4L.attrFile : info.fsts4.attrFile;
+    ULONG fAttributes = fLarge ? info.fsts4L.attrFile : info.fsts4.attrFile;
 #else
-    ULONG fAttributtes = info.fsts4.attrFile;
-#endif
-    pStat->st_attr = fAttributtes;
+    ULONG fAttributes = info.fsts4.attrFile;
+#endif
+    pStat->st_attr = fAttributes;
 #if OFF_MAX > LONG_MAX
     if (fLarge)
@@ -179 +179 @@
         pStat->st_blocks = info.fsts4.cbFileAlloc / S_BLKSIZE;
     }
-    if (fAttributtes & FILE_DIRECTORY)
+    if (fAttributes & FILE_DIRECTORY)
     {
         /* directory */
@@ -187 +187 @@
     {
         pStat->st_mode = S_IFREG;
-        if (rc & FILE_READONLY)
+        if (fAttributes & FILE_READONLY)
             pStat->st_mode |= (S_IREAD >> 6) * 0111;
         else