Changeset 1680

Timestamp:

Dec 2, 2004, 8:00:37 AM (21 years ago)

Author:

bird

Message:

Bugfixing rename.

Location:

trunk/src/emx/src/lib

Files:

• libc.def (modified) (1 diff, 1 prop)
• sys/b_fsRename.c (modified) (3 diffs, 1 prop)

trunk/src/emx/src/lib/libc.def

@@ -1275 +1275 @@
     "DosLoadModuleEx" @1292
     "DosFreeModuleEx" @1293
+    "___libc_Back_fsRename" @1294

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

@@ -103 +103 @@
                 if (!strcmp(&szNativePathOld[0], &szNativePathNew[0]))
                     rc = 0;
-                else if (rc != ERROR_SHARING_VIOLATION)
+                else
                 {
                     /*
@@ -110 +110 @@
                      */
                     FILESTATUS3     fsts3Old;
-                    rc = DosQueryPathInfo((PCSZ)&szNativePathOld[0], FIL_STANDARD, &fsts3Old, sizeof(fsts3Old));
-                    if (rc)
+                    int rc2 = DosQueryPathInfo((PCSZ)&szNativePathOld[0], FIL_STANDARD, &fsts3Old, sizeof(fsts3Old));
+                    if (rc2)
                     {
                         /*
@@ -117 +117 @@
                          * Anyway, we're done.
                          */
-                        rc = -__libc_native2errno(rc);
+                        rc = -__libc_native2errno(rc2);
                     }
                     else
                     {
-                        FILESTATUS3     fsts3New;
-                        rc = DosQueryPathInfo((PCSZ)&szNativePathNew[0], FIL_STANDARD, &fsts3New, sizeof(fsts3New));
-                        if (rc)
-                        {
-                            /*
-                             * No target, source must be busy doing something.
-                             */
+                        /*
+                         * This is where we stop with ERROR_SHARING_VIOLATION.
+                         */
+                        if (rc == ERROR_SHARING_VIOLATION)
                             rc = fsts3Old.attrFile & FILE_DIRECTORY ? -EBUSY : -ETXTBSY;
-                        }
                         else
                         {
-                            if (    (fsts3New.attrFile & FILE_DIRECTORY)
-                                && !(fsts3Old.attrFile & FILE_DIRECTORY))
+                            FILESTATUS3     fsts3New;
+                            rc2 = DosQueryPathInfo((PCSZ)&szNativePathNew[0], FIL_STANDARD, &fsts3New, sizeof(fsts3New));
+                            if (rc2)
                             {
                                 /*
-                                 * The target is a directory while the source is not.
+                                 * No target, source must be busy doing something.
                                  */
-                                rc = -EISDIR;
+                                rc = fsts3Old.attrFile & FILE_DIRECTORY ? -EBUSY : -ETXTBSY;
                             }
                             else
                             {
-                                /*
-                                 * Ok, now we start cooking.
-                                 *
-                                 * This should've been done atomically, but non-atomically is
-                                 * better than not doing anything (usually). We use the loop
-                                 * to retry the move operation and handle races with other
-                                 * processes somewhat ok...
-                                 */
-                                if (fsts3New.attrFile & FILE_DIRECTORY)
+                                if (    (fsts3New.attrFile & FILE_DIRECTORY)
+                                    && !(fsts3Old.attrFile & FILE_DIRECTORY))
                                 {
-                                    rc = DosDeleteDir((PCSZ)&szNativePathNew[0]);
-                                    LIBCLOG_MSG("DosDeleteDir('%s') -> %d\n", szNativePathNew, rc);
-                                    if (!rc)
-                                        continue;
-                                    else if (rc == ERROR_ACCESS_DENIED)
-                                        rc = -ENOTEMPTY;
-                                    else
-                                        rc = -__libc_native2errno(rc);
+                                    /*
+                                     * The target is a directory while the source is not.
+                                     */
+                                    rc = -EISDIR;
                                 }
                                 else
                                 {
-                                    rc = DosDelete((PCSZ)&szNativePathNew[0]);
-                                    LIBCLOG_MSG("DosDelete('%s') -> %d\n", szNativePathNew, rc);
-                                    if (!rc)
-                                        continue;
+                                    /*
+                                     * Ok, now we start cooking.
+                                     *
+                                     * This should've been done atomically, but non-atomically is
+                                     * better than not doing anything (usually). We use the loop
+                                     * to retry the move operation and handle races with other
+                                     * processes somewhat ok...
+                                     */
+                                    if (fsts3New.attrFile & FILE_DIRECTORY)
+                                    {
+                                        rc2 = DosDeleteDir((PCSZ)&szNativePathNew[0]);
+                                        LIBCLOG_MSG("DosDeleteDir('%s') -> %d\n", szNativePathNew, rc2);
+                                        if (!rc2)
+                                            continue;
+                                        else if (rc2 == ERROR_ACCESS_DENIED)
+                                            rc = -ENOTEMPTY;
+                                        else
+                                            rc = -__libc_native2errno(rc2);
+                                    }
                                     else
-                                        rc = -__libc_native2errno(rc);
+                                    {
+                                        rc2 = DosDelete((PCSZ)&szNativePathNew[0]);
+                                        LIBCLOG_MSG("DosDelete('%s') -> %d\n", szNativePathNew, rc2);
+                                        if (!rc2)
+                                            continue;
+                                        else
+                                            rc = -__libc_native2errno(rc2);
+                                    }
                                 }
-
                             }
-                        }
+                        } /* !ERROR_SHARING_VIOLATION */
                     }
                 }
-                else if (rc == ERROR_DIRECTORY_IN_CDS || rc == ERROR_CIRCULARITY_REQUESTED)
-                    rc = -EINVAL;
-                else
-                    rc = -__libc_native2errno(rc);
             }
+            else if (rc == ERROR_DIRECTORY_IN_CDS || rc == ERROR_CIRCULARITY_REQUESTED)
+                rc = -EINVAL;
+            else
+                rc = -__libc_native2errno(rc);
             break;
         }