busybox-w32/findutils, branch 0_46A mirror of https://github.com/rmyorston/busybox-w32.git
https://git.lua4.win/busybox-w32/atom?h=0_462000-07-11T16:53:56+00:00Applied patch from Matt Kraai which does the following:2000-07-11T16:53:56+00:00Mark Whitleymarkw@lineo.com2000-07-11T16:53:56+00:00urn:sha1:df5f6ba1159f8c1af500fa1b8eb9c9646e4de2a6
- 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
Removed unnecessary #include "regexp.h" line from find.c as per Matt Kraai's2000-07-10T19:29:09+00:00Mark Whitleymarkw@lineo.com2000-07-10T19:29:09+00:00urn:sha1:928faac50328e4e2f4e42e041ba3f1f4568365bd
suggestion on the mailing list.
Applied patch from Matt Kraai as per his email:2000-07-10T15:50:26+00:00Mark Whitleymarkw@lineo.com2000-07-10T15:50:26+00:00urn:sha1:44735f874437ee4b570a6780c1f879de80e80fdc
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.
include getopt.h2000-07-09T05:56:14+00:00Eric Andersenandersen@codepoet.org2000-07-09T05:56:14+00:00urn:sha1:e9b527ae48cb9609ea0668974de32da523ebd231
-Erik
Some cosmetic updates. Changed "OPTIONS" to "Options".2000-07-04T22:17:01+00:00Eric Andersenandersen@codepoet.org2000-07-04T22:17:01+00:00urn:sha1:2086e3d679464c5c443ff66310adb9a6d0b70e6a
-Erik
Fixed comment.2000-06-28T22:59:30+00:00Mark Whitleymarkw@lineo.com2000-06-28T22:59:30+00:00urn:sha1:2e1148b2393b1bcb72804a0c0de1408ca02a0189Added support for reading from stdin with '-' as file name arg.2000-06-28T22:55:59+00:00Mark Whitleymarkw@lineo.com2000-06-28T22:55:59+00:00urn:sha1:8bd891cbecb41442daab3496647e09575960056dYanked out the cstring_alloc() and cstring_lineFromFile() functions from2000-06-28T22:15:26+00:00Mark Whitleymarkw@lineo.com2000-06-28T22:15:26+00:00urn:sha1:1ca41775bbdc07cf67be79aebc566754c9c02855
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.
Brand, spankin', new grep that uses libc regex routines instead of the2000-06-28T22:00:26+00:00Mark Whitleymarkw@lineo.com2000-06-28T22:00:26+00:00urn:sha1:d37218941c37795cc8e96ddb3312d83fb2269d5a
hand-rolled ones. Sed still needs to be replaced and then the regexp stuff can
be axed.
Updates to a number of apps to remove warnings/compile errors under libc5.2000-06-19T17:25:40+00:00Eric Andersenandersen@codepoet.org2000-06-19T17:25:40+00:00urn:sha1:b610615be9aedfac07d1e01f12575707fa3a227c
Tested under both libc5 and libc6 and all seems well with these fixes.
-Erik