diff options
| author | Matt Kraai <kraai@debian.org> | 2001-02-01 16:49:30 +0000 |
|---|---|---|
| committer | Matt Kraai <kraai@debian.org> | 2001-02-01 16:49:30 +0000 |
| commit | 05e782ddd3dc58245c889529bb8aeeaddf24bf71 (patch) | |
| tree | 8fbb91ca75358923724889a558c954cffdf10136 /findutils | |
| parent | bd018b1babf0521b8e740abb6473133c1c4c35d2 (diff) | |
| download | busybox-05e782ddd3dc58245c889529bb8aeeaddf24bf71.tar.gz | |
Fix wget error message and add (and use) chomp library function.
Diffstat (limited to 'findutils')
| -rw-r--r-- | findutils/grep.c | 3 | ||||
| -rw-r--r-- | findutils/xargs.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/findutils/grep.c b/findutils/grep.c index 320655bf4..fec8d0913 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 89bcfc156..f05efd917 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) |