From 05e782ddd3dc58245c889529bb8aeeaddf24bf71 Mon Sep 17 00:00:00 2001 From: Matt Kraai Date: Thu, 1 Feb 2001 16:49:30 +0000 Subject: Fix wget error message and add (and use) chomp library function. --- findutils/grep.c | 3 +-- findutils/xargs.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'findutils') diff --git a/findutils/grep.c b/findutils/grep.c index 320655b..fec8d09 100644 --- a/findutils/grep.c +++ b/findutils/grep.c @@ -69,8 +69,7 @@ static void grep_file(FILE *file) int nmatches = 0; while ((line = get_line_from_file(file)) != NULL) { - if (line[strlen(line)-1] == '\n') - line[strlen(line)-1] = '\0'; + chomp(line); linenum++; ret = regexec(®ex, line, 0, NULL, 0); if (ret == 0 && !invert_search) { /* match */ diff --git a/findutils/xargs.c b/findutils/xargs.c index 89bcfc1..f05efd9 100644 --- a/findutils/xargs.c +++ b/findutils/xargs.c @@ -68,8 +68,7 @@ int xargs_main(int argc, char **argv) char *execstr = NULL; /* eat the newline off the filename. */ - if (file_to_act_on[strlen(file_to_act_on)-1] == '\n') - file_to_act_on[strlen(file_to_act_on)-1] = '\0'; + chomp(file_to_act_on); /* eat blank lines */ if (strlen(file_to_act_on) == 0) -- cgit v1.1