summaryrefslogtreecommitdiff
path: root/dpkg.c
diff options
context:
space:
mode:
authorEric Andersen2001-04-26 15:56:47 +0000
committerEric Andersen2001-04-26 15:56:47 +0000
commitc1bdffe99b6fa6fdb0f43e0dec85d8bbfcab1572 (patch)
tree3cf5b7c0c69bd8c802c4b080b6a5e94a4a401831 /dpkg.c
parent3c3277f0bda79b66b35e5e965e5340624d29a459 (diff)
downloadbusybox-c1bdffe99b6fa6fdb0f43e0dec85d8bbfcab1572.zip
busybox-c1bdffe99b6fa6fdb0f43e0dec85d8bbfcab1572.tar.gz
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
Diffstat (limited to 'dpkg.c')
-rw-r--r--dpkg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/dpkg.c b/dpkg.c
index e5ed95c..996809a 100644
--- a/dpkg.c
+++ b/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).