Continues location rename.

src/client/client_comlib/client_api.c
    Added setenv("LDCS_CHOSEN_PARSED_CACHEPATH", local_cpc);

testsuite/test_driver.c
    Replaced LDCS_LOCATION and LDCS_ORIG_LOCATION checks for cachepath with
        LDCS_CHOSEN_PARSED_CACHEPATH
    Replaced spindle_loc with cachepath

Author: rountree-alt

src/client/client_comlib/client_api.c

@@ -67,6 +67,8 @@ int send_cachepath_query( int fd, char **chosen_realized_cachepath, char **chose
    if( chosen_parsed_cachepath ){
        *chosen_parsed_cachepath = local_cpc;
    }
+   // Required by testsuite/test_driver.c
+   setenv("LDCS_CHOSEN_PARSED_CACHEPATH", local_cpc, 1);
 
    return 0;
 }

testsuite/test_driver.c

@@ -1142,7 +1142,7 @@ static char* getCacheLocation(char *env_var)
    return strdup(last_slash);
 }
 
-static int checkLinkForLeak(const char *path, const char *spindle_loc)
+static int checkLinkForLeak(const char *path, const char *cachepath)
 {
    char link_target[4096];
    int result, error;
@@ -1155,34 +1155,34 @@ static int checkLinkForLeak(const char *path, const char *spindle_loc)
       return -1;
    }
 
-   if (strstr(link_target, spindle_loc)) {
-      err_printf("Link at '%s' has path '%s', which leaks spindle path with '%s'\n", path, link_target, spindle_loc);
+   if (strstr(link_target, cachepath)) {
+      err_printf("Link at '%s' has path '%s', which leaks spindle path with '%s'\n", path, link_target, cachepath);
       return -1;
    }
 
    return 0;
 }
 
 
-static int checkPathForLeak(const char *what, const char *path, const char *spindle_loc)
+static int checkPathForLeak(const char *what, const char *path, const char *cachepath)
 {
-   if (strstr(path, spindle_loc)) {
-      err_printf("%s: Path '%s' leaks spindle path with '%s'\n", what, path, spindle_loc);
+   if (strstr(path, cachepath)) {
+      err_printf("%s: Path '%s' leaks spindle path with '%s'\n", what, path, cachepath);
       return -1;
    }
    return 0;
 }
 
 static int leak_check_cb(struct dl_phdr_info *p, size_t psize, void *opaque)
 {
-   char *spindle_loc = (char *) opaque;
+   char *cachepath = (char *) opaque;
    if (!p->dlpi_name || p->dlpi_name[0] == '\0')
       return 0;
-   checkPathForLeak("dl_iterate_phdr", p->dlpi_name, spindle_loc);
+   checkPathForLeak("dl_iterate_phdr", p->dlpi_name, cachepath);
    return 0;
 }
 
-static int check_proc_maps(char *path, char *spindle_loc)
+static int check_proc_maps(char *path, char *cachepath)
 {
    int fd, error, result;
    struct stat statbuf;
@@ -1221,8 +1221,8 @@ static int check_proc_maps(char *path, char *spindle_loc)
    maps[filesize] = '\0';
    close(fd);
 
-   if (strstr(maps, spindle_loc)) {
-      err_printf("Found leaked spindle path '%s' in maps '%s'\n", spindle_loc, path);
+   if (strstr(maps, cachepath)) {
+      err_printf("Found leaked spindle path '%s' in maps '%s'\n", cachepath, path);
       return -1;
    }
 
@@ -1232,17 +1232,15 @@ static int check_proc_maps(char *path, char *spindle_loc)
 
 void check_for_path_leaks()
 {
-   char *spindle_loc = NULL;
+   char *cachepath = NULL;
    DIR *proc_fds = NULL;
    struct dirent *d;
    char path[4096];
    struct link_map *lm;
    char *dlerr_msg = NULL;
 
-   spindle_loc = getCacheLocation("LDCS_LOCATION");
-   if (!spindle_loc)
-      spindle_loc = getCacheLocation("LDCS_ORIG_LOCATION");
-   if (!spindle_loc) {
+   cachepath = getCacheLocation("LDCS_CHOSEN_PARSED_CACHEPATH");
+   if (!cachepath) {
       err_printf("Failed to calculate cache location");
       goto done;
    }
@@ -1260,32 +1258,32 @@ void check_for_path_leaks()
          continue;
       strncpy(path, "/proc/self/fd/", sizeof(path));
       strncat(path, d->d_name, sizeof(path)-1);
-      checkLinkForLeak(path, spindle_loc);
+      checkLinkForLeak(path, cachepath);
    }
-   checkLinkForLeak("/proc/self/exe", spindle_loc);
+   checkLinkForLeak("/proc/self/exe", cachepath);
 
    /**
     * Check link_maps for leaked spindle paths
     **/
    for (lm = _r_debug.r_map; lm != NULL; lm = lm->l_next) {
       if (!lm->l_name || lm->l_name[0] == '\0')
          continue;
-      checkPathForLeak("link_map", lm->l_name, spindle_loc);
+      checkPathForLeak("link_map", lm->l_name, cachepath);
    }
 
    /**
     * Check libraries in dl_iterate_phdr for leaked paths
     **/
-   dl_iterate_phdr(leak_check_cb, spindle_loc);
+   dl_iterate_phdr(leak_check_cb, cachepath);
 
    /**
     * Check /proc/pid/maps under various aliases for leaked names
     **/
-   check_proc_maps("/proc/self/maps", spindle_loc);
+   check_proc_maps("/proc/self/maps", cachepath);
    snprintf(path, sizeof(path), "/proc/self/task/%d/maps", getpid());
-   check_proc_maps(path, spindle_loc);
+   check_proc_maps(path, cachepath);
    snprintf(path, sizeof(path), "/proc/%d/maps", getpid());
-   check_proc_maps(path, spindle_loc);
+   check_proc_maps(path, cachepath);
 
    /**
     * Check that dlerror doesn't leak the /__not_exists/ prefix
@@ -1297,8 +1295,8 @@ void check_for_path_leaks()
    }
 
   done:
-   if (spindle_loc)
-      free(spindle_loc);
+   if (cachepath)
+      free(cachepath);
    if (proc_fds)
       closedir(proc_fds);
 }