Eric Andersen
43626d7671
Fixup CLEANUP behavior
2001-11-19 10:36:20 +00:00
Matt Kraai
a21c24bf03
Convert strdup call to xstrdup, and calloc calls to xcalloc (patch from
...
Steve Merrifield).
2001-11-12 16:58:07 +00:00
Eric Andersen
dba4e6f046
Add in grep -E support
2001-11-10 12:54:00 +00:00
Eric Andersen
7131213460
config.in features patch from Giulio Orsero <giulioo@pobox.com>
...
with some minor edits from me
2001-11-10 09:53:23 +00:00
Matt Kraai
bb0088e980
Make egrep only set REG_EXTENDED flag.
2001-10-31 16:16:31 +00:00
Eric Andersen
ccd96f1972
Patch from Charles Steinkuehler <charles@steinkuehler.net>
...
to properly handle extended regexps for egrep
2001-10-31 10:02:46 +00:00
Matt Kraai
999623e973
Use extended regular expressions when invoked as egrep (noted and initial
...
patch by Charles Steinkuehler).
2001-10-29 15:49:03 +00:00
Eric Andersen
bdfd0d78bc
Major rework of the directory structure and the entire build system.
...
-Erik
2001-10-24 05:00:29 +00:00
Eric Andersen
74400ccfd0
Scrub up some function prototypes.
...
-Erik
2001-10-18 04:11:39 +00:00
Eric Andersen
0034443140
Fix behavior of grep -lc to match GNU grep. SuS2 is ambiguous
...
on the correct behavior, so acting like GNU grep seems best
-Erik
2001-07-31 23:18:49 +00:00
Eric Andersen
86f0167e39
grep failed to compile when BB_FEATURE_CLEAN_UP was defined -- types were wrong.
2001-05-29 22:36:39 +00:00
Mark Whitley
fa43e54b6f
Added support for grep -e and grep -f, closes bug #1164 . Also added some
...
testcases for these new features.
2001-05-24 18:36:18 +00:00
Matt Kraai
edc806507c
Fixed extra -- lines (noted by Christophe Boyanique).
2001-05-22 14:29:27 +00:00
Mark Whitley
1d9d41150b
Fixed mishandling of -c & -l options and accounted for case when we're
...
grepping only one file.
2001-05-21 21:13:00 +00:00
Matt Kraai
59df6f7398
Change 'printf("%s\n", ...)' into 'puts(...)'. Noted and patched in hostname.c
...
by Larry Doolittle.
2001-05-16 14:21:09 +00:00
Mark Whitley
35e59bed97
Fixed a subtle bug in the handling of -l and -c flags.
2001-05-14 19:40:32 +00:00
Eric Andersen
8d35134ad8
A bug fix from Vladimir for a memory leak I stupidly
...
added to which.c.
2001-05-07 22:45:06 +00:00
Eric Andersen
044a72d0d5
Larry suggested using concat_path_file() would be an even safer bet
...
for 'which'. I ageed, so I whipped this up -- which revealed a bug in
concat_path_file. It turns out that that a '/' can be appended from
either the path _or_ the filename, but only the former was checked.
-Erik
2001-05-04 22:04:24 +00:00
Eric Andersen
7526f035f4
Fix a buffer overflow. Which accounted for the size of the path, plus the the
...
'/', plus the size of the test command. It did not account for the terminating
NULL, which overwrote the end of the string.
-Erik
2001-05-04 20:47:33 +00:00
Mark Whitley
59a86cad67
The tiniest of bracket-placement fixes.
2001-04-17 17:30:44 +00:00
Eric Andersen
303dd28bb0
Make 'grep -l' work
2001-04-09 23:26:31 +00:00
Mark Whitley
4391a16c92
Fixed option parsing. Grep would continue grepping, even when given a bad /
...
invalid option. Closes bug #1146 .
2001-04-09 23:00:07 +00:00
Mark Whitley
e0a7f917c2
Applied patch from David Douthitt to re-add -print option to find.
...
Closes bug #1144 .
2001-03-28 22:04:42 +00:00
Eric Andersen
6f3240abf9
xstrdup xargs cleanup from Jeff Garzik
2001-03-23 17:11:22 +00:00
Eric Andersen
8d4c397d9d
Patch from Jeff Garzik marking a few 'getopt not needed' apps.
2001-03-09 21:28:09 +00:00
Eric Andersen
cbe31dace5
It turns out that DODMALLOC was broken when I reorganized busybox.h
...
header file usage before the 0.49 release. To fix it, I had to move
the '#include "busybox.h"' to the end of the list of #include files.
-Erik
2001-02-20 06:14:08 +00:00
Eric Andersen
67991cf824
This patch, put together by Manuel Novoa III, is a merge of work
...
done by Evin Robertson (bug#1105) and work from Manuel to make
usage messages occupy less space and simplify how usage messages
are displayed.
2001-02-14 21:23:06 +00:00
Mark Whitley
2fd52989f7
Implemented -A, -B, and -C flags with BB_FEATURE_GREP_CONTEXT option set.
2001-02-09 00:41:10 +00:00
Matt Kraai
096370d349
Reworked find with David Douthitt to support -type, -perm, -mtime, and
...
other improvements.
2001-02-07 03:52:38 +00:00
Mark Whitley
b5c29850e3
Tightened things up a bit, saved 20 bytes, and made the code a bit clearer in
...
the process.
2001-02-01 21:02:41 +00:00
Matt Kraai
05e782ddd3
Fix wget error message and add (and use) chomp library function.
2001-02-01 16:49:30 +00:00
Eric Andersen
8ec10a9483
Fix up copyright msgs. Bump version to 0.49 in preparation for
...
a release. Update the website with release details.
-Erik
2001-01-27 09:33:39 +00:00
Eric Andersen
ed3ef50c23
Fix header file usage -- there were many unnecessary header files included in
...
busybox.h which slowed compiles. I left only what was needed and then fixed up
all the apps to include their own header files. I also fixed naming for pwd.h
and grp.h functions. Tested to compile and run with libc5, glibc, and uClibc.
-Erik
2001-01-27 08:24:39 +00:00
Matt Kraai
12f417edbd
Eliminate calls of the form "fprintf(stdout,". Thanks for the idea to
...
Vladimir N. Oleynik.
2001-01-18 02:57:08 +00:00
Mark Whitley
6c6ea6cba2
Changed email address to codepoet.org, updated list of applets / docs I
...
maintain in AUTHORS.
2001-01-04 22:21:13 +00:00
Matt Kraai
0810f723b1
Fixed -qv interaction (thanks to a report and patch from David Douthitt).
2001-01-04 15:11:52 +00:00
Matt Kraai
a9819b2908
Use busybox error handling functions wherever possible.
2000-12-22 01:48:07 +00:00
Matt Kraai
1fa1adea2a
Change calls to error_msg.* and strerror to use perror_msg.*.
2000-12-18 03:57:16 +00:00
Mark Whitley
f57c944e09
Changed names of functions in utility.c and all affected files, to make
...
compliant with the style guide. Everybody rebuild your tags file!
2000-12-07 19:56:48 +00:00
Matt Kraai
3e856ce428
Stop using TRUE and FALSE for exit status.
2000-12-01 02:55:13 +00:00
Matt Kraai
768a2340b5
Fixed return status (thanks to David Douthitt for the fix).
2000-11-18 01:16:43 +00:00
Mark Whitley
e2e2c29ea1
Brand new version of xargs. Tested thoroughly by Kent Robotti. (Domo arigato,
...
Mr. Robotti...) Closes bug #1065 .
2000-11-14 22:43:21 +00:00
Matt Kraai
567cdd1d51
Fix handling of ^$ by removing the newline from input lines and by not
...
compiling with REG_NEWLINE.
2000-10-13 18:55:06 +00:00
Eric Andersen
d266748c76
Yet more polish (thanks again to kent robotti for the bug reports).
...
-Erik
2000-09-26 01:00:15 +00:00
Eric Andersen
d89882da16
Some more polish to make xargs act like GNU xargs (thanks to kent robotti
...
<robotti@metconnect.com> for testing and pointing out the differences)
-Erik
2000-09-25 22:53:05 +00:00
Eric Andersen
3570a34de4
Renamed "internal.h" to the more sensible "busybox.h".
...
-Erik
2000-09-25 21:45:58 +00:00
Eric Andersen
e081eae7a4
Final (I think) version of xargs. Throw away all that tedious string
...
scrubbing, and quit using system. Instead, use fork() and exec(), which
yields and smaller, simpler, and cleaner design.
-Erik
2000-09-25 20:23:21 +00:00
Eric Andersen
bf73909f23
Be ever so pedantic about escaping chars that the shell might not like...
2000-09-25 18:41:18 +00:00
Eric Andersen
6f283c2f77
Fix up xargs so that things like 'cat cat.c | xargs echo' will
...
work properly.
-Erik
2000-09-24 02:40:56 +00:00
Eric Andersen
9ae3838657
Fix xargs option parsing
2000-09-24 01:12:54 +00:00
Eric Andersen
96bdde97fb
Fix memory problems, and make behavior correct.
2000-09-23 19:53:31 +00:00
Eric Andersen
a37d5b772b
rewrite, so it should be firly clean now
2000-09-23 06:10:14 +00:00
Eric Andersen
5b17693f0a
Use minix xargs instead, and update docs accordingly
...
-Erik
2000-09-22 20:22:28 +00:00
Eric Andersen
ebc0dd7a8a
Comment on xargs choice.
2000-09-22 20:02:34 +00:00
Eric Andersen
92a61c1206
Add in xargs
2000-09-22 20:01:23 +00:00
Glenn L McGrath
38c8551cf2
Path count was out by one, fixed it
2000-09-18 09:52:03 +00:00
Glenn L McGrath
63dde9d4ce
Simplify and remove dependence on PATH_MAX
...
buf[PATH_MAX] now defined using strlen to the exact size to be used.
removed output that was displayed if which didnt find the command, this makes itmatch the behaviour of GNU's which.
These modifications result in a slight size decrease.
2000-09-18 09:37:40 +00:00
Matt Kraai
322ae93a5e
Fix calls to {m,c,re}alloc so that they use x{m,c,re}alloc instead of
...
segfaulting or handling errors the same way themselves.
2000-09-13 02:46:14 +00:00
Eric Andersen
88f50b6bf5
Some #include updates.
...
-Erik
2000-08-10 17:59:11 +00:00
Matt Kraai
deb95f69b6
Exit with the appropriate value when grepping multiple files.
2000-08-06 15:25:53 +00:00
Matt Kraai
27a804246a
Centralize handling of --help.
2000-07-19 19:24:01 +00:00
Mark Whitley
2ef880b236
Consolodated some common code into print_matched_line to make 'grep_file' a
...
little more terse & clean. Also made a few minor formatting changes.
2000-07-18 21:02:06 +00:00
Mark Whitley
8f122431f5
Added support for the -c (count matches) option. Made it so it works just like
...
GNU grep.
2000-07-18 18:37:01 +00:00
Matt Kraai
bf181b9338
Extract usage information into a separate file.
2000-07-16 20:57:15 +00:00
Matt Kraai
3bd8bd89ee
Don't use strings directly in calls to usage(). This is in preparation
...
for their extraction to a separate file.
2000-07-14 23:28:47 +00:00
Matt Kraai
d537a95fdb
Use errorMsg rather than fprintf.
2000-07-14 01:51:25 +00:00
Mark Whitley
c41e8c840f
Changed bb_regcomp to xregcomp and #if 0'ed out destroy_cmd_strs in sed.c
...
(maybe I'll remove it later).
2000-07-12 23:35:21 +00:00
Mark Whitley
df5f6ba115
Applied patch from Matt Kraai which does the following:
...
- adds case-insensitive matching in sed s/// epxressions
- consolodates common regcomp code in grep & sed into bb_regcomp and put in
utility.c
- cleans up a bunch of cruft
2000-07-11 16:53:56 +00:00
Mark Whitley
928faac503
Removed unnecessary #include "regexp.h" line from find.c as per Matt Kraai's
...
suggestion on the mailing list.
2000-07-10 19:29:09 +00:00
Mark Whitley
44735f8744
Applied patch from Matt Kraai as per his email:
...
However, the case of
grep foo$ file
didn't work, due to a problem with the flags used in regular expression
compilation. The attached patch fixes this problem.
---patch-------
Index: grep.c
===================================================================
RCS file: /var/cvs/busybox/grep.c,v
retrieving revision 1.30
diff -u -r1.30 grep.c
--- grep.c 2000/07/04 22:17:01 1.30
+++ grep.c 2000/07/10 08:57:04
@@ -141,8 +141,10 @@
if (argv[optind] == NULL)
usage(grep_usage);
- /* compile the regular expression */
- reflags = REG_NOSUB; /* we're not going to mess with sub-expressions
*/
+ /* compile the regular expression
+ * we're not going to mess with sub-expressions, and we need to
+ * treat newlines right. */
+ reflags = REG_NOSUB | REG_NEWLINE;
if (ignore_case)
reflags |= REG_ICASE;
if ((ret = regcomp(®ex, argv[optind], reflags)) != 0) {
---patch-------
Thanks, Matt, it works great.
2000-07-10 15:50:26 +00:00
Eric Andersen
e9b527ae48
include getopt.h
...
-Erik
2000-07-09 05:56:14 +00:00
Eric Andersen
2086e3d679
Some cosmetic updates. Changed "OPTIONS" to "Options".
...
-Erik
2000-07-04 22:17:01 +00:00
Mark Whitley
2e1148b239
Fixed comment.
2000-06-28 22:59:30 +00:00
Mark Whitley
8bd891cbec
Added support for reading from stdin with '-' as file name arg.
2000-06-28 22:55:59 +00:00
Mark Whitley
1ca41775bb
Yanked out the cstring_alloc() and cstring_lineFromFile() functions from
...
utility.c and replaced them with get_line_from_file() from the new grep.c.
Also changed declaration in internal.h and replaced instances of
cstring_lineFromFile() in dc.c and sort.c with get_line_from_file(). Tested
them and they worked fine.
2000-06-28 22:15:26 +00:00
Mark Whitley
d37218941c
Brand, spankin', new grep that uses libc regex routines instead of the
...
hand-rolled ones. Sed still needs to be replaced and then the regexp stuff can
be axed.
2000-06-28 22:00:26 +00:00
Eric Andersen
b610615be9
Updates to a number of apps to remove warnings/compile errors under libc5.
...
Tested under both libc5 and libc6 and all seems well with these fixes.
-Erik
2000-06-19 17:25:40 +00:00
Eric Andersen
74c66ad06e
Fix some spelling errors in the source as well.
...
-Erik
2000-06-16 19:57:44 +00:00
John Beppu
d84990eb1f
+ removed some cruft left over from when lines could be too long.
2000-06-14 00:19:14 +00:00
Eric Andersen
053b1462b7
Fix a bug pointed out by Michal Jaegermann <michal@ellpspace.math.ualberta.ca>
...
where you used to see:
./grep -q -i B some_file
B: No such file or directory
This is now fixed.
-Erik
2000-06-13 06:24:53 +00:00
John Beppu
c7ccfc99fc
+ utility.c
...
CSTRING_BUFFER_LENGTH = 1024 /* so it recurses less often */
+ grep.c
uses cstring_lineFromFile(), and doesn't ever say
Line is too long, anymore
2000-06-12 23:39:04 +00:00
Pavel Roskin
c389d91181
"which" rewritten to use stat(). Fixes to improve its compatability
...
with traditional implementations
2000-06-05 23:41:27 +00:00
Erik Andersen
330fd2b576
More libc portability updates, add in the website (which has not been
...
archived previously). Wrote 'which' during the meeting today.
-Erik
2000-05-19 05:35:19 +00:00
Erik Andersen
7ab9c7ee52
Lots of updates. Finished implementing BB_FEATURE_TRIVIAL_HELP
...
which lets you compile out most of the "--help" output, saving
up to 17k.
Renamed mnc to nc.
-Erik
2000-05-12 19:41:47 +00:00
John Beppu
f93a95de69
+ grep -v # yay!
2000-04-24 18:07:30 +00:00
Erik Andersen
9cf3bfa7c1
More doc updates for BusyBox, with fixes to apps for bugs revealed
...
while trying to write docs . :-)
-Erik
2000-04-13 18:49:43 +00:00
Erik Andersen
61677feff7
Upates to include copyright 2000 to everything
...
-Erik
2000-04-13 01:18:56 +00:00
Erik Andersen
3364d78b18
Yet another installment in the ongoing tar saga
...
-Erik
2000-03-28 00:58:14 +00:00
Erik Andersen
4d0543138e
More minor touchups.
...
-Erik
2000-02-10 07:31:15 +00:00
Erik Andersen
e49d5ecbbe
Some formatting updates (ran the code through indent)
...
-Erik
2000-02-08 19:58:47 +00:00
Erik Andersen
fac10d7c59
A few minor updates. ;-)
...
Seriously though, read the Changelog for busybox 0.42,
which this is about to become...
-Erik
2000-02-07 05:29:42 +00:00
Erik Andersen
04e97024e7
Clear up some ambiguity with old style assignments.
...
-Erik
2000-01-29 07:06:24 +00:00
Erik Andersen
a2f69e5485
Bug fix. grep wasn't printing file names they way it was supposed to.
...
-Erik
2000-01-19 04:30:37 +00:00
Erik Andersen
2fe08c7afb
Fixed cp so it works as God intended it to.
...
-Erik
1999-12-29 02:10:35 +00:00
Erik Andersen
3fe2ecf0d9
Added grep -q, thanks to a patch from "Konstantin Boldyshev" <konst@voshod.com>
...
-Erik
1999-12-21 08:52:04 +00:00
Eric Andersen
b186d980d6
Stuf
1999-12-03 09:19:54 +00:00
Eric Andersen
d73dc5b073
Updates to usage, and made tar work.
...
-Erik
1999-11-10 23:13:02 +00:00
Eric Andersen
50d6360771
Stuff
1999-11-09 01:47:36 +00:00
Eric Andersen
fbb39c83b6
Stuff
...
-Erik
1999-11-08 17:00:52 +00:00
Eric Andersen
6b6b3f6ef2
Stuf
1999-10-28 16:06:25 +00:00
Eric Andersen
aa0765e11b
Added regexp support, fixed Changelog.
1999-10-22 04:30:20 +00:00
Eric Andersen
c49960189a
Fixed up copyright notices and such
1999-10-20 22:08:37 +00:00
Eric Andersen
e77ae3a2c0
Added sfdisk. Ststic-ified a bunch of stuff.
1999-10-19 20:03:34 +00:00
Eric Andersen
3e0fbae15e
fixes grep, added loadfont from debian bootfloppies.
...
-Erik
1999-10-19 06:02:44 +00:00
Eric Andersen
b0e9a709ba
More stuff.
...
-Erik
1999-10-18 22:28:26 +00:00
Eric Andersen
bed30e9700
More fixes
1999-10-18 19:02:32 +00:00
Eric Andersen
9b58718889
Some fixes and such
1999-10-17 05:43:39 +00:00
Eric Andersen
3cf52d1958
More stuff...
1999-10-12 22:26:06 +00:00
Eric Andersen
f811e07b07
More stuff.
1999-10-09 00:25:00 +00:00
Eric Andersen
596e5469d0
more stuff
1999-10-07 08:30:23 +00:00
Eric Andersen
17d49efd8c
More stuff.
1999-10-06 20:25:32 +00:00
Eric Andersen
cc8ed39b24
Initial revision
1999-10-05 16:24:54 +00:00