[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: MS-Windows build of Grep [4/4]
From: |
Eli Zaretskii |
Subject: |
Re: MS-Windows build of Grep [4/4] |
Date: |
Sat, 24 Dec 2011 15:03:47 +0200 |
This final changeset fixes a few general problems, and adds a couple
of NEWS entries.
Fix whitespace, indentation and documentation
* src/main.c (parse_grep_colors): Fix indentation.
(usage): Mention MS-Windows in help text for -U and -u options.
* NEWS: Mention MS-Windows related bugfixes and enhancements.
diff -up -r grep-2.10.orig/NEWS grep-2.10.MinGW/NEWS
--- grep-2.10.orig/NEWS 2011-11-16 17:02:36.000000000 +0200
+++ grep-2.10.MinGW/NEWS 2011-12-20 16:01:39.153054700 +0200
@@ -1,5 +1,16 @@
GNU grep NEWS -*- outline -*-
+* Noteworthy changes in release 2....
+
+** Bug fixes
+
+ grep no longer emits an error message and quits on MS-Windows when
+ invoked with the -r option.
+
+** New features
+
+ grep now supports color highlighting of matches on MS-Windows.
+
* Noteworthy changes in release 2.10 (2011-11-16) [stable]
** Bug fixes
@@ -11,6 +22,7 @@ GNU grep NEWS
in which the output file is also one of the inputs,
because it can result in an "infinite" disk-filling loop.
[bug present since "the beginning"]
+ [bug still present in MinGW builds for MS-Windows]
** Build-related
diff -up -r grep-2.10.orig/src/main.c grep-2.10.MinGW/src/main.c
--- grep-2.10.orig/src/main.c 2011-09-10 13:17:04.000000000 +0300
+++ grep-2.10.MinGW/src/main.c 2011-12-20 11:41:49.498911300 +0200
@@ -1485,8 +1679,9 @@ Context control:\n\
--color[=WHEN],\n\
--colour[=WHEN] use markers to highlight the matching strings;\n\
WHEN is `always', `never', or `auto'\n\
- -U, --binary do not strip CR characters at EOL (MSDOS)\n\
- -u, --unix-byte-offsets report offsets as if CRs were not there (MSDOS)\n\
+ -U, --binary do not strip CR characters at EOL
(MSDOS/Windows)\n\
+ -u, --unix-byte-offsets report offsets as if CRs were not there\n\
+ (MSDOS/Windows)\n\
\n"));
printf ("%s", _(after_options));
printf (_("\
@@ -1727,16 +1922,16 @@ parse_grep_colors (void)
if (cap->var)
{
if (val)
- *(cap->var) = val;
+ *(cap->var) = val;
else
- error(0, 0, _("in GREP_COLORS=\"%s\", the \"%s\" capacity "
+ error(0, 0, _("in GREP_COLORS=\"%s\", the \"%s\" capacity "
"needs a value (\"=...\"); skipped"), p, name);
- }
- else if (val)
- error(0, 0, _("in GREP_COLORS=\"%s\", the \"%s\" capacity "
- "is boolean and cannot take a value (\"=%s\"); skipped"),
- p, name, val);
- }
+ }
+ else if (val)
+ error(0, 0, _("in GREP_COLORS=\"%s\", the \"%s\" capacity "
+ "is boolean and cannot take a value (\"=%s\");
skipped"),
+ p, name, val);
+ }
if (cap->fct)
{
const char *err_str = cap->fct();
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Re: MS-Windows build of Grep [4/4],
Eli Zaretskii <=