salvager-no-chdir-20081108

[openafs.git] / src / vol / vol-salvage.c

diff --git a/src/vol/vol-salvage.c b/src/vol/vol-salvage.c
index 76bf5c5..ee9b8f1 100644 (file)
--- a/src/vol/vol-salvage.c
+++ b/src/vol/vol-salvage.c
@@ -1197,14 +1197,15 @@ CompareVolumes(const void *_p1, const void *_p2)
 void
 GetVolumeSummary(VolumeId singleVolumeNumber)
 {
-    DIR *dirp;
+    DIR *dirp = NULL;
     afs_int32 nvols = 0;
     struct VolumeSummary *vsp, vs;
     struct VolumeDiskHeader diskHeader;
     struct dirent *dp;
 
     /* Get headers from volume directory */
-    if (chdir(fileSysPath) == -1 || (dirp = opendir(".")) == NULL)
+    dirp = opendir(fileSysPath);
+    if (dirp  == NULL)
        Abort("Can't read directory %s; not salvaged\n", fileSysPath);
     if (!singleVolumeNumber) {
        while ((dp = readdir(dirp))) {
@@ -1429,7 +1430,7 @@ DoSalvageVolumeGroup(register struct InodeSummary *isp, int nVols)
     int check;
     Inode ino;
     int dec_VGLinkH = 0;
-    int VGLinkH_p1;
+    int VGLinkH_p1 =0;
     FdHandle_t *fdP = NULL;
 
     VGLinkH_cnt = 0;
@@ -2403,7 +2404,7 @@ CopyAndSalvage(register struct DirSummary *dir)
     dir->dirHandle = newdir;
 }
 
-void
+int
 JudgeEntry(struct DirSummary *dir, char *name, VnodeId vnodeNumber,
           Unique unique)
 {
@@ -2421,7 +2422,7 @@ JudgeEntry(struct DirSummary *dir, char *name, VnodeId vnodeNumber,
            CopyOnWrite(dir);
            assert(Delete(&dir->dirHandle, name) == 0);
        }
-       return;
+       return 0;
     }
 #ifdef AFS_AIX_ENV
 #ifndef AFS_NAMEI_ENV
@@ -2435,7 +2436,7 @@ JudgeEntry(struct DirSummary *dir, char *name, VnodeId vnodeNumber,
            CopyOnWrite(dir);
            assert(Delete(&dir->dirHandle, name) == 0);
        }
-       return;
+       return 0;
     }
 #endif
 #endif
@@ -2453,7 +2454,7 @@ JudgeEntry(struct DirSummary *dir, char *name, VnodeId vnodeNumber,
                CopyOnWrite(dir);
                assert(Delete(&dir->dirHandle, name) == 0);
            }
-           return;
+           return 0;
        }
     }
 
@@ -2468,7 +2469,7 @@ JudgeEntry(struct DirSummary *dir, char *name, VnodeId vnodeNumber,
             * entry. Otherwise, it will get created in the next 
             * salvage and deleted again here. So Just skip it.
             */
-           return;
+           return 0;
        }
 
        todelete = ((!vnodeEssence->unique || dirOrphaned) ? 1 : 0);
@@ -2486,7 +2487,7 @@ JudgeEntry(struct DirSummary *dir, char *name, VnodeId vnodeNumber,
                assert(Create(&dir->dirHandle, name, &fid) == 0);
        }
        if (todelete)
-           return;             /* no need to continue */
+           return 0;           /* no need to continue */
     }
 
     if (strcmp(name, ".") == 0) {
@@ -2543,7 +2544,7 @@ JudgeEntry(struct DirSummary *dir, char *name, VnodeId vnodeNumber,
        }
        vnodeEssence->claimed = 0;      /* Not claimed: Orphaned */
        vnodeEssence->todelete = 1;     /* Will later delete vnode and decr inode */
-       return;
+       return 0;
     } else {
        if (ShowSuid && (vnodeEssence->modeBits & 06000))
            Log("FOUND suid/sgid file: %s/%s (%u.%u %05o) author %u (vnode %u dir %u)\n", dir->name ? dir->name : "??", name, vnodeEssence->owner, vnodeEssence->group, vnodeEssence->modeBits, vnodeEssence->author, vnodeNumber, dir->vnodeNumber);
@@ -2560,14 +2561,14 @@ JudgeEntry(struct DirSummary *dir, char *name, VnodeId vnodeNumber,
            if (fdP == NULL) {
                Log("ERROR %s could not open mount point vnode %u\n", dir->vname, vnodeNumber);
                IH_RELEASE(ihP);
-               return;
+               return 0;
            }
            size = FDH_SIZE(fdP);
            if (size < 0) {
                Log("ERROR %s mount point has invalid size %d, vnode %u\n", dir->vname, size, vnodeNumber);
                FDH_REALLYCLOSE(fdP);
                IH_RELEASE(ihP);
-               return;
+               return 0;
            }
        
            if (size > 1024)
@@ -2634,13 +2635,14 @@ JudgeEntry(struct DirSummary *dir, char *name, VnodeId vnodeNumber,
                    CopyOnWrite(dir);
                    assert(Delete(&dir->dirHandle, name) == 0);
                }
-               return;
+               return 0;
            }
        }
        /* This directory claims the vnode */
        vnodeEssence->claimed = 1;
     }
     vnodeEssence->count--;
+    return 0;
 }
 
 void
@@ -3542,16 +3544,18 @@ ToString(char *s)
     assert(p != NULL);
     strcpy(p, s);
     return p;
-
 }
 
 /* Remove the FORCESALVAGE file */
 void
 RemoveTheForce(char *path)
 {
+    char target[1024];
+    struct afs_stat force; // so we can use afs_stat to find it
+    strcpy(target,path);
+    strcat(target,"/FORCESALVAGE");
     if (!Testing && ForceSalvage) {
-       if (chdir(path) == 0)
-           unlink("FORCESALVAGE");
+        if (afs_stat(target,&force) == 0)  unlink(target);
     }
 }
 
@@ -3563,10 +3567,11 @@ int
 UseTheForceLuke(char *path)
 {
     struct afs_stat force;
+    char target[1024];
+    strcpy(target,path);
+    strcat(target,"/FORCESALVAGE");
 
-    assert(chdir(path) != -1);
-
-    return (afs_stat("FORCESALVAGE", &force) == 0);
+    return (afs_stat(target, &force) == 0);
 }
 #else
 /*