From c1bdffe99b6fa6fdb0f43e0dec85d8bbfcab1572 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Thu, 26 Apr 2001 15:56:47 +0000 Subject: Another nice cleanup from Larry. This adds a new last_char_is() function and uses it to avoid possible buffer underruns whn strlen is zero, and avoid the possible space-hogging inline of strlen() in several cases. -Erik --- archival/dpkg.c | 2 +- archival/tar.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'archival') 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) */ if ((fin = fopen(statusfile, "r")) != NULL) { while (((line = get_line_from_file(fin)) != NULL) && !feof(fin)) { - line[strlen(line) - 1] = '\0'; /* trim newline */ + chomp(line); /* trim newline */ /* If we see a package header, find out if it's a package * that we have processed. if so, we skip that block for * 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, case REGTYPE0: /* If the name ends in a '/' then assume it is * supposed to be a directory, and fall through */ - if (header.name[strlen(header.name)-1] != '/') { + if (last_char_is(header.name,'/')) { if (tarExtractRegularFile(&header, extractFlag, tostdoutFlag)==FALSE) errorFlag=TRUE; break; -- cgit v1.2.3