Changeset 2561

Timestamp:

Mar 6, 2006, 11:59:50 PM (19 years ago)

Author:

bird

Message:

rewinddir is broken in EMX, avoid it and do close/opendir instead.

File:

• trunk/coreutils/src/remove.c (modified) (3 diffs)

trunk/coreutils/src/remove.c

@@ -60 +60 @@
 enum
   {
+#ifdef __EMX__
+    CONSECUTIVE_READDIR_UNLINK_THRESHOLD = 1024*1024*1024
+#else
     CONSECUTIVE_READDIR_UNLINK_THRESHOLD = 200
+#endif 
   };
 
@@ -864 +868 @@
   enum RM_status status = top->status;
   size_t n_unlinked_since_opendir_or_last_rewind = 0;
+#ifdef __EMX__
+  char curdir[PATH_MAX];
+  if (!getcwd(curdir, sizeof(curdir)))
+      strcpy(curdir, ".");
+#endif 
 
   assert (VALID_STATUS (status));
@@ -906 +915 @@
                  (since the opendir or the previous rewinddir) that this
                  NULL-return may be the symptom of a buggy readdir.  */
+#ifdef __EMX__
+              closedir (dirp);
+              dirp = opendir (curdir);
+              if (!dirp)
+                break;
+#else
               rewinddir (dirp);
+#endif 
               n_unlinked_since_opendir_or_last_rewind = 0;
               continue;