Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2009-01-14 13:39:06 -08:00
parent 3af20e2b2f 24ee934b8b
commit c39ccfcac5
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
cmd/ztest/ztest.c
View File

@ -2789,31 +2789,21 @@ static void
ztest_verify_blocks(char *pool) ztest_verify_blocks(char *pool)
{ {
int status; int status;
char bin[MAXPATHLEN + MAXNAMELEN + 20];
char zdb[MAXPATHLEN + MAXNAMELEN + 20]; char zdb[MAXPATHLEN + MAXNAMELEN + 20];
char zbuf[1024]; char zbuf[1024];
char *bin;
char *ztest;
char *isa;
int isalen;
FILE *fp; FILE *fp;
(void) realpath(getexecname(), zdb); /* Designed to be run exclusively in the development tree */
(void) realpath(getexecname(), bin);
strstr(bin, "/ztest/")[0] = '\0';
/* zdb lives in /usr/sbin, while ztest lives in /usr/bin */ (void) sprintf(zdb,
bin = strstr(zdb, "/usr/bin/"); "%s/zdb/zdb -bc%s%s -U /tmp/zpool.cache %s",
ztest = strstr(bin, "/ztest"); bin,
isa = bin + 8;
isalen = ztest - isa;
isa = strdup(isa);
/* LINTED */
(void) sprintf(bin,
"/usr/sbin%.*s/zdb -bc%s%s -U /tmp/zpool.cache %s",
isalen,
isa,
zopt_verbose >= 3 ? "s" : "", zopt_verbose >= 3 ? "s" : "",
zopt_verbose >= 4 ? "v" : "", zopt_verbose >= 4 ? "v" : "",
pool); pool);
free(isa);
if (zopt_verbose >= 5) if (zopt_verbose >= 5)
(void) printf("Executing %s\n", strstr(zdb, "zdb ")); (void) printf("Executing %s\n", strstr(zdb, "zdb "));