Changeset 353

Timestamp:

Jul 28, 2007, 11:28:11 PM (18 years ago)

Author:

pr

Message:

Bump directory count when recursive file delete fails. Bug 1001

Files:

• branches/branch-1-0/src/helpers/dosh.c (modified) (2 diffs)
• trunk/src/helpers/dosh.c (modified) (2 diffs)

branches/branch-1-0/src/helpers/dosh.c

@@ -3499 +3499 @@
  *@@added V0.9.4 (2000-07-01) [umoeller]
  *@@changed WarpIN V1.0.15 (2007-03-27) [pr]: allow NULL pulDirs and pulFiles
+ *@@changed WarpIN V1.0.16 (2007-07-28) [pr]: bump directory count on recursive delete failures @@fixes 1001
  */
 
@@ -3560 +3561 @@
                         // (this is what OS/2 reports with DosDeleteDir as well)
                         arcReturn = ERROR_ACCESS_DENIED;  // 5
+                    }
+
+                    if (arcReturn != NO_ERROR)  // WarpIN V1.0.16 (2007-07-28) [pr]
                         if (pulDirs)  // WarpIN V1.0.15 (2007-03-27) [pr]
                             (*pulDirs)++;
-                    }
                 }
             }

trunk/src/helpers/dosh.c

@@ -3712 +3712 @@
  *@@added V0.9.4 (2000-07-01) [umoeller]
  *@@changed WarpIN V1.0.15 (2007-03-27) [pr]: allow NULL pulDirs and pulFiles
+ *@@changed WarpIN V1.0.16 (2007-07-28) [pr]: bump directory count on recursive delete failures @@fixes 1001
  */
 
@@ -3773 +3774 @@
                         // (this is what OS/2 reports with DosDeleteDir as well)
                         arcReturn = ERROR_ACCESS_DENIED;  // 5
+                    }
+
+                    if (arcReturn != NO_ERROR)  // WarpIN V1.0.16 (2007-07-28) [pr]
                         if (pulDirs)  // WarpIN V1.0.15 (2007-03-27) [pr]
                             (*pulDirs)++;
-                    }
                 }
             }