d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Teach get_refdir() about FreeBSD's /usr/obj convention.

Browse Source 
In development, I run libarchive_test frequently by hand
and it gets tedious having to specify a suitable -r path
all of the time.
This commit is contained in:
Tim Kientzle 2008-12-21 00:13:50 +00:00
parent e43c1fe0bc
commit fec90b6c9b
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=186366
1 changed files with 45 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
lib/libarchive/test/main.c
View File

@ -846,48 +846,59 @@ extract_reference_file(const char *name)
static char *
get_refdir(const char *tmpdir)
{
char *ref, *p;
char tried[512] = { '\0' };
char buff[128];
char *pwd, *p;
/* Get the current dir. */
systemf("/bin/pwd > %s/refdir", tmpdir);
ref = slurpfile(NULL, "%s/refdir", tmpdir);
p = ref + strlen(ref);
while (p[-1] == '\n') {
--p;
*p = '\0';
}
pwd = slurpfile(NULL, "%s/refdir", tmpdir);
while (pwd[strlen(pwd) - 1] == '\n')
pwd[strlen(pwd) - 1] = '\0';
printf("PWD: %s\n", pwd);
systemf("rm %s/refdir", tmpdir);
/* Look for a known file. */
p = slurpfile(NULL, "%s/%s", ref, KNOWNREF);
if (p != NULL) {
free(p);
return (ref);
}
p = slurpfile(NULL, "%s/test/%s", ref, KNOWNREF);
if (p != NULL) {
free(p);
p = malloc(strlen(ref) + strlen("/test") + 1);
strcpy(p, ref);
strcat(p, "/test");
free(ref);
return (p);
}
p = slurpfile(NULL, "%s/%s/test/%s", ref, LIBRARY, KNOWNREF);
if (p != NULL) {
free(p);
p = malloc(strlen(ref) + 1 + strlen(LIBRARY) + strlen("/test") + 1);
strcpy(p, ref);
strcat(p, "/");
strcat(p, LIBRARY);
strcat(p, "/test");
free(ref);
return (p);
snprintf(buff, sizeof(buff), "%s", pwd);
p = slurpfile(NULL, "%s/%s", buff, KNOWNREF);
if (p != NULL) goto success;
strncat(tried, buff, sizeof(tried) - strlen(tried) - 1);
strncat(tried, "\n", sizeof(tried) - strlen(tried) - 1);
snprintf(buff, sizeof(buff), "%s/test", pwd);
p = slurpfile(NULL, "%s/%s", buff, KNOWNREF);
if (p != NULL) goto success;
strncat(tried, buff, sizeof(tried) - strlen(tried) - 1);
strncat(tried, "\n", sizeof(tried) - strlen(tried) - 1);
snprintf(buff, sizeof(buff), "%s/%s/test", pwd, LIBRARY);
p = slurpfile(NULL, "%s/%s", buff, KNOWNREF);
if (p != NULL) goto success;
strncat(tried, buff, sizeof(tried) - strlen(tried) - 1);
strncat(tried, "\n", sizeof(tried) - strlen(tried) - 1);
if (memcmp(pwd, "/usr/obj", 8) == 0) {
snprintf(buff, sizeof(buff), "%s", pwd + 8);
p = slurpfile(NULL, "%s/%s", buff, KNOWNREF);
if (p != NULL) goto success;
strncat(tried, buff, sizeof(tried) - strlen(tried) - 1);
strncat(tried, "\n", sizeof(tried) - strlen(tried) - 1);
snprintf(buff, sizeof(buff), "%s/test", pwd + 8);
p = slurpfile(NULL, "%s/%s", buff, KNOWNREF);
if (p != NULL) goto success;
strncat(tried, buff, sizeof(tried) - strlen(tried) - 1);
strncat(tried, "\n", sizeof(tried) - strlen(tried) - 1);
}
printf("Unable to locate known reference file %s\n", KNOWNREF);
printf(" Checked directory %s\n", ref);
printf(" Checked directory %s/test\n", ref);
printf(" Checked directory %s/%s/test\n", ref, LIBRARY);
printf(" Checked following directories:\n%s\n", tried);
exit(1);
success:
free(p);
free(pwd);
return strdup(buff);
}
int main(int argc, char **argv)