Changeset 3905

Timestamp:

Oct 24, 2014, 12:35:09 AM (11 years ago)

Author:

bird

Message:

trunk,0.6: b_fsRename.c: Overwrite read-only target files to be more unix compatible. Fixes #288.

Files:

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

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

@@ -156 +156 @@
                                      * to retry the move operation and handle races with other
                                      * processes somewhat ok...
+                                     *
+                                     * Try clear the read-only attribute on files before deleting them.
+                                     * Directories cannot have read-only attributes on OS/2 it seems.
                                      */
                                     if (fsts3New.attrFile & FILE_DIRECTORY)
@@ -163 +166 @@
                                         if (!rc2)
                                             continue;
-                                        else if (rc2 == ERROR_ACCESS_DENIED)
+                                        if (rc2 == ERROR_ACCESS_DENIED)
                                             rc = -ENOTEMPTY;
                                         else
@@ -170 +173 @@
                                     else
                                     {
+                                        if (fsts3New.attrFile & FILE_READONLY)
+                                        {
+                                            fsts3New.attrFile &= ~FILE_READONLY;
+                                            rc2 = DosSetPathInfo((PCSZ)&szNativePathNew[0], FIL_STANDARD, &fsts3New,
+                                                                 sizeof(fsts3New), 0 /*fOptions*/);
+                                            LIBCLOG_MSG("DosSetPathInfo('%s',read-write) -> %d\n", szNativePathNew, rc2);
+                                        }
+
                                         rc2 = DosDelete((PCSZ)&szNativePathNew[0]);
                                         LIBCLOG_MSG("DosDelete('%s') -> %d\n", szNativePathNew, rc2);
                                         if (!rc2)
                                             continue;
-                                        else
-                                            rc = -__libc_native2errno(rc2);
+                                        rc = -__libc_native2errno(rc2);
                                     }
                                 }

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

@@ -144 +144 @@
                                      * to retry the move operation and handle races with other
                                      * processes somewhat ok...
+                                     *
+                                     * Try clear the read-only attribute on files before deleting them.
+                                     * Directories cannot have read-only attributes on OS/2 it seems.
                                      */
                                     if (fsts3New.attrFile & FILE_DIRECTORY)
@@ -151 +154 @@
                                         if (!rc2)
                                             continue;
-                                        else if (rc2 == ERROR_ACCESS_DENIED)
+                                        if (rc2 == ERROR_ACCESS_DENIED)
                                             rc = -ENOTEMPTY;
                                         else
@@ -158 +161 @@
                                     else
                                     {
+                                        if (fsts3New.attrFile & FILE_READONLY)
+                                        {
+                                            fsts3New.attrFile &= ~FILE_READONLY;
+                                            rc2 = DosSetPathInfo((PCSZ)&szNativePathNew[0], FIL_STANDARD, &fsts3New,
+                                                                 sizeof(fsts3New), 0 /*fOptions*/);
+                                            LIBCLOG_MSG("DosSetPathInfo('%s',read-write) -> %d\n", szNativePathNew, rc2);
+                                        }
+
                                         rc2 = DosDelete((PCSZ)&szNativePathNew[0]);
                                         LIBCLOG_MSG("DosDelete('%s') -> %d\n", szNativePathNew, rc2);
                                         if (!rc2)
                                             continue;
-                                        else
-                                            rc = -__libc_back_native2errno(rc2);
+                                        rc = -__libc_back_native2errno(rc2);
                                     }
                                 }