[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
grep branch, master, updated. v2.12-11-g6c4a43a
|
From: |
Paul Eggert |
|
Subject: |
grep branch, master, updated. v2.12-11-g6c4a43a |
|
Date: |
Sun, 06 May 2012 23:19:40 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".
The branch, master has been updated
via 6c4a43ab84bc20d39128c390d14fba36f668ad98 (commit)
from 58195fabc7559541b3736400e08e901011acd61f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=6c4a43ab84bc20d39128c390d14fba36f668ad98
commit 6c4a43ab84bc20d39128c390d14fba36f668ad98
Author: Paul Eggert <address@hidden>
Date: Sun May 6 16:18:57 2012 -0700
maint: quote 'like this' or "like this", not `like this'
See <http://lists.gnu.org/archive/html/bug-grep/2012-01/msg00125.html>.
* ChangeLog-2009, HACKING, NEWS, README-hacking, cfg.mk, configure.ac:
* lib/colorize-w32.c, m4/pcre.m4:
* src/Makefile.am, src/dfa.c, src/dosbuf.c, src/main.c:
* tests/backref, tests/help-version, tests/tests:
In commentary, quote 'like this' or "like this" rather than
`like this' or ``like this''.
* cfg.mk (old_NEWS_hash): Update due to changed old NEWS.
* doc/grep.texi (General Output Control): Quote sample text
with @samp, not with `...'.
* src/main.c (usage):
* tests/help-version: Quote 'like this' rather than `like this'
in diagnostics.
diff --git a/ChangeLog-2009 b/ChangeLog-2009
index 894891b..fac59ff 100644
--- a/ChangeLog-2009
+++ b/ChangeLog-2009
@@ -994,7 +994,7 @@
2005-01-07 Stepan Kasal <address@hidden>
- * tests/status.sh: Added two tests--option `-s' should have no
+ * tests/status.sh: Added two tests--option '-s' should have no
influence on the exit status.
2004-12-16 Stepan Kasal <address@hidden>
@@ -1028,8 +1028,8 @@
2004-12-01 Stepan Kasal <address@hidden>
- * src/grep.c (usage): Use ``FILE_PATTERN'' for --include and --exclude,
- change ``only print'' to ``print only''.
+ * src/grep.c (usage): Use "FILE_PATTERN" for --include and --exclude,
+ change "only print" to "print only".
* doc/grep.1: Likewise; state that wildcard matching is used.
Move some options so that they are sorted alphabetically.
* dfa.c, NEWS: Fix typos.
@@ -1052,9 +1052,9 @@
2004-11-23 Stepan Kasal <address@hidden>
- * src/grep.c (usage): Make sure both copies of the ``usage''
- strings match. Add ``(C)'' to the copyright notice.
- * src/dfa.c: Changed ``out of memory'' to ``memory exhausted'' to
+ * src/grep.c (usage): Make sure both copies of the "usage"
+ strings match. Add "(C)" to the copyright notice.
+ * src/dfa.c: Changed "out of memory" to "memory exhausted" to
match messages elsewhere in the source.
2004-11-22 Stepan Kasal <address@hidden>
@@ -1081,7 +1081,7 @@
2004-11-20 Stepan Kasal <address@hidden>
* configure.in: Added a copyright notice (using gawk as a template).
- (AC_INIT, AM_INIT_AUTOMAKE): Changed to the ``new'' form so that
+ (AC_INIT, AM_INIT_AUTOMAKE): Changed to the "new" form so that
the PACKAGE_* symbols get defined correctly in config.h.
2004-11-20 Stepan Kasal <address@hidden>
@@ -1108,7 +1108,7 @@
* tests/spencer1.awk: Use only lines with 3 fields.
* tests/spencer1.tests: Disable #55 for now.
- * tests/ere.tests, tests/bre.tests: Add ``TO CORRECT'' to disabled
+ * tests/ere.tests, tests/bre.tests: Add "TO CORRECT" to disabled
tests which had empty $4.
* tests/backref.sh: Modify #2 so that current glibc regex can
handle it in finite time.
@@ -1116,7 +1116,7 @@
2004-11-12 Stepan Kasal <address@hidden>
Change bug-gnu-utils address to bug-grep, on many places; there
- is no need to have the word ``grep'' in subject then.
+ is no need to have the word "grep" in subject then.
Thanks to Tony Abou-Assaleh and Benno Schulenberg for pointing
out this.
@@ -1129,7 +1129,7 @@
* src/search.c (check_multibyte_string, Gcompile, Ecompile): Replace
malloc with xmalloc.
- * src/dfa.c (dfamust): Replace two calls to ``malloc'' by MALLOC.
+ * src/dfa.c (dfamust): Replace two calls to 'malloc' by MALLOC.
2003-07-23 Stepan Kasal <address@hidden>
@@ -1142,7 +1142,7 @@
* src/dfa.c: remove non-constant initializers from dfa.c
2003-06-16 Stepan Kasal <address@hidden>
- * doc/grep.1: two typos ``--line-buffered [...] penalty''
+ * doc/grep.1: two typos "--line-buffered [...] penalty"
* doc/grep.texi: a typo
2003-06-12 Bernhard Rosenkraenzer <address@hidden>
@@ -1515,11 +1515,11 @@
2001-03-01 Isamu Hasegawa
Implement the mechanism to match with multibyte characters,
- and use it for `period' in multibyte environments.
+ and use it for 'period' in multibyte environments.
* dfa.h (mbps): new variable.
* dfa.c (prtok): handle ANYCHAR.
- (lex): use ANYCHAR for `period' in multibyte environments.
+ (lex): use ANYCHAR for 'period' in multibyte environments.
(atom): handle ANYCHAR.
(state_index): initialize mbps in multibyte environments.
(epsclosure): handle ANYCHAR.
@@ -2166,7 +2166,7 @@
2000-03-03 Jim Meyering
- * regex.m4: Make sure re_compile_pattern accepts patterns like `{1'.
+ * regex.m4: Make sure re_compile_pattern accepts patterns like '{1'.
2000-03-02 Alain Magloire
@@ -2474,13 +2474,13 @@
1999-10-02 Paul Eggert
- * NEWS: egrep is now equivalent to `grep -E'.
+ * NEWS: egrep is now equivalent to 'grep -E'.
The lower bound of an interval is not optional.
You can specify a matcher multiple types without error.
-u and -U are now allowed on non-DOS hosts, and have no effect.
* doc/grep.texi: Likewise.
* doc/grep.1: Likewise.
- Fix some troff bugs that prevented `groff' from rendering the page.
+ Fix some troff bugs that prevented 'groff' from rendering the page.
* src/egrepmat.c, src/fgrepmat.c, src/grepmat.c (default_matcher):
Remove.
@@ -2545,9 +2545,9 @@
allocate only for regular files, since we don't know the sizes of
other files.
Don't bother to check whether the file offset is a multiple of the page
- size, since we now do that just once in `reset'.
+ size, since we now do that just once in 'reset'.
When an mmapped area would fall past the end of the file, trim it to
- just before instead of giving up immediately and doing a `read';
+ just before instead of giving up immediately and doing a 'read';
that avoids a worst-case behavior that could read half an mmapped file.
Fix bug when computing offsets on hosts that don't have mmap.
@@ -2570,7 +2570,7 @@
Don't assume that st_ino and st_dev must be integers;
POSIX.1 allows them to be floating-point (!).
- * src/vms_fab.h (arr_ptr): `:' -> `;' to fix typo.
+ * src/vms_fab.h (arr_ptr): ':' -> ';' to fix typo.
1999-08-18 Alain Magloire
@@ -2616,15 +2616,15 @@
1999-07-26 Paul Eggert
-Several GNU tools have options to process arbitrary file names, even
-file names that contain newline characters. These include `find
--print0', `perl -0', `sort -z', and `xargs -0'. It'd be handy if GNU
-grep also processed such file names. Here's a proposed patch to do
-this, relative to grep 2.3c. This patch introduces two options, one
-for the data, and one for the file names. (Sometimes one wants
-null-terminated file names in the output, and sometimes one wants to
-process lists of null-terminated strings, and these are orthogonal
-axes.)
+ Several GNU tools have options to process arbitrary file names, even
+ file names that contain newline characters. These include 'find
+ -print0', 'perl -0', 'sort -z', and 'xargs -0'. It'd be handy if GNU
+ grep also processed such file names. Here's a proposed patch to do
+ this, relative to grep 2.3c. This patch introduces two options, one
+ for the data, and one for the file names. (Sometimes one wants
+ null-terminated file names in the output, and sometimes one wants to
+ process lists of null-terminated strings, and these are orthogonal
+ axes.)
* NEWS, doc/grep.texi: New -z or --null-data and -Z or --null options.
* src/grep.c (long_options, usage, main): Likewise.
@@ -2807,7 +2807,7 @@ axes.)
* intl/Makefile.in: Replace .o with .${ac_objext} where necessary.
Work around a limitation of Visual C++ on Cygwin32.
- * acconfig.h configure.in: Define `alloca' as `_alloca' when CC=cl.
+ * acconfig.h configure.in: Define 'alloca' as '_alloca' when CC=cl.
This little hack was suggested by Ian Roxborough <address@hidden>.
Patch forwarded by Ben Elliston.
@@ -2925,10 +2925,10 @@ axes.)
* doc/grep.texi: I found and corrected several typos.
I believe the GNU standards require the section that describes the
- options to the programs to be called ``Invoking'' or ``Invoking
- <program-name>''. This is so users and programs can easily find
+ options to the programs to be called "Invoking" or "Invoking
+ <program-name>". This is so users and programs can easily find
that node in any Info file. So I changed the name of the
- `Options' chapter to `Invoking', and corrected the
+ "Options" chapter to "Invoking", and corrected the
cross-references accordingly.
I added some markup to things like file names and options.
I added some additional index entries where that seemed useful.
@@ -3005,8 +3005,8 @@ axes.)
the console device.
(is_EISDIR): Don't define if already defined. Accept a second
argument, the file name; all callers changed.
- (grepdir): Don't free `file', inside the loop. Use IS_SLASH to
- check whether `dir' needs a slash.
+ (grepdir): Don't free 'file', inside the loop. Use IS_SLASH to
+ check whether 'dir' needs a slash.
(grepfile): If file is a directory, set e to EISDIR.
1998-11-10 Alain Magloire
@@ -3024,7 +3024,7 @@ axes.)
1998-11-09 Paul Eggert
- * src/grep.1: Fix `Last Change' of output by generating the date
+ * src/grep.1: Fix "Last Change" of output by generating the date
from the RCS Id.
* src/grep.c (is_EISDIR): New macro.
@@ -3059,7 +3059,7 @@ axes.)
1998-11-08 Alain Magloire
- * src/grep.1: `prep.ai.mit.edu' should be replaced with `gnu.org'.
+ * src/grep.1: 'prep.ai.mit.edu' should be replaced with 'gnu.org'.
Nit from Paul Eggert.
1998-11-06 Alain Magloire
@@ -3127,7 +3127,7 @@ axes.)
(reset): Initialize it.
(fillbuf): Use it.
(count_matches, list_files, no_filenames, suppress_errors): New static
- vars; formerly were local to `main'.
+ vars; formerly were local to 'main'.
(grep): Recurse through directories if the user asks for this.
(usage, main): Add new options.
(main): Change some local vars to be static, as described above.
@@ -3156,14 +3156,14 @@ axes.)
(reset): Now returns value specifying whether to skip this file.
Stat the file if either mmap or directory-skipping is possible.
Skip the file if it's a directory and we're skipping directories.
- (grep): Skip the file if `reset' tells us to.
+ (grep): Skip the file if 'reset' tells us to.
(main): If open fails because the file is a directory, and if we're
skipping directories, don't report an error.
Remove special case for DOS and Windows.
* src/dosbuf.c (guess_type): Use the same method for guessing whether a
file is binary as grep.c's grep does.
- There's no longer any need to declare `bp' to be unsigned.
+ There's no longer any need to declare 'bp' to be unsigned.
1998-04-26 Alain Magloire
@@ -3184,7 +3184,7 @@ axes.)
1998-04-17 Kaveh R. Ghazi
- * src/dfa.h: Don't define `const', trust autoconf to handle it.
+ * src/dfa.h: Don't define 'const', trust autoconf to handle it.
1998-04-16 Alain Magloire
@@ -3332,7 +3332,7 @@ axes.)
Remove the "matching a single character".
Suggested by Harald Hanche-Olsen.
- * src/grep.c (main): `-f /dev/null' now specifies no patterns
+ * src/grep.c (main): '-f /dev/null' now specifies no patterns
and therfore matches nothing.
Reported by Jorge Stolfi.
Patched by Paul Eggert.
@@ -3507,7 +3507,7 @@ axes.)
1997-07-17 Alain Magloire <address@hidden>
- * src/grep.c: Cause grep to fail if `fclose (stdout)' fails.
+ * src/grep.c: Cause grep to fail if 'fclose (stdout)' fails.
From Jim Meyering <address@hidden>.
* grep.c:usage() more consistency in the --help.
diff --git a/HACKING b/HACKING
index be39905..6d21d0f 100644
--- a/HACKING
+++ b/HACKING
@@ -593,5 +593,5 @@ Permission is granted to copy, distribute and/or modify
this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
-Texts. A copy of the license is included in the ``GNU Free
-Documentation License'' file as part of this distribution.
+Texts. A copy of the license is included in the "GNU Free
+Documentation License" file as part of this distribution.
diff --git a/NEWS b/NEWS
index 9bd7e67..1497b92 100644
--- a/NEWS
+++ b/NEWS
@@ -420,13 +420,13 @@ Version 2.4.1
Version 2.4:
- - egrep is now equivalent to `grep -E' as required by POSIX,
+ - egrep is now equivalent to 'grep -E' as required by POSIX,
removing a longstanding source of confusion and incompatibility.
- `grep' is now more forgiving about stray `{'s, for backward
+ 'grep' is now more forgiving about stray '{'s, for backward
compatibility with traditional egrep.
- The lower bound of an interval is not optional.
- You must use an explicit zero, e.g. `x{0,10}' instead of `x{,10}'.
+ You must use an explicit zero, e.g. 'x{0,10}' instead of 'x{,10}'.
(The old documentation incorrectly claimed that it was optional.)
- The --revert-match option has been renamed to --invert-match.
@@ -438,15 +438,15 @@ Version 2.4:
- New option --mmap. By default, GNU grep now uses read instead of mmap.
This is faster on some hosts, and is safer on all.
- - The new option -z or --null-data causes `grep' to treat a zero byte
+ - The new option -z or --null-data causes 'grep' to treat a zero byte
(the ASCII NUL character) as a line terminator in input data, and
to treat newlines as ordinary data.
- - The new option -Z or --null causes `grep' to output a zero byte
+ - The new option -Z or --null causes 'grep' to output a zero byte
instead of the normal separator after a file name.
- - These two options can be used with commands like `find -print0',
- `perl -0', `sort -z', and `xargs -0' to process arbitrary file names,
+ - These two options can be used with commands like 'find -print0',
+ 'perl -0', 'sort -z', and 'xargs -0' to process arbitrary file names,
even those that contain newlines.
- The environment variable GREP_OPTIONS specifies default options;
@@ -454,7 +454,7 @@ Version 2.4:
behavior of silently skipping directories.
- You can specify a matcher multiple times without error, e.g.
- `grep -E -E' or `fgrep -F'. It is still an error to specify
+ 'grep -E -E' or 'fgrep -F'. It is still an error to specify
conflicting matchers.
- -u and -U are now allowed on non-DOS hosts, and have no effect.
@@ -471,26 +471,26 @@ Version 2.4:
Version 2.3:
- When searching a binary file FOO, grep now just reports
- `Binary file FOO matches' instead of outputting binary data.
+ "Binary file FOO matches" instead of outputting binary data.
This is typically more useful than the old behavior,
- and it is also more consistent with other utilities like `diff'.
+ and it is also more consistent with other utilities like 'diff'.
A file is considered to be binary if it contains a NUL (i.e. zero) byte.
- The new -a or --text option causes `grep' to assume that all
- input is text. (This option has the same meaning as with `diff'.)
+ The new -a or --text option causes 'grep' to assume that all
+ input is text. (This option has the same meaning as with 'diff'.)
Use it if you want binary data in your output.
- - `grep' now searches directories just like ordinary files; it no longer
+ - 'grep' now searches directories just like ordinary files; it no longer
silently skips directories. This is the traditional behavior of
- Unix text utilities (in particular, of traditional `grep').
- Hence `grep PATTERN DIRECTORY' should report
- `grep: DIRECTORY: Is a directory' on hosts where the operating system
+ Unix text utilities (in particular, of traditional 'grep').
+ Hence 'grep PATTERN DIRECTORY' should report
+ "grep: DIRECTORY: Is a directory" on hosts where the operating system
does not permit programs to read directories directly, and
- `grep: DIRECTORY: Binary file matches' (or nothing) otherwise.
+ "grep: DIRECTORY: Binary file matches" (or nothing) otherwise.
The new -d ACTION or --directories=ACTION option affects directory
handling.
- `-d skip' causes `grep' to silently skip directories, as in grep 2.1;
- `-d read' (the default) causes `grep' to read directories if possible,
+ '-d skip' causes 'grep' to silently skip directories, as in grep 2.1;
+ '-d read' (the default) causes 'grep' to read directories if possible,
as in earlier versions of grep.
- The MS-DOS and Microsoft Windows ports now behave identically to the
@@ -579,5 +579,5 @@ Permission is granted to copy, distribute and/or modify
this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
-Texts. A copy of the license is included in the ``GNU Free
-Documentation License'' file as part of this distribution.
+Texts. A copy of the license is included in the "GNU Free
+Documentation License" file as part of this distribution.
diff --git a/README-hacking b/README-hacking
index 0fc66bf..7b4970d 100644
--- a/README-hacking
+++ b/README-hacking
@@ -18,7 +18,7 @@ Valgrind <http://valgrind.org/> is also highly recommended, if
Valgrind supports your architecture. See also README-valgrind.
While building from a just-cloned source tree may require installing a
-few prerequisites, later, a plain `git pull && make' should be sufficient.
+few prerequisites, later, a plain 'git pull && make' should be sufficient.
* First GIT checkout
diff --git a/cfg.mk b/cfg.mk
index e277ccb..4949d3b 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -51,9 +51,9 @@ export VERBOSE = yes
# 1127556 9e
export XZ_OPT = -6e
-old_NEWS_hash = f36c60cbfbb397ed4ebd24ea0ef93261
+old_NEWS_hash = 4161c68bdef85693cf836ee31ba9a3f9
-# Many m4 macros names once began with `jm_'.
+# Many m4 macros names once began with 'jm_'.
# Make sure that none are inadvertently reintroduced.
sc_prohibit_jm_in_m4:
@grep -nE 'jm_[A-Z]' \
diff --git a/configure.ac b/configure.ac
index d681dc3..dc1e582 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
dnl
-dnl autoconf input file for ``GNU grep''
+dnl autoconf input file for GNU grep
dnl
dnl Copyright (C) 1997-2006, 2009-2012 Free Software Foundation, Inc.
dnl
diff --git a/doc/grep.texi b/doc/grep.texi
index 000a844..3b52a19 100644
--- a/doc/grep.texi
+++ b/doc/grep.texi
@@ -261,7 +261,7 @@ for bold red matched text, magenta file names, green line
numbers,
green byte offsets, cyan separators, and default terminal colors otherwise.
The deprecated environment variable @env{GREP_COLOR} is still supported,
but its setting does not have priority;
-it defaults to `01;31' (bold red)
+it defaults to @samp{01;31} (bold red)
which only covers the color for matched text.
@var{WHEN} is @samp{never}, @samp{always}, or @samp{auto}.
diff --git a/lib/colorize-w32.c b/lib/colorize-w32.c
index 7341fe2..3fcd317 100644
--- a/lib/colorize-w32.c
+++ b/lib/colorize-w32.c
@@ -173,7 +173,7 @@ print_start_colorize (char const *sgr_start, char const
*sgr_seq)
/* Clear to the end of the current line with the default attribute.
This is needed for reasons similar to those that require the "EL to
Right after SGR" operation on Posix platforms: if we don't do this,
- setting the `mt', `ms', or `mc' capabilities to use a non-default
+ setting the 'mt', 'ms', or 'mc' capabilities to use a non-default
background color spills that color to the empty space at the end of
the last screen line in a match whose line spans multiple screen
lines. */
diff --git a/m4/pcre.m4 b/m4/pcre.m4
index 42d96f6..b27f467 100644
--- a/m4/pcre.m4
+++ b/m4/pcre.m4
@@ -43,5 +43,6 @@ AC_DEFUN([gl_FUNC_PCRE],
fi
AC_DEFINE_UNQUOTED([HAVE_LIBPCRE], [`test $use_pcre != yes; echo $?`],
- [Define to 1 if you have the `pcre' library (-lpcre).])
+ [Define to 1 if you have the Perl Compatible Regular Expressions
+ library (-lpcre).])
])
diff --git a/src/Makefile.am b/src/Makefile.am
index 4543f62..5cc8d59 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -32,7 +32,7 @@ libgrep_a_SOURCES = kwset.c dfa.c searchutils.c dfasearch.c
kwsearch.c \
pcresearch.c main.c
# Sometimes, the expansion of $(LIBINTL) includes -lc which may
-# include modules defining variables like `optind', so libgreputils.a
+# include modules defining variables like 'optind', so libgreputils.a
# must precede $(LIBINTL) in order to ensure we use GNU getopt.
# But libgreputils.a must also follow $(LIBINTL), since libintl uses
# replacement functions defined in libgreputils.a.
diff --git a/src/dfa.c b/src/dfa.c
index 96d462f..a7e263a 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -39,7 +39,7 @@
- It's typically faster.
Posix 1003.2-1992 section 2.5.2.1 page 50 lines 1556-1558 says that
only '0' through '9' are digits. Prefer ISASCIIDIGIT to isdigit unless
- it's important to use the locale's definition of `digit' even when the
+ it's important to use the locale's definition of "digit" even when the
host does not conform to Posix. */
#define ISASCIIDIGIT(c) ((unsigned) (c) - '0' <= 9)
@@ -634,7 +634,7 @@ static charclass newline;
# define is_valid_unibyte_character(c) (! (MBS_SUPPORT && btowc (c) == WEOF))
#endif
-/* Return non-zero if C is a 'word-constituent' byte; zero otherwise. */
+/* Return non-zero if C is a "word-constituent" byte; zero otherwise. */
#define IS_WORD_CONSTITUENT(C) \
(is_valid_unibyte_character (C) && (isalnum (C) || (C) == '_'))
@@ -974,9 +974,9 @@ parse_bracket_exp (void)
char str[BRACKET_BUFFER_SIZE];
FETCH_WC (c1, wc1, _("unbalanced ["));
- /* If pattern contains `[[:', `[[.', or `[[='. */
+ /* If pattern contains '[[:', '[[.', or '[[='. */
if (c1 == ':'
- /* TODO: handle `[[.' and `[[=' also for MB_CUR_MAX == 1. */
+ /* TODO: handle '[[.' and '[[=' also for MB_CUR_MAX == 1. */
|| (MB_CUR_MAX > 1 && (c1 == '.' || c1 == '=')))
{
size_t len = 0;
@@ -3053,11 +3053,11 @@ charset_matched:
return match ? match_len : 0;
}
-/* Check each of `d->states[s].mbps.elem' can match or not. Then return the
- array which corresponds to `d->states[s].mbps.elem' and each element of
+/* Check each of 'd->states[s].mbps.elem' can match or not. Then return the
+ array which corresponds to 'd->states[s].mbps.elem' and each element of
the array contains the amount of the bytes with which the element can
match.
- `idx' is the index from the buf_begin, and it is the current position
+ 'idx' is the index from the buf_begin, and it is the current position
in the buffer.
Caller MUST free the array which this function return. */
static int *
@@ -3086,11 +3086,11 @@ check_matching_with_multibyte_ops (struct dfa *d,
state_num s, size_t idx)
}
/* Consume a single character and enumerate all of the positions which can
- be next position from the state `s'.
- `match_lens' is the input. It can be NULL, but it can also be the output
+ be next position from the state 's'.
+ 'match_lens' is the input. It can be NULL, but it can also be the output
of check_matching_with_multibyte_ops() for optimization.
- `mbclen' and `pps' are the output. `mbclen' is the length of the
- character consumed, and `pps' is the set this function enumerate. */
+ 'mbclen' and 'pps' are the output. 'mbclen' is the length of the
+ character consumed, and 'pps' is the set this function enumerate. */
static status_transit_state
transit_state_consume_1char (struct dfa *d, state_num s,
unsigned char const **pp,
@@ -3106,15 +3106,15 @@ transit_state_consume_1char (struct dfa *d, state_num s,
to which p points. */
*mbclen = (mblen_buf[*pp - buf_begin] == 0) ? 1 : mblen_buf[*pp - buf_begin];
- /* Calculate the state which can be reached from the state `s' by
- consuming `*mbclen' single bytes from the buffer. */
+ /* Calculate the state which can be reached from the state 's' by
+ consuming '*mbclen' single bytes from the buffer. */
s1 = s;
for (k = 0; k < *mbclen; k++)
{
s2 = s1;
rs = transit_state_singlebyte (d, s2, (*pp)++, &s1);
}
- /* Copy the positions contained by `s1' to the set `pps'. */
+ /* Copy the positions contained by 's1' to the set 'pps'. */
copy (&(d->states[s1].elems), pps);
/* Check (input) match_lens, and initialize if it is NULL. */
@@ -3123,7 +3123,7 @@ transit_state_consume_1char (struct dfa *d, state_num s,
else
work_mbls = match_lens;
- /* Add all of the positions which can be reached from `s' by consuming
+ /* Add all of the positions which can be reached from 's' by consuming
a single character. */
for (i = 0; i < d->states[s].mbps.nelem; i++)
{
@@ -3190,10 +3190,10 @@ transit_state (struct dfa *d, state_num s, unsigned
char const **pp)
/* This state has some operators which can match a multibyte character. */
alloc_position_set (&follows, d->nleaves);
- /* `maxlen' may be longer than the length of a character, because it may
+ /* 'maxlen' may be longer than the length of a character, because it may
not be a character but a (multi character) collating element.
- We enumerate all of the positions which `s' can reach by consuming
- `maxlen' bytes. */
+ We enumerate all of the positions which 's' can reach by consuming
+ 'maxlen' bytes. */
transit_state_consume_1char (d, s, pp, match_lens, &mbclen, &follows);
wc = inputwcs[*pp - mbclen - buf_begin];
diff --git a/src/dosbuf.c b/src/dosbuf.c
index bcbef16..fd3749b 100644
--- a/src/dosbuf.c
+++ b/src/dosbuf.c
@@ -175,7 +175,7 @@ dossified_pos (off_t byteno)
/* Optimization: usually the file will be scanned sequentially.
So in most cases, this byte position will be found in the
- table near the previous one, as recorded in `out_map_idx'. */
+ table near the previous one, as recorded in 'out_map_idx'. */
pos_lo = dos_pos_map[out_map_idx-1].pos;
pos_hi = dos_pos_map[out_map_idx].pos;
diff --git a/src/main.c b/src/main.c
index b91a042..bc9177e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1533,15 +1533,15 @@ Output control:\n\
-o, --only-matching show only the part of a line matching PATTERN\n\
-q, --quiet, --silent suppress all normal output\n\
--binary-files=TYPE assume that binary files are TYPE;\n\
- TYPE is `binary', `text', or `without-match'\n\
+ TYPE is 'binary', 'text', or 'without-match'\n\
-a, --text equivalent to --binary-files=text\n\
"));
printf (_("\
-I equivalent to --binary-files=without-match\n\
-d, --directories=ACTION how to handle directories;\n\
- ACTION is `read', `recurse', or `skip'\n\
+ ACTION is 'read', 'recurse', or 'skip'\n\
-D, --devices=ACTION how to handle devices, FIFOs and sockets;\n\
- ACTION is `read' or `skip'\n\
+ ACTION is 'read' or 'skip'\n\
-r, --recursive like --directories=recurse\n\
-R, --dereference-recursive likewise, but follow all symlinks\n\
"));
@@ -1568,7 +1568,7 @@ Context control:\n\
-NUM same as --context=NUM\n\
--color[=WHEN],\n\
--colour[=WHEN] use markers to highlight the matching strings;\n\
- WHEN is `always', `never', or `auto'\n\
+ WHEN is 'always', 'never', or 'auto'\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\
diff --git a/tests/backref b/tests/backref
index d8c75be..bd7cd02 100755
--- a/tests/backref
+++ b/tests/backref
@@ -18,8 +18,8 @@ if test $? -ne 0 ; then
failures=1
fi
-# hit hard with the `Bond' tests
-# For now, remove the `?' in the last parentheses, so that new glibc can do
it. --Stepan
+# hit hard with the 'Bond' tests
+# For now, remove the '?' in the last parentheses, so that new glibc can do
it. --Stepan
echo "civic" | grep -E -e
'^(.?)(.?)(.?)(.?)(.?)(.?)(.?)(.?)(.).?\9\8\7\6\5\4\3\2\1$' > /dev/null 2>&1
if test $? -ne 0 ; then
echo "Options: Bond, test #2 failed"
diff --git a/tests/help-version b/tests/help-version
index b12e3dc..65ab3e2 100755
--- a/tests/help-version
+++ b/tests/help-version
@@ -74,7 +74,7 @@ test "x$v" = "x$VERSION" \
for lang in C fr da; do
for i in $built_programs; do
- # Skip `test'; it doesn't accept --help or --version.
+ # Skip 'test'; it doesn't accept --help or --version.
test $i = test && continue;
# false fails even when invoked with --help or --version.
@@ -84,7 +84,7 @@ for lang in C fr da; do
continue
fi
- # The just-built install executable is always named `ginstall'.
+ # The just-built install executable is always named 'ginstall'.
test $i = install && i=ginstall
# Make sure they exit successfully, under normal conditions.
@@ -95,7 +95,7 @@ for lang in C fr da; do
grep "$PACKAGE_BUGREPORT" h-$i > /dev/null || fail=1
rm -f h-$i
- # Make sure they fail upon `disk full' error.
+ # Make sure they fail upon 'disk full' error.
if test -w /dev/full && test -c /dev/full; then
env $i --help >/dev/full 2>/dev/null && fail=1
env $i --version >/dev/full 2>/dev/null && fail=1
@@ -107,7 +107,7 @@ for lang in C fr da; do
: # ok
else
fail=1
- echo "*** $i: bad exit status \`$status' (expected $expected)," 1>&2
+ echo "*** $i: bad exit status '$status' (expected $expected)," 1>&2
echo " with --help or --version output redirected to /dev/full" 1>&2
fi
fi
@@ -139,7 +139,7 @@ chown_setup () { args=--version; }
mkfifo_setup () { args=--version; }
mknod_setup () { args=--version; }
# Punt on uptime, since it fails (e.g., failing to get boot time)
-# on some systems, and we shouldn't let that stop `make check'.
+# on some systems, and we shouldn't let that stop 'make check'.
uptime_setup () { args=--version; }
# Create a file in the current directory, not in $TMPDIR.
@@ -197,7 +197,7 @@ basename_setup () { args=$tmp_in; }
dirname_setup () { args=$tmp_in; }
expr_setup () { args=foo; }
-# Punt, in case GNU `id' hasn't been installed yet.
+# Punt, in case GNU 'id' hasn't been installed yet.
groups_setup () { args=--version; }
pathchk_setup () { args=$tmp_in; }
diff --git a/tests/tests b/tests/tests
index 6f2545f..244e5c8 100644
--- a/tests/tests
+++ b/tests/tests
@@ -19,8 +19,8 @@
# no match for that one. In both the fourth and fifth fields, a (sub)field
# starting with @ indicates that the (sub)expression is expected to match
# a null string followed by the stuff after the @; this provides a way to
-# test where null strings match. The character `N' in REs and strings
-# is newline, `S' is space, `T' is tab, `Z' is NUL.
+# test where null strings match. The character 'N' in REs and strings
+# is newline, 'S' is space, 'T' is tab, 'Z' is NUL.
#
# The full list of flags:
# - placeholder, does nothing
-----------------------------------------------------------------------
Summary of changes:
ChangeLog-2009 | 84 ++++++++++++++++++++++++++--------------------------
HACKING | 4 +-
NEWS | 42 +++++++++++++-------------
README-hacking | 2 +-
cfg.mk | 4 +-
configure.ac | 2 +-
doc/grep.texi | 2 +-
lib/colorize-w32.c | 2 +-
m4/pcre.m4 | 3 +-
src/Makefile.am | 2 +-
src/dfa.c | 36 +++++++++++-----------
src/dosbuf.c | 2 +-
src/main.c | 8 ++--
tests/backref | 4 +-
tests/help-version | 12 ++++----
tests/tests | 4 +-
16 files changed, 107 insertions(+), 106 deletions(-)
hooks/post-receive
--
grep
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- grep branch, master, updated. v2.12-11-g6c4a43a,
Paul Eggert <=