diff options
Diffstat (limited to 'archival')
| -rw-r--r-- | archival/dpkg.c | 2 | ||||
| -rw-r--r-- | archival/tar.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/archival/dpkg.c b/archival/dpkg.c index e5ed95cb8..996809a6f 100644 --- a/archival/dpkg.c +++ b/archival/dpkg.c | |||
| @@ -583,7 +583,7 @@ static int status_merge(void *status, package_t *pkgs) | |||
| 583 | */ | 583 | */ |
| 584 | if ((fin = fopen(statusfile, "r")) != NULL) { | 584 | if ((fin = fopen(statusfile, "r")) != NULL) { |
| 585 | while (((line = get_line_from_file(fin)) != NULL) && !feof(fin)) { | 585 | while (((line = get_line_from_file(fin)) != NULL) && !feof(fin)) { |
| 586 | line[strlen(line) - 1] = '\0'; /* trim newline */ | 586 | chomp(line); /* trim newline */ |
| 587 | /* If we see a package header, find out if it's a package | 587 | /* If we see a package header, find out if it's a package |
| 588 | * that we have processed. if so, we skip that block for | 588 | * that we have processed. if so, we skip that block for |
| 589 | * now (write it at the end). | 589 | * now (write it at the end). |
diff --git a/archival/tar.c b/archival/tar.c index 48284c00a..716f4ac30 100644 --- a/archival/tar.c +++ b/archival/tar.c | |||
| @@ -706,7 +706,7 @@ static int readTarFile(int tarFd, int extractFlag, int listFlag, | |||
| 706 | case REGTYPE0: | 706 | case REGTYPE0: |
| 707 | /* If the name ends in a '/' then assume it is | 707 | /* If the name ends in a '/' then assume it is |
| 708 | * supposed to be a directory, and fall through */ | 708 | * supposed to be a directory, and fall through */ |
| 709 | if (header.name[strlen(header.name)-1] != '/') { | 709 | if (last_char_is(header.name,'/')) { |
| 710 | if (tarExtractRegularFile(&header, extractFlag, tostdoutFlag)==FALSE) | 710 | if (tarExtractRegularFile(&header, extractFlag, tostdoutFlag)==FALSE) |
| 711 | errorFlag=TRUE; | 711 | errorFlag=TRUE; |
| 712 | break; | 712 | break; |