Ticket #288: rename.diff

src/emx/src/lib/sys/b_fsRename.c

@@ -169 +169 @@
                                     }
                                     else
                                     {
-                                        rc2 = DosDelete((PCSZ)&szNativePathNew[0]);
-                                        LIBCLOG_MSG("DosDelete('%s') -> %d\n", szNativePathNew, rc2);
+                                        rc2 = NO_ERROR;
+                                        if (fsts3New.attrFile & FILE_READONLY)
+                                        {
+                                            /* Read-only files can't be deleted; reset the flag */
+                                            fsts3New.attrFile &= ~FILE_READONLY;
+                                            rc2 = DosSetPathInfo((PCSZ)&szNativePathNew[0], FIL_STANDARD, &fsts3New, sizeof(fsts3New), 0);
+                                        }
                                         if (!rc2)
-                                            continue;
-                                        else
-                                            rc = -__libc_native2errno(rc2);
+                                        {
+                                            rc2 = DosDelete((PCSZ)&szNativePathNew[0]);
+                                            LIBCLOG_MSG("DosDelete('%s') -> %d\n", szNativePathNew, rc2);
+                                            if (!rc2)
+                                                continue;
+                                        }
+                                        rc = -__libc_native2errno(rc2);
                                     }
                                 }
                             }