aboutsummaryrefslogtreecommitdiff
path: root/findutils
diff options
context:
space:
mode:
authorandersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277>2004-03-15 08:29:22 +0000
committerandersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277>2004-03-15 08:29:22 +0000
commitb16674f3c1a961e0b5d6a57745f5f749d95c641e (patch)
tree4c6d2217f4d8306c59cf1096f8664e1cfd167213 /findutils
parente7135df4a650f9197b633784472f45602524855b (diff)
downloadbusybox-w32-b16674f3c1a961e0b5d6a57745f5f749d95c641e.tar.gz
busybox-w32-b16674f3c1a961e0b5d6a57745f5f749d95c641e.tar.bz2
busybox-w32-b16674f3c1a961e0b5d6a57745f5f749d95c641e.zip
Remove trailing whitespace. Update copyright to include 2004.
git-svn-id: svn://busybox.net/trunk/busybox@8630 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'findutils')
-rw-r--r--findutils/Config.in2
-rw-r--r--findutils/Makefile2
-rw-r--r--findutils/Makefile.in2
-rw-r--r--findutils/find.c8
-rw-r--r--findutils/grep.c8
-rw-r--r--findutils/xargs.c16
6 files changed, 19 insertions, 19 deletions
diff --git a/findutils/Config.in b/findutils/Config.in
index a432ad876..3143bd438 100644
--- a/findutils/Config.in
+++ b/findutils/Config.in
@@ -95,7 +95,7 @@ config CONFIG_XARGS
95 default n 95 default n
96 help 96 help
97 xargs is used to execute a specified command on 97 xargs is used to execute a specified command on
98 every item from standard input. 98 every item from standard input.
99 99
100config CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION 100config CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION
101 bool " Enable prompt and confirmation option -p" 101 bool " Enable prompt and confirmation option -p"
diff --git a/findutils/Makefile b/findutils/Makefile
index fffee8f2c..ba65a0e1d 100644
--- a/findutils/Makefile
+++ b/findutils/Makefile
@@ -1,6 +1,6 @@
1# Makefile for busybox 1# Makefile for busybox
2# 2#
3# Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org> 3# Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
4# 4#
5# This program is free software; you can redistribute it and/or modify 5# This program is free software; you can redistribute it and/or modify
6# it under the terms of the GNU General Public License as published by 6# it under the terms of the GNU General Public License as published by
diff --git a/findutils/Makefile.in b/findutils/Makefile.in
index 6413a7fd1..2d2f242a0 100644
--- a/findutils/Makefile.in
+++ b/findutils/Makefile.in
@@ -1,6 +1,6 @@
1# Makefile for busybox 1# Makefile for busybox
2# 2#
3# Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org> 3# Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
4# 4#
5# This program is free software; you can redistribute it and/or modify 5# This program is free software; you can redistribute it and/or modify
6# it under the terms of the GNU General Public License as published by 6# it under the terms of the GNU General Public License as published by
diff --git a/findutils/find.c b/findutils/find.c
index 661030460..11a838e9f 100644
--- a/findutils/find.c
+++ b/findutils/find.c
@@ -2,7 +2,7 @@
2/* 2/*
3 * Mini find implementation for busybox 3 * Mini find implementation for busybox
4 * 4 *
5 * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org> 5 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
6 * 6 *
7 * Reworked by David Douthitt <n9ubh@callsign.net> and 7 * Reworked by David Douthitt <n9ubh@callsign.net> and
8 * Matt Kraai <kraai@alumni.carnegiemellon.edu>. 8 * Matt Kraai <kraai@alumni.carnegiemellon.edu>.
@@ -98,7 +98,7 @@ static int fileAction(const char *fileName, struct stat *statbuf, void* junk)
98 time_t mtime_secs = mtime_days * 24 * 60 * 60; 98 time_t mtime_secs = mtime_days * 24 * 60 * 60;
99 if (!((isdigit(mtime_char) && file_age >= mtime_secs && 99 if (!((isdigit(mtime_char) && file_age >= mtime_secs &&
100 file_age < mtime_secs + 24 * 60 * 60) || 100 file_age < mtime_secs + 24 * 60 * 60) ||
101 (mtime_char == '+' && file_age >= mtime_secs + 24 * 60 * 60) || 101 (mtime_char == '+' && file_age >= mtime_secs + 24 * 60 * 60) ||
102 (mtime_char == '-' && file_age < mtime_secs))) 102 (mtime_char == '-' && file_age < mtime_secs)))
103 goto no_match; 103 goto no_match;
104 } 104 }
@@ -234,13 +234,13 @@ int find_main(int argc, char **argv)
234 xdev_dev [0] = stbuf. st_dev; 234 xdev_dev [0] = stbuf. st_dev;
235 } 235 }
236 else { 236 else {
237 237
238 for (i = 1; i < firstopt; i++) { 238 for (i = 1; i < firstopt; i++) {
239 if ( stat ( argv [i], &stbuf ) < 0 ) 239 if ( stat ( argv [i], &stbuf ) < 0 )
240 bb_error_msg_and_die("could not stat '%s'", argv [i] ); 240 bb_error_msg_and_die("could not stat '%s'", argv [i] );
241 xdev_dev [i-1] = stbuf. st_dev; 241 xdev_dev [i-1] = stbuf. st_dev;
242 } 242 }
243 } 243 }
244#endif 244#endif
245#ifdef CONFIG_FEATURE_FIND_NEWER 245#ifdef CONFIG_FEATURE_FIND_NEWER
246 } else if (strcmp(argv[i], "-newer") == 0) { 246 } else if (strcmp(argv[i], "-newer") == 0) {
diff --git a/findutils/grep.c b/findutils/grep.c
index 241099c79..229508cda 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -2,7 +2,7 @@
2 * Mini grep implementation for busybox using libc regex. 2 * Mini grep implementation for busybox using libc regex.
3 * 3 *
4 * Copyright (C) 1999,2000,2001 by Lineo, inc. and Mark Whitley 4 * Copyright (C) 1999,2000,2001 by Lineo, inc. and Mark Whitley
5 * Copyright (C) 1999,2000,2001 by Mark Whitley <markw@codepoet.org> 5 * Copyright (C) 1999,2000,2001 by Mark Whitley <markw@codepoet.org>
6 * 6 *
7 * This program is free software; you can redistribute it and/or modify 7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by 8 * it under the terms of the GNU General Public License as published by
@@ -116,7 +116,7 @@ static int grep_file(FILE *file)
116 int print_n_lines_after = 0; 116 int print_n_lines_after = 0;
117 int curpos = 0; /* track where we are in the circular 'before' buffer */ 117 int curpos = 0; /* track where we are in the circular 'before' buffer */
118 int idx = 0; /* used for iteration through the circular buffer */ 118 int idx = 0; /* used for iteration through the circular buffer */
119#endif /* CONFIG_FEATURE_GREP_CONTEXT */ 119#endif /* CONFIG_FEATURE_GREP_CONTEXT */
120 120
121 while ((line = bb_get_chomped_line_from_file(file)) != NULL) { 121 while ((line = bb_get_chomped_line_from_file(file)) != NULL) {
122 llist_t *pattern_ptr = pattern_head; 122 llist_t *pattern_ptr = pattern_head;
@@ -190,7 +190,7 @@ static int grep_file(FILE *file)
190 190
191 /* make a note that we need to print 'after' lines */ 191 /* make a note that we need to print 'after' lines */
192 print_n_lines_after = lines_after; 192 print_n_lines_after = lines_after;
193#endif /* CONFIG_FEATURE_GREP_CONTEXT */ 193#endif /* CONFIG_FEATURE_GREP_CONTEXT */
194 print_line(line, linenum, ':'); 194 print_line(line, linenum, ':');
195 } 195 }
196 } 196 }
@@ -209,7 +209,7 @@ static int grep_file(FILE *file)
209 print_line(line, linenum, '-'); 209 print_line(line, linenum, '-');
210 print_n_lines_after--; 210 print_n_lines_after--;
211 } 211 }
212#endif /* CONFIG_FEATURE_GREP_CONTEXT */ 212#endif /* CONFIG_FEATURE_GREP_CONTEXT */
213 free(line); 213 free(line);
214 } 214 }
215 215
diff --git a/findutils/xargs.c b/findutils/xargs.c
index 8d7e813b5..16b94e20f 100644
--- a/findutils/xargs.c
+++ b/findutils/xargs.c
@@ -96,12 +96,12 @@ static int xargs_exec(char *const *args)
96 return 124; 96 return 124;
97 } 97 }
98 if (WIFSTOPPED(status)) { 98 if (WIFSTOPPED(status)) {
99 bb_error_msg("%s: stopped by signal %d", 99 bb_error_msg("%s: stopped by signal %d",
100 args[0], WSTOPSIG(status)); 100 args[0], WSTOPSIG(status));
101 return 125; 101 return 125;
102 } 102 }
103 if (WIFSIGNALED(status)) { 103 if (WIFSIGNALED(status)) {
104 bb_error_msg("%s: terminated by signal %d", 104 bb_error_msg("%s: terminated by signal %d",
105 args[0], WTERMSIG(status)); 105 args[0], WTERMSIG(status));
106 return 125; 106 return 125;
107 } 107 }
@@ -129,7 +129,7 @@ static int eof_stdin_detected;
129 || (c) == '\f' || (c) == '\v') 129 || (c) == '\f' || (c) == '\v')
130 130
131#ifdef CONFIG_FEATURE_XARGS_SUPPORT_QUOTES 131#ifdef CONFIG_FEATURE_XARGS_SUPPORT_QUOTES
132static xlist_t *process_stdin(xlist_t * list_arg, 132static xlist_t *process_stdin(xlist_t * list_arg,
133 const char *eof_str, size_t mc, char *buf) 133 const char *eof_str, size_t mc, char *buf)
134{ 134{
135#define NORM 0 135#define NORM 0
@@ -200,7 +200,7 @@ set:
200 } 200 }
201 if (state == SPACE) { /* word's delimiter or EOF detected */ 201 if (state == SPACE) { /* word's delimiter or EOF detected */
202 if (q) { 202 if (q) {
203 bb_error_msg_and_die("unmatched %s quote", 203 bb_error_msg_and_die("unmatched %s quote",
204 q == '\'' ? "single" : "double"); 204 q == '\'' ? "single" : "double");
205 } 205 }
206 /* word loaded */ 206 /* word loaded */
@@ -234,7 +234,7 @@ set:
234} 234}
235#else 235#else
236/* The variant does not support single quotes, double quotes or backslash */ 236/* The variant does not support single quotes, double quotes or backslash */
237static xlist_t *process_stdin(xlist_t * list_arg, 237static xlist_t *process_stdin(xlist_t * list_arg,
238 const char *eof_str, size_t mc, char *buf) 238 const char *eof_str, size_t mc, char *buf)
239{ 239{
240 240
@@ -496,8 +496,8 @@ int xargs_main(int argc, char **argv)
496 read_args = process0_stdin; 496 read_args = process0_stdin;
497#endif 497#endif
498 498
499 while ((list = READ_ARGS(list, eof_str, n_max_chars, max_chars)) != NULL || 499 while ((list = READ_ARGS(list, eof_str, n_max_chars, max_chars)) != NULL ||
500 (opt & OPT_NO_EMPTY) == 0) 500 (opt & OPT_NO_EMPTY) == 0)
501 { 501 {
502 opt |= OPT_NO_EMPTY; 502 opt |= OPT_NO_EMPTY;
503 n = 0; 503 n = 0;
@@ -574,7 +574,7 @@ const char *bb_applet_name = "debug stuff usage";
574 574
575void bb_show_usage(void) 575void bb_show_usage(void)
576{ 576{
577 fprintf(stderr, "Usage: %s [-p] [-r] [-t] -[x] [-n max_arg] [-s max_chars]\n", 577 fprintf(stderr, "Usage: %s [-p] [-r] [-t] -[x] [-n max_arg] [-s max_chars]\n",
578 bb_applet_name); 578 bb_applet_name);
579 exit(1); 579 exit(1);
580} 580}