Changeset 51 for trunk

Timestamp:

Jan 15, 2006, 1:38:12 AM (17 years ago)

Author:

Jari Häkkinen

Message:

Clean up.

File:

• trunk/bin/rmdirhier.cc (modified) (2 diffs)

trunk/bin/rmdirhier.cc

@@ -47 +47 @@
 
    // Delete any remaining directory entries
-    DIR *dirp;
+    DIR* dp;
     struct dirent *entry;
-    if (!(dirp = opendir(".")))
+    if (!(dp=opendir(".")))
       throw DirectoryOpenError(dir);
-    while ((entry = readdir(dirp)) != NULL) {
-      struct stat finfo;
+    while ((entry=readdir(dp)) != NULL) {
+      struct stat buf;
       if (entry->d_name[0] == '.')
         continue;
-      stat(entry->d_name,&finfo);
-      if (finfo.st_mode & S_IFDIR)
+      stat(entry->d_name,&buf);
+      if (buf.st_mode & S_IFDIR)
         rmdirhier__(entry->d_name);      // sub-directory
       else {
-        // Enable delete of file, then do it
+        // Make sure file is removable before removing it
         chmod(entry->d_name,S_IWRITE);
         if (unlink(entry->d_name))
@@ -65 +65 @@
       }
     }
-    closedir(dirp);
+    closedir(dp);
 
     // Remove the directory from its parent