diff options
| author | kraai <kraai@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2000-09-15 21:18:43 +0000 |
|---|---|---|
| committer | kraai <kraai@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2000-09-15 21:18:43 +0000 |
| commit | df78d7e0f209c7b759235f89451a7198a614f4fe (patch) | |
| tree | 1c295d257ec832fa8894e99626822798948ee06c | |
| parent | 7ae18a0b625edee9b0e03487d7e093b647afc9a4 (diff) | |
| download | busybox-w32-df78d7e0f209c7b759235f89451a7198a614f4fe.tar.gz busybox-w32-df78d7e0f209c7b759235f89451a7198a614f4fe.tar.bz2 busybox-w32-df78d7e0f209c7b759235f89451a7198a614f4fe.zip | |
Allow non-verbose listing to work.
git-svn-id: svn://busybox.net/trunk/busybox@1060 69ca8d6d-28ef-0310-b511-8ec308f3f277
| -rw-r--r-- | archival/tar.c | 12 | ||||
| -rw-r--r-- | tar.c | 12 |
2 files changed, 14 insertions, 10 deletions
diff --git a/archival/tar.c b/archival/tar.c index d31661184..de99656c6 100644 --- a/archival/tar.c +++ b/archival/tar.c | |||
| @@ -611,12 +611,14 @@ static int readTarFile(const char* tarName, int extractFlag, int listFlag, | |||
| 611 | fprintf(vbFd, "%s\n", header.name); | 611 | fprintf(vbFd, "%s\n", header.name); |
| 612 | } | 612 | } |
| 613 | 613 | ||
| 614 | if (verboseFlag == TRUE && listFlag == TRUE) { | 614 | if (listFlag == TRUE) { |
| 615 | printf("%s", header.name); | 615 | printf("%s", header.name); |
| 616 | if (header.type==LNKTYPE) /* If this is a link, say so */ | 616 | if (verboseFlag == TRUE) { |
| 617 | printf(" link to %s", header.linkname); | 617 | if (header.type==LNKTYPE) /* If this is a link, say so */ |
| 618 | else if (header.type==SYMTYPE) | 618 | printf(" link to %s", header.linkname); |
| 619 | printf(" -> %s", header.linkname); | 619 | else if (header.type==SYMTYPE) |
| 620 | printf(" -> %s", header.linkname); | ||
| 621 | } | ||
| 620 | printf("\n"); | 622 | printf("\n"); |
| 621 | } | 623 | } |
| 622 | 624 | ||
| @@ -611,12 +611,14 @@ static int readTarFile(const char* tarName, int extractFlag, int listFlag, | |||
| 611 | fprintf(vbFd, "%s\n", header.name); | 611 | fprintf(vbFd, "%s\n", header.name); |
| 612 | } | 612 | } |
| 613 | 613 | ||
| 614 | if (verboseFlag == TRUE && listFlag == TRUE) { | 614 | if (listFlag == TRUE) { |
| 615 | printf("%s", header.name); | 615 | printf("%s", header.name); |
| 616 | if (header.type==LNKTYPE) /* If this is a link, say so */ | 616 | if (verboseFlag == TRUE) { |
| 617 | printf(" link to %s", header.linkname); | 617 | if (header.type==LNKTYPE) /* If this is a link, say so */ |
| 618 | else if (header.type==SYMTYPE) | 618 | printf(" link to %s", header.linkname); |
| 619 | printf(" -> %s", header.linkname); | 619 | else if (header.type==SYMTYPE) |
| 620 | printf(" -> %s", header.linkname); | ||
| 621 | } | ||
| 620 | printf("\n"); | 622 | printf("\n"); |
| 621 | } | 623 | } |
| 622 | 624 | ||