diff options
| author | Jim Meyering <meyering@fb.com> | 2014-09-06 10:42:25 -0700 |
|---|---|---|
| committer | Jim Meyering <meyering@fb.com> | 2014-11-30 18:59:32 -0800 |
| commit | d0c7a7dc82cf80af2d831f82deea1e29faf92e86 (patch) | |
| tree | e8f7b97f308b9e16fe9a8385c05b7de66f8464e0 | |
| parent | f147efc9ef8274a397b9321b62ee4d9cb28609b8 (diff) | |
| download | sed-d0c7a7dc82cf80af2d831f82deea1e29faf92e86.tar.gz | |
maint: remove all trailing white space
First, run this command:
git grep -l ' $'|xargs perl -pi -e 's/[ \t]+$//'
Then some minor fix-up to make the two newly-failing tests
pass once again:
* testsuite/mac-mf.sed: Append this, s/ $//,
to eliminate trailing spaces in the actual output.
* testsuite/y-newline.good: Manually remove a trailing
space between two concatenated prompts.
45 files changed, 506 insertions, 493 deletions
@@ -9,8 +9,8 @@ include in the Subject: header the first line of the output of Please do not send a bug report like this: - [while building frobme-1.3.4] - $ configure + [while building frobme-1.3.4] + $ configure sed: file sedscr line 1: Unknown option to 's' If sed doesn't configure your favorite package, take a few extra @@ -77,7 +77,7 @@ modification follow. "Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. - + "The Program" refers to any copyrightable work licensed under this License. Each licensee is addressed as "you". "Licensees" and "recipients" may be individuals or organizations. @@ -510,7 +510,7 @@ actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid. - + If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties diff --git a/COPYING.DOC b/COPYING.DOC index 2f7e03c..ea854f0 100644 --- a/COPYING.DOC +++ b/COPYING.DOC @@ -401,19 +401,19 @@ public wiki that anybody can edit is an example of such a server. A "Massive Multiauthor Collaboration" (or "MMC") contained in the site means any set of copyrightable works thus published on the MMC site. -"CC-BY-SA" means the Creative Commons Attribution-Share Alike 3.0 -license published by Creative Commons Corporation, a not-for-profit -corporation with a principal place of business in San Francisco, -California, as well as future copyleft versions of that license +"CC-BY-SA" means the Creative Commons Attribution-Share Alike 3.0 +license published by Creative Commons Corporation, a not-for-profit +corporation with a principal place of business in San Francisco, +California, as well as future copyleft versions of that license published by that same organization. -"Incorporate" means to publish or republish a Document, in whole or in +"Incorporate" means to publish or republish a Document, in whole or in part, as part of another Document. -An MMC is "eligible for relicensing" if it is licensed under this -License, and if all works that were first published under this License -somewhere other than this MMC, and subsequently incorporated in whole or -in part into the MMC, (1) had no cover texts or invariant sections, and +An MMC is "eligible for relicensing" if it is licensed under this +License, and if all works that were first published under this License +somewhere other than this MMC, and subsequently incorporated in whole or +in part into the MMC, (1) had no cover texts or invariant sections, and (2) were thus incorporated prior to November 1, 2008. The operator of an MMC Site may republish an MMC contained in the site diff --git a/ChangeLog-2014 b/ChangeLog-2014 index 7ad0bc7..a7a4270 100644 --- a/ChangeLog-2014 +++ b/ChangeLog-2014 @@ -1,5 +1,17 @@ 2014-09-06 Jim Meyering <meyering@fb.com> + maint: remove all trailing white space + First, run this command: + git grep -l ' $'|xargs perl -pi -e 's/[ \t]+$//' + Then some minor fix-up to make the two newly-failing tests + pass once again: + * testsuite/mac-mf.sed: Append this, s/ $//, + to eliminate trailing spaces in the actual output. + * testsuite/y-newline.good: Manually remove a trailing + space between two concatenated prompts. + +2014-09-06 Jim Meyering <meyering@fb.com> + fixup: add the properly-named new test files * testsuite/Makefile.am (EXTRA_DIST): Add y-zero.*, not y-NUL.* here. @@ -502,7 +514,7 @@ * testsuite/Makefile.am: Do not distribute it. 2009-04-27 Paolo Bonzini <bonzini@gnu.org> - + * autoboot.conf: Add rename. * gnulib: Update. @@ -794,7 +806,7 @@ * sed/utils.c: Include pathmax. * sed/mbcs.c: Use local_charset. * sed/execute.c: Copy with padding after the mbstate_t member. - + 2006-12-21 Paolo Bonzini <bonzini@gnu.org> * sed/mbcs.c: Include string.h (reported by Henning Nielsen Lund). @@ -900,7 +912,7 @@ 2005-05-16 Eero Hakkinen <eero17@bigfoot.com> - * sed/compile.c (snarf_char_class): Fix handling of + * sed/compile.c (snarf_char_class): Fix handling of [^]xyz]. 2005-04-04 Paolo Bonzini <bonzini@gnu.org> @@ -1054,6 +1066,12 @@ (closedown): Use ck_rename. (open_next_file): Use ck_mkstemp. +2004-01-17 Paolo Bonzini <bonzini@gnu.org> + + * sed/sed.h: Do not include wchar.h and wctype.h, and do + not include the alloca stuff. + * basicdefs.h: Move all that here. + 2004-01-20 Paolo Bonzini <bonzini@gnu.org> * sed/sed.h (enum addr_state): New definition. @@ -1072,12 +1090,6 @@ (struct input): New field "reset_at_next_file". (read_pattern_space): Use it instead of "separate_files". (process_files): Initialize it. - -2004-01-17 Paolo Bonzini <bonzini@gnu.org> - - * sed/sed.h: Do not include wchar.h and wctype.h, and do - not include the alloca stuff. - * basicdefs.h: Move all that here. 2004-01-15 Paolo Bonzini <bonzini@gnu.org> @@ -1224,7 +1236,7 @@ do_subst (do_subst): Don't update count when a match was skipped. - * testsuite/xbxcx3.good, testsuite/xbxcx3.sed, + * testsuite/xbxcx3.good, testsuite/xbxcx3.sed, testsuite/xbxcx3.inp: Regression tests 2003-03-23 Paolo Bonzini <bonzini@gnu.org> @@ -1426,19 +1438,12 @@ * src/compile.c (compile_program): Implement W * src/execute.c (execute_program): Likewise -2002-04-23 Paolo Bonzini <bonzini@gnu.org> +2002-02-14 Paolo Bonzini <bonzini@gnu.org> + + * src/execute.c (str_append_modified): Fixed a stupid + bug (stop condition was *start == *end, meant to be + start == end) - * src/sed.c (usage, main): Parse -s - * src/sed.h (separate_files): New variable - * src/execute.c (separate_files): New variable - * src/execute.c (reset_addresses): New function to make range - addresses work separately on each file when using in-place - editing - * src/execute.c (execute_program): The `n' and `N' use test_eof - so that the script restarts at end of file, not at end of input - * src/execute.c (test_dollar_EOF): Make $ work separately - on each file when using -s; renamed to test_eof - 2002-02-28 Paolo Bonzini <bonzini@gnu.org> * src/sed.h (struct sed_cmd): exit_status -> int_arg @@ -1455,12 +1460,19 @@ * src/fmt.c: New file, looted from GNU textutils * src/compile.c: Parse `L' * src/execute.c: Execute `L' - -2002-02-14 Paolo Bonzini <bonzini@gnu.org> - * src/execute.c (str_append_modified): Fixed a stupid - bug (stop condition was *start == *end, meant to be - start == end) +2002-04-23 Paolo Bonzini <bonzini@gnu.org> + + * src/sed.c (usage, main): Parse -s + * src/sed.h (separate_files): New variable + * src/execute.c (separate_files): New variable + * src/execute.c (reset_addresses): New function to make range + addresses work separately on each file when using in-place + editing + * src/execute.c (execute_program): The `n' and `N' use test_eof + so that the script restarts at end of file, not at end of input + * src/execute.c (test_dollar_EOF): Make $ work separately + on each file when using -s; renamed to test_eof 2002-02-05 Paolo Bonzini <bonzini@gnu.org> @@ -1481,13 +1493,13 @@ * lib/getline.c: Strip the terminating \r under Windows or MS-DOS. - + * testsuite/xemacs.sed, testsuite/xemacs.inp, testsuite/xemacs.good: Submitted by John Fremlin (john@fremlin.de) 2001-12-27 Paolo Bonzini <bonzini@gnu.org> - + * sed/execute.c (do_subst): Flags in optimized s/^xx/ commands were discarded (see the change below) @@ -1504,7 +1516,7 @@ of the buffer inactive and s/xx$// by truncating it. * sed/execute.c (execute_program): Optimize D by making a part of the buffer inactive - + * testsuite/uniq.sed, testsuite/uniq.inp, testsuite/uniq.good: added to test P and D commands. * testsuite/fasts.sed, testsuite/fasts.inp, testsuite/fasts.good: @@ -1548,7 +1560,7 @@ support in-place editing * sed/main.c (usage, main): Parse -i. * sed/utils.c: Moved to lib directory - + * lib/utils.c (temp_file_template): New function. * sed/utils.h: Declared temp_file_template. @@ -1584,7 +1596,7 @@ regex * sed/regex.c (execute_regex): Track here the last compiled regex - + 2001-03-02 Paolo Bonzini <bonzini@gnu.org> * sed/compile.c (setup_replacement): Support \[lLuUE] like @@ -1605,23 +1617,14 @@ * sed/compile.c (compile_address, compile_program, check_final_program): Callers adjusted -2001-02-08 Paolo Bonzini <bonzini@gnu.org> - - * sed/compile.c (compile_program): Added `Q' (quit without output) - * sed/execute.c (execute_program): Ditto +2001-01-03 Paolo Bonzini <bonzini@gnu.org> - * sed/compile.c (compile_program): Fill in exit_status for `q' and `Q' - * sed/execute.c (execute_program): Return -1 for `go on', 0..255 - to set the exit status - * sed/execute.c (process_files): Interpret new convention for - execute_program, return sed's exit code - * sed/sed.c (main): Return process_files's exit code - * sed/sed.h (struct sed_cmd): Declare exit_status - -2001-01-07 Paolo Bonzini <bonzini@gnu.org> + * sed/compile.c(snarf_char_class) [REG_PERL]: Don't parse + `\n' specially + * sed/compile.c(match_slash) [REG_PERL]: Ditto - * sed/compile.c (compile_program): Added `T' (branch if failed) - * sed/execute.c (shrink_program, execute_program): Ditto + * sed/compile.c(read_text) [REG_PERL]: Support [xX] modifiers + * sed/compile.c(mark_subst_opts) [REG_PERL]: Ditto 2001-01-04 Paolo Bonzini <bonzini@gnu.org> @@ -1636,15 +1639,24 @@ * testsuite/spencer.inp: Removed the ^* test * testsuite/spencer.sh: Don't rely on awk; more comments too - -2001-01-03 Paolo Bonzini <bonzini@gnu.org> - - * sed/compile.c(snarf_char_class) [REG_PERL]: Don't parse - `\n' specially - * sed/compile.c(match_slash) [REG_PERL]: Ditto - * sed/compile.c(read_text) [REG_PERL]: Support [xX] modifiers - * sed/compile.c(mark_subst_opts) [REG_PERL]: Ditto +2001-01-07 Paolo Bonzini <bonzini@gnu.org> + + * sed/compile.c (compile_program): Added `T' (branch if failed) + * sed/execute.c (shrink_program, execute_program): Ditto + +2001-02-08 Paolo Bonzini <bonzini@gnu.org> + + * sed/compile.c (compile_program): Added `Q' (quit without output) + * sed/execute.c (execute_program): Ditto + + * sed/compile.c (compile_program): Fill in exit_status for `q' and `Q' + * sed/execute.c (execute_program): Return -1 for `go on', 0..255 + to set the exit status + * sed/execute.c (process_files): Interpret new convention for + execute_program, return sed's exit code + * sed/sed.c (main): Return process_files's exit code + * sed/sed.h (struct sed_cmd): Declare exit_status 2000-12-21 Paolo Bonzini <bonzini@gnu.org> @@ -1655,7 +1667,7 @@ 2000-12-11 Paolo Bonzini <bonzini@gnu.org> * sed/compile.c(mark_subst_opts): Support [mMsS] flags - * sed/compile.c(read_text): Support [MS] flags for + * sed/compile.c(read_text): Support [MS] flags for addresses * sed/regex.c(compile_regex): Support arbitrary flags for regncomp. @@ -1666,12 +1678,12 @@ 2000-12-08 Paolo Bonzini <bonzini@gnu.org> * basicdefs.h: Moved here from the `sed' subdirectory. - + * configure.in: Removed crap to pick a regex engine. Added snprintf to the AC_REPLACE_FUNCS call. * lib/snprintf.c: New file. - + * sed/regex.c(compile_regex): Use regncomp * sed/regex.c(match_regex): Use regexec2 @@ -1689,7 +1701,7 @@ Mon Aug 30 23:40:08 PDT 1999 Ken Pizzini <ken@gnu.org> *** Version 3.02.80 released - + * sed/execute.c(do_subst): lib/regex.c(re_search_2) seems to want one extra backreference register; humor it. @@ -1708,7 +1720,7 @@ Mon Aug 30 23:40:08 PDT 1999 Ken Pizzini <ken@gnu.org> Thu Aug 19 23:27:54 PDT 1999 Ken Pizzini <ken@gnu.org> - + * sed/sed.h: Add explicit #include of "regex-sed.h" (rather than relying on parent file doing so); change the "cmd_regex" member of sed_cmd: make it a pointer (instead of a struct), @@ -1915,7 +1927,7 @@ Wed Sep 9 22:17:28 PDT 1998 Ken Pizzini <ken@gnu.org> Wed Sep 9 19:28:14 PDT 1998 Ken Pizzini <ken@gnu.org> *** Version 3.02a released - + * sed/compile.c(mark_subst_opts,read_label,compile_program): wherever we accept a ; as a command terminator, also allow a } or a # to appear. (This allows for less cluttered-looking scripts, @@ -2200,14 +2212,14 @@ Mon Aug 3 11:44:55 PDT 1998 Ken Pizzini <ken@gnu.org> Sat Aug 01 17:49:06 PDT 1998 Ken Pizzini <ken@gnu.org> *** Version 3.02 released - + * configure.in: Because of code change in 3.01a, bump the minor revision number for the release (now 3.02). Sun Jul 26 16:07:55 PDT 1998 Ken Pizzini <ken@gnu.org> *** Version 3.01a released - + * sed/compile.c(snarf_char_class): the POSIX char-class recognition loop forgot to update its concept of "prev" as the loop progressed. @@ -2226,7 +2238,7 @@ Sun Jul 26 16:07:55 PDT 1998 Ken Pizzini <ken@gnu.org> Tue Jul 21 06:04:42 PDT 1998 Ken Pizzini <ken@gnu.org> *** Version 3.01 released - + * configure.in: mark as release version! * Makefile.am: add BUGS and THANKS to the EXTRA_DIST target. @@ -2243,7 +2255,7 @@ Mon Jul 20 12:38:10 PDT 1998 Ken Pizzini <ken@gnu.org> Fri Jul 17 00:36:34 PDT 1998 Ken Pizzini <ken@gnu.org> *** Version 3.01-beta18 released - + * djgpp/config.sed: my "tweak" in beta17 was too hastily considered. Back it out. @@ -2252,7 +2264,7 @@ Fri Jul 17 00:36:34 PDT 1998 Ken Pizzini <ken@gnu.org> Wed Jul 15 01:02:15 PDT 1998 Ken Pizzini <ken@gnu.org> *** Version 3.01-beta17 released - + * djgpp/config.sed: tweak/simplify s,,, commands at end. * configure.in: update to beta17. @@ -2272,7 +2284,7 @@ Wed Jul 15 01:02:15 PDT 1998 Ken Pizzini <ken@gnu.org> Thu Jul 9 13:06:00 PDT 1998 16:51:43 PDT 1998 Ken Pizzini <ken@gnu.org> *** Version 3.01-beta16 released - + * djgpp/config.sed: tweak the configure script to use : instead of = for --with-foo=bar option parsing, to work around problems with how command.com handles =s. @@ -2301,7 +2313,7 @@ Wed Jul 8 16:51:43 PDT 1998 Ken Pizzini <ken@gnu.org> Sun Jul 5 21:02:16 PDT 1998 Ken Pizzini <ken@gnu.org> *** Version 3.01-beta15 released - + * sed/utils.c(ck_fflush), sed/utils.h, sed/execute.c(output_line): add and use new ck_fflush() function. @@ -2327,7 +2339,7 @@ Sun Jul 5 14:29:45 PDT 1998 Ken Pizzini <ken@gnu.org> Sat Jul 4 09:54:45 PDT 1998 Ken Pizzini <ken@gnu.org> *** Version 3.01-beta14 released - + * sed/basicdefs.h, sed/compile.c, sed/execute.c: per report by "Kaveh R. Ghazi" <ghazi@caip.rutgers.edu>, copied the ISXXX macros from lib/regex.c so that @@ -2340,7 +2352,7 @@ Sat Jul 4 09:54:45 PDT 1998 Ken Pizzini <ken@gnu.org> Thu Jul 2 23:46:13 PDT 1998 Ken Pizzini <ken@gnu.org> *** Version 3.01-beta13 released - + * configure.in, acconfig.h: set USE_REGEX_GNU_H symbol if we are going to be using lib/regex.c. @@ -2389,7 +2401,7 @@ Thu Jul 2 17:22:31 PDT 1998 Ken Pizzini <ken@gnu.org> Sun Jun 28 16:21:02 PDT 1998 Ken Pizzini <ken@gnu.org> *** Version 3.01-beta12 released - + * doc/sed.texi: Avoid mixing @code and @samp markups together: they look ugly in Info. Use @url and @email instead of @example. Add indexes. (Basis of changes contributed by Eli Zaretskii.) @@ -2411,7 +2423,7 @@ Sun Jun 28 16:21:02 PDT 1998 Ken Pizzini <ken@gnu.org> Fri Jun 12 16:41:48 PDT 1998 Ken Pizzini <ken@gnu.org> *** Version 3.01-beta11 released - + * sed/compile.c: add module-static variables first_script (for #n change below) and pending_text (for a/c/i change below). @@ -2455,7 +2467,7 @@ Fri Jun 5 04:40:24 PDT 1998 Ken Pizzini <ken@gnu.org> Fri Jun 5 00:54:25 PDT 1998 Ken Pizzini <ken@gnu.org> *** Version 3.01-beta10 released - + * sed/execute.c: forgot to P_() the prototype and old-style the declaration for bootstrap_memchr()! @@ -2522,7 +2534,7 @@ Tue Jun 2 08:41:05 PDT 1998 Ken Pizzini <ken@gnu.org> Sat May 30 17:28:00 PDT 1998 Ken Pizzini <ken@gnu.org> *** Version 3.01-beta9 released - + * Makefile.am: make testsuite a normal SUBDIR. * configure.in: discontinue using AC_ISC_POSIX -- @@ -2581,7 +2593,7 @@ Fri May 29 12:07:38 PDT 1998 Ken Pizzini <ken@gnu.org> Sat May 23 20:04:31 HST 1998 Ken Pizzini <ken@gnu.org> *** Version 3.01-beta8 released - + * sed/compile.c(compile_regex): forgot to make last_re be a *copy* of the buffered text in today's earlier fix. @@ -2601,7 +2613,7 @@ Sat May 23 18:07:18 HST 1998 Ken Pizzini <ken@gnu.org> Sat May 23 16:07:09 HST 1998 Ken Pizzini <ken@gnu.org> *** Version 3.01-beta7 released - + * sed/execute.c: #undef'd EXPERIMENTAL_DASH_N_OPTIMIZATION because its code is buggy. @@ -2624,7 +2636,7 @@ Sat May 16 23:16:26 HST 1998 Ken Pizzini <ken@gnu.org> Wed May 13 21:44:28 PDT 1998 Ken Pizzini <ken@gnu.org> *** Version 3.01-beta6 released - + * lib/Makefile.am: fix spelling of libsed_a_LIBADD in libsed_a_DEPENDENCIES. @@ -2633,7 +2645,7 @@ Wed May 13 21:44:28 PDT 1998 Ken Pizzini <ken@gnu.org> Wed May 13 14:38:08 PDT 1998 Ken Pizzini <ken@gnu.org> *** Version 3.01-beta5 released - + * sed/execute.c(do_subst): added not_bol_p variable to track when we have iterated past the beginning of the pattern. [Thanks to Jim Meyering <meyering@ascend.com> for the bug report.] @@ -2655,7 +2667,7 @@ Wed May 13 13:54:04 PDT 1998 Ken Pizzini <ken@gnu.org> Wed May 13 06:39:06 PDT 1998 Ken Pizzini <ken@gnu.org> *** Version 3.01-beta4 released - + * rename writeout.good? to wrtout?.good and subwrite.good? to subwrt?.good to comply with DOS 8+3 file name restrictions. [Eli Zaretskii <eliz@is.elta.co.il> suggested this to @@ -2693,9 +2705,9 @@ Tue May 12 10:02:37 PDT 1998 Ken Pizzini <ken@gnu.org> * testsuite/version.good: updated for new version identifier. Mon May 11 18:50:56 PDT 1998 Ken Pizzini <ken@gnu.org> - + *** Version 3.01-beta3 released - + * sed/Makefile.am: fix INCLUDES to work right with VPATH. [Thanks to Jim Meyering <meyering@ascend.com> for the bug report.] @@ -2712,7 +2724,7 @@ Mon May 11 18:50:56 PDT 1998 Ken Pizzini <ken@gnu.org> Sat May 9 22:35:45 PDT 1998 Ken Pizzini <ken@gnu.org> *** Version 3.01-beta2 released - + * sed/sed.c: add #include <sys/types.h> in HAVE_MMAP block (needed on some machines). @@ -2775,7 +2787,7 @@ Sat May 9 21:29:00 PDT 1998 Ken Pizzini <ken@gnu.org> Fri May 8 15:08:28 PDT 1998 Ken Pizzini <ken@gnu.org> *** Version 3.01-beta1 released - + * sed/sed.c (main, usage): once again tweak the --help and --version output to bettery comply with GNU coding standards. @@ -3178,7 +3190,7 @@ Sun Jul 13 00:46:48 PDT 1997 Ken Pizzini <ken@gnu.org> Sat Dec 30 20:16:59 1995 Tom Lord <lord@beehive> *** Version 3.00 released - + * sed.c: Use posix entry points to regexp functions. Fix enough bugs to pass the test-suite. @@ -3190,7 +3202,7 @@ Sat Dec 30 20:16:59 1995 Tom Lord <lord@beehive> Wed May 11 07:46:24 1994 Chip Salzenberg (chip@fin.uucp) *** Version 2.05 released - + * sed.c (compile_address): Recognize numeric addresses. Fixes typo made during installation of "~" feature. @@ -3248,7 +3260,7 @@ Mon Oct 11 21:06:10 1993 Tom Lord (lord@cygnus.com) Sat Aug 7 01:04:59 1993 Tom Lord (lord@unix7.andrew.cmu.edu) *** Version 2.03 released - + * sed.c (compile_regex): report error messages for bogus regexps. diff --git a/Makefile.am b/Makefile.am index 184e591..e519a86 100644 --- a/Makefile.am +++ b/Makefile.am @@ -41,7 +41,7 @@ html: cd doc && make html DISTCHECK_CONFIGURE_FLAGS = XGETTEXT='$(SHELL) -c : dummy' $(EXTRA_DC_FLAGS) -EXTRA_DC_FLAGS = +EXTRA_DC_FLAGS = full-distcheck: make distcheck EXTRA_DC_FLAGS='--enable-regex-tests' @@ -1,6 +1,6 @@ This is the GNU implementation of sed, the Unix stream editor. -See the NEWS file for a brief summary and the ChangeLog for +See the NEWS file for a brief summary and the ChangeLog for more detailed descriptions of changes. See the file INSTALL for generic compilation and installation diff --git a/build-aux/help2man b/build-aux/help2man index af57f41..9c7851c 100755 --- a/build-aux/help2man +++ b/build-aux/help2man @@ -527,7 +527,7 @@ for (@pre, (grep ! /^($filter)$/o, @include), @post) { my $quote = /\W/ ? '"' : ''; print ".SH $quote$_$quote\n"; - + for ($include{$_}) { # Replace leading dot, apostrophe and backslash tokens. diff --git a/configure.ac b/configure.ac index d838514..1122a72 100644 --- a/configure.ac +++ b/configure.ac @@ -88,7 +88,7 @@ if test "x$enable_i18n" = xno; then ac_cv_func_wcscoll=no fi -AC_ARG_ENABLE(regex-tests, +AC_ARG_ENABLE(regex-tests, [ --enable-regex-tests enable regex matcher regression tests (default=yes)], [if test "x$with_included_regex" = xno; then enable_regex_tests=no diff --git a/doc/Makefile.am b/doc/Makefile.am index af6975c..cfba12f 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -27,7 +27,7 @@ $(srcdir)/s-texi: sed-in.texi $(srcdir)/groupify.sed sed.1: $(top_srcdir)/sed/sed.c $(top_srcdir)/configure.ac $(srcdir)/sed.x $(HELP2MAN) --name "stream editor for filtering and transforming text" \ - -p sed --include $(srcdir)/sed.x -o $(srcdir)/sed.1 $(SED) + -p sed --include $(srcdir)/sed.x -o $(srcdir)/sed.1 $(SED) dist-hook: touch $(distdir)/sed.1 diff --git a/doc/sed-in.texi b/doc/sed-in.texi index 1ed602f..772a138 100644 --- a/doc/sed-in.texi +++ b/doc/sed-in.texi @@ -4,7 +4,7 @@ @c (nothing!) @c -------------------------------------------------------------------------- @c Check for consistency: regexps in @code, text that they match in @samp. -@c +@c @c Tips: @c @command for command @c @samp for command fragments: @samp{cat -s} @@ -730,19 +730,19 @@ Matches between @var{i} and @var{j}, inclusive, sequences. Matches more than or equal to @var{i} sequences. @item \(@var{regexp}\) -Groups the inner @var{regexp} as a whole, this is used to: +Groups the inner @var{regexp} as a whole, this is used to: @itemize @bullet @item @cindex @acronym{GNU} extensions, to basic regular expressions Apply postfix operators, like @code{\(abcd\)*}: -this will search for zero or more whole sequences +this will search for zero or more whole sequences of @samp{abcd}, while @code{abcd*} would search for @samp{abc} followed by zero or more occurrences of @samp{d}. Note that support for @code{\(abcd\)*} is required by @acronym{POSIX} 1003.1-2001, but many non-@acronym{GNU} implementations do not support it and hence it is not universally -portable. +portable. @item Use back references (see below). @@ -852,7 +852,7 @@ Matches @samp{abcdef}. @item a*b Matches zero or more @samp{a}s followed by a single -@samp{b}. For example, @samp{b} or @samp{aaaaab}. +@samp{b}. For example, @samp{b} or @samp{aaaaab}. @item a\?b Matches @samp{b} or @samp{ab}. @@ -1825,7 +1825,7 @@ seen a script converting the output of @command{date} into a @command{bc} program! The main body of this is the @command{sed} script, which remaps the name -from lower to upper (or vice-versa) and even checks out +from lower to upper (or vice-versa) and even checks out if the remapped name is the same as the original name. Note how the script is parameterized using shell variables and proper quoting. @@ -1833,11 +1833,11 @@ variables and proper quoting. @c start------------------------------------------- @example #! /bin/sh -# rename files to lower/upper case... +# rename files to lower/upper case... # -# usage: -# move-to-lower * -# move-to-upper * +# usage: +# move-to-lower * +# move-to-upper * # or # move-to-lower -R . # move-to-upper -R . @@ -1868,7 +1868,7 @@ files_only= while : do - case "$1" in + case "$1" in -n) apply_cmd='cat' ;; -R) finder='find "$@@" -type f';; -h) help ; exit 1 ;; @@ -2559,7 +2559,7 @@ the script automatically at the end of a line. p # get next n -# got chars? print it again, etc... +# got chars? print it again, etc... /./bx # no, don't have chars: got an empty line @@ -2707,7 +2707,7 @@ Please do not send a bug report like this: @example @i{@i{@r{while building frobme-1.3.4}}} -$ configure +$ configure @error{} sed: file sedscr line 1: Unknown option to 's' @end example @@ -2943,7 +2943,7 @@ Summarizing, we have: A backslash can introduce several special sequences @item -The circumflex, dollar sign, and period characters behave specially +The circumflex, dollar sign, and period characters behave specially with regard to new lines @item @@ -3010,7 +3010,7 @@ group. @appendixsec Backslash @cindex Perl-style regular expressions, escaped sequences -There are a few difference in the handling of backslashed +There are a few difference in the handling of backslashed sequences in Perl mode. First of all, there are no @code{\o} and @code{\d} sequences. @@ -3058,8 +3058,8 @@ stand for themselves. For example: Note that octal values of 100 or greater must not be introduced by a leading zero, because no more than three octal -digits are ever read. Note that this applies only to the LHS -pattern; it is not possible yet to specify more than 9 backreferences +digits are ever read. Note that this applies only to the LHS +pattern; it is not possible yet to specify more than 9 backreferences on the RHS of the `s' command. All the sequences that define a single byte value can be @@ -3717,8 +3717,8 @@ reference. If the @code{X} modifier option is set, this can be whitespace. Otherwise an empty comment can be used, or the following character can be expressed in hexadecimal or octal. Note that this applies only to the LHS pattern; it is -not possible yet to specify more than 9 backreferences on the -RHS of the `s' command. +not possible yet to specify more than 9 backreferences on the +RHS of the `s' command. A back reference that occurs inside the parentheses to which it refers fails when the subpattern is first used, so, for @@ -3867,7 +3867,7 @@ This time the first assertion looks at the preceding six characters, checking that the first three are digits, and then the second assertion checks that the preceding three characters are not @samp{999}. Actually, assertions can be -nested in any combination, so one can write this as +nested in any combination, so one can write this as @example (?<=\d@{3@}(?!999)...)foo @@ -4089,7 +4089,7 @@ The condition is a positive lookahead assertion that matches a letter that is three characters away from the current point. If a letter is found, the subject is matched against the first alternative @samp{@var{dd}-@var{aaa}-@var{dd}} (where @var{aaa} are -letters and @var{dd} are digits); otherwise it is matched against +letters and @var{dd} are digits); otherwise it is matched against the second alternative, @samp{@var{dd}-@var{dd}-@var{dd}}. diff --git a/doc/sed.texi b/doc/sed.texi index 6f1ce01..3cf4756 100644 --- a/doc/sed.texi +++ b/doc/sed.texi @@ -5,7 +5,7 @@ @c (nothing!) @c -------------------------------------------------------------------------- @c Check for consistency: regexps in @code, text that they match in @samp. -@c +@c @c Tips: @c @command for command @c @samp for command fragments: @samp{cat -s} @@ -731,19 +731,19 @@ Matches between @var{i} and @var{j}, inclusive, sequences. Matches more than or equal to @var{i} sequences. @item \(@var{regexp}\) -Groups the inner @var{regexp} as a whole, this is used to: +Groups the inner @var{regexp} as a whole, this is used to: @itemize @bullet @item @cindex @acronym{GNU} extensions, to basic regular expressions Apply postfix operators, like @code{\(abcd\)*}: -this will search for zero or more whole sequences +this will search for zero or more whole sequences of @samp{abcd}, while @code{abcd*} would search for @samp{abc} followed by zero or more occurrences of @samp{d}. Note that support for @code{\(abcd\)*} is required by @acronym{POSIX} 1003.1-2001, but many non-@acronym{GNU} implementations do not support it and hence it is not universally -portable. +portable. @item Use back references (see below). @@ -808,11 +808,11 @@ symbols, equivalence classes, and character classes, respectively, and @item @var{regexp1}\|@var{regexp2} @cindex @acronym{GNU} extensions, to basic regular expressions -Matches either @var{regexp1} or @var{regexp2}. Use escaped -parentheses to use complex alternative regular expressions. The -matching process tries each alternative in turn, from left to right, -and the first one that succeeds is used. It is a @acronym{GNU} -extension. +Matches either @var{regexp1} or @var{regexp2}. Use +parentheses to use complex alternative regular expressions. +The matching process tries each alternative in turn, from +left to right, and the first one that succeeds is used. +It is a @acronym{GNU} extension. @item @var{regexp1}@var{regexp2} Matches the concatenation of @var{regexp1} and @var{regexp2}. @@ -853,7 +853,7 @@ Matches @samp{abcdef}. @item a*b Matches zero or more @samp{a}s followed by a single -@samp{b}. For example, @samp{b} or @samp{aaaaab}. +@samp{b}. For example, @samp{b} or @samp{aaaaab}. @item a\?b Matches @samp{b} or @samp{ab}. @@ -1844,7 +1844,7 @@ seen a script converting the output of @command{date} into a @command{bc} program! The main body of this is the @command{sed} script, which remaps the name -from lower to upper (or vice-versa) and even checks out +from lower to upper (or vice-versa) and even checks out if the remapped name is the same as the original name. Note how the script is parameterized using shell variables and proper quoting. @@ -1853,11 +1853,11 @@ variables and proper quoting. @example @group #! /bin/sh -# rename files to lower/upper case... +# rename files to lower/upper case... # -# usage: -# move-to-lower * -# move-to-upper * +# usage: +# move-to-lower * +# move-to-upper * # or # move-to-lower -R . # move-to-upper -R . @@ -1900,7 +1900,7 @@ files_only= @group while : do - case "$1" in + case "$1" in -n) apply_cmd='cat' ;; -R) finder='find "$@@" -type f';; -h) help ; exit 1 ;; @@ -2723,7 +2723,7 @@ the script automatically at the end of a line. p # get next n -# got chars? print it again, etc... +# got chars? print it again, etc... /./bx @end group @@ -2876,7 +2876,7 @@ Please do not send a bug report like this: @example @i{@i{@r{while building frobme-1.3.4}}} -$ configure +$ configure @error{} sed: file sedscr line 1: Unknown option to 's' @end example @@ -3112,7 +3112,7 @@ Summarizing, we have: A backslash can introduce several special sequences @item -The circumflex, dollar sign, and period characters behave specially +The circumflex, dollar sign, and period characters behave specially with regard to new lines @item @@ -3179,7 +3179,7 @@ group. @appendixsec Backslash @cindex Perl-style regular expressions, escaped sequences -There are a few difference in the handling of backslashed +There are a few difference in the handling of backslashed sequences in Perl mode. First of all, there are no @code{\o} and @code{\d} sequences. @@ -3227,8 +3227,8 @@ stand for themselves. For example: Note that octal values of 100 or greater must not be introduced by a leading zero, because no more than three octal -digits are ever read. Note that this applies only to the LHS -pattern; it is not possible yet to specify more than 9 backreferences +digits are ever read. Note that this applies only to the LHS +pattern; it is not possible yet to specify more than 9 backreferences on the RHS of the `s' command. All the sequences that define a single byte value can be @@ -3886,8 +3886,8 @@ reference. If the @code{X} modifier option is set, this can be whitespace. Otherwise an empty comment can be used, or the following character can be expressed in hexadecimal or octal. Note that this applies only to the LHS pattern; it is -not possible yet to specify more than 9 backreferences on the -RHS of the `s' command. +not possible yet to specify more than 9 backreferences on the +RHS of the `s' command. A back reference that occurs inside the parentheses to which it refers fails when the subpattern is first used, so, for @@ -4036,7 +4036,7 @@ This time the first assertion looks at the preceding six characters, checking that the first three are digits, and then the second assertion checks that the preceding three characters are not @samp{999}. Actually, assertions can be -nested in any combination, so one can write this as +nested in any combination, so one can write this as @example (?<=\d@{3@}(?!999)...)foo @@ -4258,7 +4258,7 @@ The condition is a positive lookahead assertion that matches a letter that is three characters away from the current point. If a letter is found, the subject is matched against the first alternative @samp{@var{dd}-@var{aaa}-@var{dd}} (where @var{aaa} are -letters and @var{dd} are digits); otherwise it is matched against +letters and @var{dd} are digits); otherwise it is matched against the second alternative, @samp{@var{dd}-@var{dd}-@var{dd}}. diff --git a/po/ChangeLog-2014 b/po/ChangeLog-2014 index 0042d6f..1f6a092 100644 --- a/po/ChangeLog-2014 +++ b/po/ChangeLog-2014 @@ -20,7 +20,7 @@ * po/it.po: updated * po/sed.pot: likewise. - + 2000-12-10 Paolo Bonzini <bonzini@gnu.org> * po/it.po: Italian translation reviewed for new POT file. diff --git a/po/Makevars b/po/Makevars index c026e13..de98da7 100644 --- a/po/Makevars +++ b/po/Makevars @@ -51,4 +51,4 @@ MSGID_BUGS_ADDRESS = bug-gnu-utils@gnu.org # This is the list of locale categories, beyond LC_MESSAGES, for which the # message catalogs shall be used. It is usually empty. -EXTRA_LOCALE_CATEGORIES = +EXTRA_LOCALE_CATEGORIES = diff --git a/sed/compile.c b/sed/compile.c index 513fac5..e81ae11 100644 --- a/sed/compile.c +++ b/sed/compile.c @@ -377,7 +377,7 @@ get_openfile(file_ptrs, mode, fail) { /* Check whether it is a special file (stdin, stdout or stderr) */ struct special_files *special = special_files; - + /* std* sometimes are not constants, so they cannot be used in the initializer for special_files */ my_stdin = stdin; my_stdout = stdout; my_stderr = stderr; @@ -440,13 +440,13 @@ snarf_char_class(b, cur_stat) int state = 0; int delim; bool pending_mb = 0; - + ch = inchar(); if (ch == '^') ch = add_then_next(b, ch); if (ch == CLOSE_BRACKET) ch = add_then_next(b, ch); - + /* States are: 0 outside a collation element, character class or collation class 1 after the bracket @@ -791,8 +791,8 @@ setup_replacement(sub, text, length) else switch (*p) { - case '0': case '1': case '2': case '3': case '4': - case '5': case '6': case '7': case '8': case '9': + case '0': case '1': case '2': case '3': case '4': + case '5': case '6': case '7': case '8': case '9': tail->subst_id = *p - '0'; if (sub->max_id < tail->subst_id) sub->max_id = tail->subst_id; @@ -807,7 +807,7 @@ setup_replacement(sub, text, length) repl_type = REPL_UPPERCASE; save_type = REPL_UPPERCASE; break; - + case 'E': repl_type = REPL_ASIS; save_type = REPL_ASIS; @@ -822,7 +822,7 @@ setup_replacement(sub, text, length) save_type = repl_type; repl_type |= REPL_UPPERCASE_FIRST; break; - + default: p[-1] = *p; ++tail->prefix_length; @@ -1155,7 +1155,7 @@ compile_program(vector) read_text_to_slash: if (ch == EOF) bad_prog(_(EXPECTED_SLASH)); - + if (ch == '\\') ch = inchar(); else @@ -1174,7 +1174,7 @@ compile_program(vector) bad_prog(_(NO_COLON_ADDR)); labels = setup_label(labels, vector->v_length, read_label(), NULL); break; - + case 'T': case 'b': case 't': @@ -1271,7 +1271,7 @@ compile_program(vector) int slash; struct buffer *b2; char *src_buf, *dest_buf; - + slash = inchar(); if ( !(b = match_slash(slash, false)) ) bad_prog(_(UNTERM_Y_CMD)); @@ -1484,7 +1484,7 @@ normalize_text(buf, len, buftype) if (buftype != TEXT_BUFFER) *q++ = '\\'; } - + continue; #else case 'o': /* octal byte */ @@ -1527,7 +1527,7 @@ convert: if (!bracket_state) bracket_state = -1; break; - + case ':': case '.': case '=': diff --git a/sed/execute.c b/sed/execute.c index 2e13ee2..edc647e 100644 --- a/sed/execute.c +++ b/sed/execute.c @@ -79,10 +79,10 @@ struct input { char **file_list; /* Count of files we failed to open. */ - countT bad_count; + countT bad_count; /* Current input line number (over all files). */ - countT line_number; + countT line_number; /* True if we'll reset line numbers and addresses before starting to process the next (possibly the first) file. */ @@ -159,7 +159,7 @@ resize_line(lb, len) lb->alloc = len; if (lb->alloc < INITIAL_BUFFER_SIZE) lb->alloc = INITIAL_BUFFER_SIZE; - + lb->text = REALLOC(lb->text, inactive + lb->alloc, char); lb->active = lb->text + inactive; } @@ -960,7 +960,7 @@ do_list(line_len) output_missing_newline(&output_file); for (; len--; ++p) { o = obuf; - + /* Some locales define 8-bit characters as printable. This makes the testsuite fail at 8to7.sed because the `l' command in fact will not convert the 8-bit characters. */ @@ -1065,7 +1065,7 @@ do_subst(sub) if (!match_regex(sub->regx, line.active, line.length, start, ®s, sub->max_id + 1)) return; - + if (!sub->replacement && sub->numb <= 1) { if (regs.start[0] == 0 && !sub->global) @@ -1159,26 +1159,26 @@ do_subst(sub) post_subst: if (sub->print & 1) output_line(line.active, line.length, line.chomped, &output_file); - - if (sub->eval) + + if (sub->eval) { #ifdef HAVE_POPEN FILE *pipe_fp; line_reset(&s_accum, NULL); - + str_append (&line, "", 1); pipe_fp = popen(line.active, "r"); - - if (pipe_fp != NULL) + + if (pipe_fp != NULL) { - while (!feof (pipe_fp)) + while (!feof (pipe_fp)) { char buf[4096]; int n = fread (buf, sizeof(char), 4096, pipe_fp); if (n > 0) str_append(&s_accum, buf, n); } - + pclose (pipe_fp); /* Exchange line and s_accum. This can be much cheaper than copying @@ -1194,8 +1194,8 @@ do_subst(sub) #else panic(_("option `e' not supported")); #endif - } - + } + if (sub->print & 2) output_line(line.active, line.length, line.chomped, &output_file); if (sub->outf) @@ -1330,7 +1330,7 @@ execute_program(vec, input) { str_append (&line, "", 1); pipe_fp = popen(line.active, "r"); - } + } else { cur_cmd->x.cmd_txt.text[cmd_length - 1] = 0; @@ -1338,11 +1338,11 @@ execute_program(vec, input) output_missing_newline(&output_file); } - if (pipe_fp != NULL) + if (pipe_fp != NULL) { char buf[4096]; int n; - while (!feof (pipe_fp)) + while (!feof (pipe_fp)) if ((n = fread (buf, sizeof(char), 4096, pipe_fp)) > 0) { if (!cmd_length) @@ -1350,7 +1350,7 @@ execute_program(vec, input) else ck_fwrite(buf, 1, n, output_file.fp); } - + pclose (pipe_fp); if (!cmd_length) { @@ -1438,7 +1438,7 @@ execute_program(vec, input) case 'N': str_append(&line, &buffer_delimiter, 1); - + if (test_eof(input) || !read_pattern_space(input, vec, true)) { line.length--; @@ -1652,8 +1652,8 @@ execute_program(vec, input) compared against how much time is saved. One semantic difference (which I think is an improvement) is that *this* version will terminate after printing line two in the script - "yes | sed -n 2p". - + "yes | sed -n 2p". + Don't use this when in-place editing is active, because line numbers restart each time then. */ else if (!separate_files) @@ -53,7 +53,7 @@ struct regex { size_t sz; char re[1]; }; - + enum replacement_types { REPL_ASIS = 0, REPL_UPPERCASE = 1, diff --git a/sed/utils.c b/sed/utils.c index 0a53511..af51693 100644 --- a/sed/utils.c +++ b/sed/utils.c @@ -201,7 +201,7 @@ ck_mkstemp (p_filename, tmpdir, base, mode) /* The ownership might change, so omit some permissions at first so unauthorized users cannot nip in before the file is ready. - + mkstemp forces O_BINARY on cygwin, so use mkostemp instead. */ save_umask = umask (0700); fd = mkostemp (template, 0); @@ -226,7 +226,7 @@ ck_fwrite(ptr, size, nmemb, stream) clearerr(stream); if (size && fwrite(ptr, size, nmemb, stream) != nmemb) panic(ngettext("couldn't write %d item to %s: %s", - "couldn't write %d items to %s: %s", nmemb), + "couldn't write %d items to %s: %s", nmemb), nmemb, utils_fp_name(stream), strerror(errno)); } diff --git a/testsuite/8bit.sed b/testsuite/8bit.sed index 7b3ed8d..37c0624 100644 --- a/testsuite/8bit.sed +++ b/testsuite/8bit.sed @@ -16,6 +16,6 @@ # Oh, well I remember # How on such a day we used to meet-- # My lover and I! -# -- Kakinomoto Hitomaro +# -- Kakinomoto Hitomaro # s/ÂçÏÂ/ÆüËÜ/ diff --git a/testsuite/BOOST.tests b/testsuite/BOOST.tests index 98fd3b6..aa57489 100644 --- a/testsuite/BOOST.tests +++ b/testsuite/BOOST.tests @@ -1,5 +1,5 @@ -; -; +; +; ; this file contains a script of tests to run through regress.exe ; ; comments start with a semicolon and proceed to the end of the line @@ -289,7 +289,7 @@ a((b)*\2)*d abbbd 0 5 1 4 2 3 (a)\1bc*[ce]d aabcccd 0 7 0 1 ^(a)\1b(c)*cd$ aabcccd 0 7 0 1 4 5 -; posix only: +; posix only: - match_default extended REG_EXTENDED (ab*)[ab]*\1 ababaaa 0 7 0 1 @@ -391,11 +391,11 @@ a(b*|c|e)d ad 0 2 1 1 a(b?)c abc 0 3 1 2 a(b?)c ac 0 2 1 1 a(b+)c abc 0 3 1 2 -a(b+)c abbbc 0 5 1 4 -a(b*)c ac 0 2 1 1 +a(b+)c abbbc 0 5 1 4 +a(b*)c ac 0 2 1 1 (a|ab)(bc([de]+)f|cde) abcdef 0 6 0 1 1 6 3 5 a([bc]?)c abc 0 3 1 2 -a([bc]?)c ac 0 2 1 1 +a([bc]?)c ac 0 2 1 1 a([bc]+)c abc 0 3 1 2 a([bc]+)c abcc 0 4 1 3 a([bc]+)bc abcbc 0 5 1 3 @@ -774,13 +774,13 @@ a()b\1 ab 0 2 1 1 ; subtleties of matching with no sub-expressions marked - normal match_nosubs REG_NO_POSIX_TEST -a(b?c)+d accd 0 4 -(wee|week)(knights|night) weeknights 0 10 +a(b?c)+d accd 0 4 +(wee|week)(knights|night) weeknights 0 10 .* abc 0 3 -a(b|(c))d abd 0 3 +a(b|(c))d abd 0 3 a(b|(c))d acd 0 3 a(b*|c|e)d abbd 0 4 -a(b*|c|e)d acd 0 3 +a(b*|c|e)d acd 0 3 a(b*|c|e)d ad 0 2 a(b?)c abc 0 3 a(b?)c ac 0 2 @@ -801,13 +801,13 @@ a(bbb+|bb+|b)bb abbb 0 4 (a*)* bc 0 0 - normal nosubs REG_NO_POSIX_TEST -a(b?c)+d accd 0 4 -(wee|week)(knights|night) weeknights 0 10 +a(b?c)+d accd 0 4 +(wee|week)(knights|night) weeknights 0 10 .* abc 0 3 -a(b|(c))d abd 0 3 +a(b|(c))d abd 0 3 a(b|(c))d acd 0 3 a(b*|c|e)d abbd 0 4 -a(b*|c|e)d acd 0 3 +a(b*|c|e)d acd 0 3 a(b*|c|e)d ad 0 2 a(b?)c abc 0 3 a(b?)c ac 0 2 diff --git a/testsuite/Makefile.tests b/testsuite/Makefile.tests index 68fd077..7f50f50 100644 --- a/testsuite/Makefile.tests +++ b/testsuite/Makefile.tests @@ -23,30 +23,30 @@ numsub head madding mac-mf empty xbxcx xbxcx3 recall recall2 xemacs \ appquit fasts uniq manis linecnt khadafy allsub flipcase space modulo \ y-bracket y-newline y-zero insert brackets amp-escape:: $(SEDENV) $(SED) -f $(srcdir)/$@.sed \ - < $(srcdir)/$@.inp | $(TR) -d \\r > $@.out - $(CMP) $(srcdir)/$@.good $@.out - @$(RM) $@.out + < $(srcdir)/$@.inp | $(TR) -d \\r > $@.out + $(CMP) $(srcdir)/$@.good $@.out + @$(RM) $@.out 0range:: $(SEDENV) $(SED) -s -f $(srcdir)/$@.sed \ - < $(srcdir)/$@.inp | $(TR) -d \\r > $@.out - $(CMP) $(srcdir)/$@.good $@.out - @$(RM) $@.out + < $(srcdir)/$@.inp | $(TR) -d \\r > $@.out + $(CMP) $(srcdir)/$@.good $@.out + @$(RM) $@.out badenc:: LC_ALL=ru_RU.UTF-8 $(TIME) $(SED) -nf $(srcdir)/$@.sed \ - < $(srcdir)/$@.inp | $(TR) -d \\r > $@.out - $(CMP) $(srcdir)/$@.good $@.out + < $(srcdir)/$@.inp | $(TR) -d \\r > $@.out + $(CMP) $(srcdir)/$@.good $@.out LC_ALL=it_IT.UTF-8 $(TIME) $(SED) -nf $(srcdir)/$@.sed \ - < $(srcdir)/$@.inp | $(TR) -d \\r > $@.out - $(CMP) $(srcdir)/$@.good $@.out + < $(srcdir)/$@.inp | $(TR) -d \\r > $@.out + $(CMP) $(srcdir)/$@.good $@.out LC_ALL=en_US.UTF-8 $(TIME) $(SED) -nf $(srcdir)/$@.sed \ - < $(srcdir)/$@.inp | $(TR) -d \\r > $@.out - $(CMP) $(srcdir)/$@.good $@.out + < $(srcdir)/$@.inp | $(TR) -d \\r > $@.out + $(CMP) $(srcdir)/$@.good $@.out LC_ALL=en_GB.UTF-8 $(TIME) $(SED) -nf $(srcdir)/$@.sed \ - < $(srcdir)/$@.inp | $(TR) -d \\r > $@.out - $(CMP) $(srcdir)/$@.good $@.out - @$(RM) $@.out + < $(srcdir)/$@.inp | $(TR) -d \\r > $@.out + $(CMP) $(srcdir)/$@.good $@.out + @$(RM) $@.out # Try with ru_RU.UTF-8. If it is presumably not installed, see if the current # locale is UTF-8 and run it in the current locale. @@ -76,39 +76,39 @@ utf8-1 utf8-2 utf8-3 utf8-4:: # This checks for a bug in 3.02 and 3.02.80 stdin:: ($(SEDENV) $(SED) d; $(SEDENV) $(SED) G) < $(srcdir)/numsub.inp \ - | $(TR) -d \\r > $@.1out + | $(TR) -d \\r > $@.1out $(SEDENV) cat $(srcdir)/numsub.inp \ - | ($(SEDENV) $(SED) d; $(SEDENV) $(SED) G) | $(TR) -d \\r > $@.2out - $(CMP) $@.1out $@.2out - @$(RM) $@.1out $@.2out + | ($(SEDENV) $(SED) d; $(SEDENV) $(SED) G) | $(TR) -d \\r > $@.2out + $(CMP) $@.1out $@.2out + @$(RM) $@.1out $@.2out inplace-hold:: echo x > $@.1out echo y > $@.2out echo > $@.out - $(SEDENV) $(SED) -i x $@.1out $@.2out - $(CMP) $@.1out $@.out - $(CMP) $@.2out $@.out + $(SEDENV) $(SED) -i x $@.1out $@.2out + $(CMP) $@.1out $@.out + $(CMP) $@.2out $@.out @$(RM) $@.1out $@.2out $@.out cv-vars classes middle dc distrib factor numsub2 numsub3 numsub4 numsub5 \ insens:: $(SEDENV) $(SED) -n -f $(srcdir)/$@.sed \ - < $(srcdir)/$@.inp | $(TR) -d \\r > $@.out - $(CMP) $(srcdir)/$@.good $@.out - @$(RM) $@.out + < $(srcdir)/$@.inp | $(TR) -d \\r > $@.out + $(CMP) $(srcdir)/$@.good $@.out + @$(RM) $@.out noeolw:: $(SEDENV) $(SED) -n -f $(srcdir)/$@.sed \ - $(srcdir)/noeol.inp $(srcdir)/noeol.inp | $(TR) -d \\r > $@.out - $(CMP) $(srcdir)/$@.good $@.out + $(srcdir)/noeol.inp $(srcdir)/noeol.inp | $(TR) -d \\r > $@.out + $(CMP) $(srcdir)/$@.good $@.out $(TR) -d \\r < $@.1out | $(CMP) $(srcdir)/$@.1good - $(TR) -d \\r < $@.2out | $(CMP) $(srcdir)/$@.2good - @$(RM) $@.1out $@.2out $@.out subwrite:: $(SEDENV) $(SED) -f $(srcdir)/$@.sed \ - < $(srcdir)/$@.inp | $(TR) -d \\r > $@.1out + < $(srcdir)/$@.inp | $(TR) -d \\r > $@.1out $(CMP) $(srcdir)/subwrt1.good $@.1out $(TR) -d \\r < $@.wout | $(CMP) $(srcdir)/subwrt2.good - @$(RM) $@.1out $@.wout @@ -116,20 +116,20 @@ subwrite:: bsd:: $(SEDENV_2) sh $(srcdir)/$@.sh '$(TIME) $(SED)' $@.out $(TR) -d \\r < $@.out | $(CMP) $(srcdir)/$@.good - - @$(RM) $@.out + @$(RM) $@.out writeout:: $(SEDENV) $(SED) -f $(srcdir)/$@.sed \ - < $(srcdir)/$@.inp | $(TR) -d \\r > $@.1out - $(CMP) $(srcdir)/wrtout1.good $@.1out + < $(srcdir)/$@.inp | $(TR) -d \\r > $@.1out + $(CMP) $(srcdir)/wrtout1.good $@.1out $(TR) -d \\r < $@.wout | $(CMP) $(srcdir)/wrtout2.good - @$(RM) $@.1out $@.wout readin:: echo MOO | $(SEDENV) $(SED) b > $@.in2 $(SEDENV) $(SED) -f $(srcdir)/$@.sed \ - < $(srcdir)/$@.inp | $(TR) -d \\r > $@.out - $(CMP) $(srcdir)/$@.good $@.out + < $(srcdir)/$@.inp | $(TR) -d \\r > $@.out + $(CMP) $(srcdir)/$@.good $@.out @$(RM) $@.out $@.in2 eval.in2: $(srcdir)/eval.inp @@ -137,15 +137,15 @@ eval.in2: $(srcdir)/eval.inp eval:: eval.in2 $(SEDENV) $(SED) -f $(srcdir)/$@.sed \ - < $(srcdir)/$@.inp | $(TR) -d \\r > $@.out - $(CMP) $(srcdir)/$@.good $@.out - @$(RM) $@.out + < $(srcdir)/$@.inp | $(TR) -d \\r > $@.out + $(CMP) $(srcdir)/$@.good $@.out + @$(RM) $@.out binary binary2 binary3:: $(SEDENV) $(SED) -n -f $(srcdir)/$@.sed \ - < $(srcdir)/binary.inp | $(TR) -d \\r > $@.out - $(CMP) $(srcdir)/binary.good $@.out - @$(RM) $@.out + < $(srcdir)/binary.inp | $(TR) -d \\r > $@.out + $(CMP) $(srcdir)/binary.good $@.out + @$(RM) $@.out # # cmdlines targets @@ -153,27 +153,27 @@ binary binary2 binary3:: help:: $(SEDENV) $(SED) --help | grep E-mail > /dev/null 2>&1 - $(SEDENV) $(SED) --help | $(SEDENV) $(SED) '1s/ [^ ]* / sed /; /^E-mail/,$$d' > $@.1out + $(SEDENV) $(SED) --help | $(SEDENV) $(SED) '1s/ [^ ]* / sed /; /^E-mail/,$$d' > $@.1out $(SEDENV) $(SED) 2>&1 | $(SEDENV) $(SED) '1s/ [^ ]* / sed /' > $@.2out || : - $(CMP) $@.1out $@.2out + $(CMP) $@.1out $@.2out @$(RM) $@.1out $@.2out version:: $(SEDENV) $(SED) --version 2>&1 | $(TR) -d \\r > $@.out - $(CMP) $@.good $@.out + $(CMP) $@.good $@.out @$(RM) $@.out file:: $(SEDENV) $(SED) --file=$(srcdir)/newjis.sed \ - < $(srcdir)/newjis.inp | $(TR) -d \\r > $@.out - $(CMP) $(srcdir)/newjis.good $@.out - @$(RM) $@.out + < $(srcdir)/newjis.inp | $(TR) -d \\r > $@.out + $(CMP) $(srcdir)/newjis.good $@.out + @$(RM) $@.out quiet:: $(SEDENV) $(SED) --quiet -f $(srcdir)/cv-vars.sed \ - < $(srcdir)/cv-vars.inp | $(TR) -d \\r > $@.out - $(CMP) $(srcdir)/cv-vars.good $@.out - @$(RM) $@.out + < $(srcdir)/cv-vars.inp | $(TR) -d \\r > $@.out + $(CMP) $(srcdir)/cv-vars.good $@.out + @$(RM) $@.out # The following target is not used in super sed builds (only GNU sed) diff --git a/testsuite/PCRE.tests b/testsuite/PCRE.tests index 0fb9cad..7816dce 100644 --- a/testsuite/PCRE.tests +++ b/testsuite/PCRE.tests @@ -552,21 +552,21 @@ No match 1: cataract 2: aract 3: ract - 4: + 4: 5: 3 catatonic catatonic23 0: catatonic catatonic23 1: catatonic 2: atonic 3: tonic - 4: + 4: 5: 3 caterpillar caterpillar23 0: caterpillar caterpillar23 1: caterpillar 2: erpillar 3: <unset> - 4: + 4: 5: 3 @@ -578,10 +578,10 @@ No match /^From\s+\S+\s+([a-zA-Z]{3}\s+){2}[0-9]{1,2}\s+[0-9][0-9]:[0-9][0-9]/ From abcd Mon Sep 01 12:33:02 1997 0: From abcd Mon Sep 01 12:33 - 1: Sep + 1: Sep From abcd Mon Sep 1 12:33:02 1997 0: From abcd Mon Sep 1 12:33 - 1: Sep + 1: Sep *** Failers No match From abcd Sep 01 12:33:02 1997 @@ -617,7 +617,7 @@ No match 2: bell bell 0: bell - 1: + 1: 2: bell *** Failers No match @@ -633,7 +633,7 @@ No match 1: a b 0: b - 1: + 1: *** Failers No match ab @@ -645,7 +645,7 @@ No match 1: a b 0: b - 1: + 1: *** Failers No match ab @@ -664,7 +664,7 @@ No match 1: a b 0: b - 1: + 1: *** Failers No match ab @@ -781,7 +781,7 @@ No match 0: baccc 1: b 2: a - 3: + 3: 4: ccc *** Failers 0: *** Failers @@ -799,7 +799,7 @@ No match 0: A /[^a]/i - Abc + Abc 0: b /[^a]+/ @@ -831,7 +831,7 @@ No match No match akb No match - akk + akk No match /^[0-9]{8,}@.+[^k]$/ @@ -843,7 +843,7 @@ No match No match 12345678@x.y.uk No match - 1234567@a.b.c.d + 1234567@a.b.c.d No match /(a)\1{8,}/ @@ -855,31 +855,31 @@ No match 1: a *** Failers No match - aaaaaaa + aaaaaaa No match /[^a]/ aaaabcd 0: b - aaAabcd + aaAabcd 0: A /[^a]/i aaaabcd 0: b - aaAabcd + aaAabcd 0: b /[^az]/ aaaabcd 0: b - aaAabcd + aaAabcd 0: A /[^az]/i aaaabcd 0: b - aaAabcd + aaAabcd 0: b /P[^*]TAIRE[^*]{1,6}LL/ @@ -894,30 +894,30 @@ No match 1.230003938 0: .230003938 1: .23 - 1.875000282 + 1.875000282 0: .875000282 1: .875 - 1.235 + 1.235 0: .235 1: .23 - + /\b(foo)\s+(\w+)/i Food is on the foo table 0: foo table 1: foo 2: table - + /foo(.*)bar/ The food is under the bar in the barn. 0: food is under the bar in the bar - 1: d is under the bar in the - + 1: d is under the bar in the + /(.*)([0-9]*)/ I have 2 numbers: 53147 0: I have 2 numbers: 53147 1: I have 2 numbers: 53147 - 2: - + 2: + /(.*)([0-9]+)/ I have 2 numbers: 53147 0: I have 2 numbers: 53147 @@ -933,13 +933,13 @@ No match /(.*)\b([0-9]+)$/ I have 2 numbers: 53147 0: I have 2 numbers: 53147 - 1: I have 2 numbers: + 1: I have 2 numbers: 2: 53147 /(.*[^0-9])([0-9]+)$/ I have 2 numbers: 53147 0: I have 2 numbers: 53147 - 1: I have 2 numbers: + 1: I have 2 numbers: 2: 53147 /[[:digit:]][[:digit:]]\/[[:digit:]][[:digit:]]\/[[:digit:]][[:digit:]][[:digit:]][[:digit:]]/ @@ -948,48 +948,48 @@ No match /^(a){0,0}/ bcd - 0: + 0: abc - 0: - aab - 0: + 0: + aab + 0: /^(a){0,1}/ bcd - 0: + 0: abc 0: a 1: a - aab + aab 0: a 1: a /^(a){0,2}/ bcd - 0: + 0: abc 0: a 1: a - aab + aab 0: aa 1: a /^(a){0,3}/ bcd - 0: + 0: abc 0: a 1: a aab 0: aa 1: a - aaa + aaa 0: aaa 1: a /^(a){0,}/ bcd - 0: + 0: abc 0: a 1: a @@ -999,7 +999,7 @@ No match aaa 0: aaa 1: a - aaaaaaaa + aaaaaaaa 0: aaaaaaaa 1: a @@ -1009,7 +1009,7 @@ No match abc 0: a 1: a - aab + aab 0: a 1: a @@ -1019,7 +1019,7 @@ No match abc 0: a 1: a - aab + aab 0: aa 1: a @@ -1032,7 +1032,7 @@ No match aab 0: aa 1: a - aaa + aaa 0: aaa 1: a @@ -1048,7 +1048,7 @@ No match aaa 0: aaa 1: a - aaaaaaaa + aaaaaaaa 0: aaaaaaaa 1: a @@ -1057,28 +1057,28 @@ No match 0: 123456654321 /^[[:digit:]][[:digit:]][[:digit:]][[:digit:]][[:digit:]][[:digit:]][[:digit:]][[:digit:]][[:digit:]][[:digit:]][[:digit:]][[:digit:]]/ - 123456654321 + 123456654321 0: 123456654321 /^[abc]{12}/ abcabcabcabc 0: abcabcabcabc - + /^[a-c]{12}/ abcabcabcabc 0: abcabcabcabc - + /^(a|b|c){12}/ - abcabcabcabc + abcabcabcabc 0: abcabcabcabc 1: c /^[abcdefghijklmnopqrstuvwxy0123456789]/ n 0: n - *** Failers + *** Failers No match - z + z No match /abcde{0,0}/ @@ -1086,7 +1086,7 @@ No match 0: abcd *** Failers No match - abce + abce No match /ab[cd]{0,0}e/ @@ -1094,21 +1094,21 @@ No match 0: abe *** Failers No match - abcde + abcde No match - + /ab(c){0,0}d/ abd 0: abd *** Failers No match - abcd + abcd No match /a(b*)/ a 0: a - 1: + 1: ab 0: ab 1: b @@ -1117,33 +1117,33 @@ No match 1: bbbb *** Failers 0: a - 1: - bbbbb + 1: + bbbbb No match - + /ab[0-9]{0}e/ abe 0: abe *** Failers No match - ab1e + ab1e No match - + /(A|B)*CD/ - CD + CD 0: CD /(AB)*\1/ ABABAB 0: ABABAB 1: AB - + /([0-9]+)(\w)/ 12345a 0: 12345a 1: 12345 2: a - 12345+ + 12345+ 0: 12345 1: 1234 2: 5 @@ -1158,15 +1158,15 @@ No match abcabcabc 0: abcabcabc 1: abc - xyz - 0: - 1: + xyz + 0: + 1: /([a]*)*/ a 0: a 1: a - aaaaa + aaaaa 0: aaaaa 1: aaaaa @@ -1183,7 +1183,7 @@ No match aaaabcde 0: aaaab 1: aaaab - bbbb + bbbb 0: bbbb 1: bbbb @@ -1194,15 +1194,15 @@ No match bbbb 0: bbbb 1: bbbb - aaa - 0: + aaa + 0: /([^ab]*)*/ cccc 0: cccc 1: cccc - abab - 0: + abab + 0: /abc/ abc @@ -1322,11 +1322,11 @@ No match /^/ abc - 0: + 0: /$/ abc - 0: + 0: /a.c/ abc @@ -1483,7 +1483,7 @@ No match /()ef/ def 0: ef - 1: + 1: /a\(b/ a(b @@ -1554,10 +1554,10 @@ No match No match b No match - + /a*/ - + /([abc])*d/ abbbcd @@ -1600,7 +1600,7 @@ No match /(abc|)ef/ abcdef 0: ef - 1: + 1: /(a|b)c*d/ abcd @@ -1847,11 +1847,11 @@ No match /^/i ABC - 0: + 0: /$/i ABC - 0: + 0: /a.c/i ABC @@ -1924,7 +1924,7 @@ No match /()ef/i DEF 0: EF - 1: + 1: /$b/i *** Failers @@ -2043,7 +2043,7 @@ No match /(abc|)ef/i ABCDEF 0: EF - 1: + 1: /(a|b)c*d/i ABCD @@ -2236,8 +2236,8 @@ No match /^(){3,5}/ abc - 0: - 1: + 0: + 1: /^(a+)*ax/ aax @@ -2339,20 +2339,20 @@ No match ZABCDEFG 0: ZA 1: A - 2: + 2: /(Z(())|A)*/ ZABCDEFG 0: ZA 1: A - 2: - 3: + 2: + 3: /(.*)[0-9]+\1/ abc123abc 0: abc123abc 1: abc - abc123bc + abc123bc 0: bc123bc 1: bc @@ -2361,7 +2361,7 @@ No match 0: abc123abc 1: abc 2: abc - abc123bc + abc123bc 0: bc123bc 1: bc 2: bc diff --git a/testsuite/badenc.sed b/testsuite/badenc.sed index dc80982..c46bb69 100644 --- a/testsuite/badenc.sed +++ b/testsuite/badenc.sed @@ -1 +1 @@ -/.*/ { H ; g ; s/\n// ; p ; z ; x } +/.*/ { H ; g ; s/\n// ; p ; z ; x } diff --git a/testsuite/binary.sed b/testsuite/binary.sed index 92a6a06..e8ffd3b 100644 --- a/testsuite/binary.sed +++ b/testsuite/binary.sed @@ -37,23 +37,23 @@ # 255.255.255.0; 2 parameters => given host address and netmask compute # network and broadcast addresses): # -# if [ $# = 1 ]; then +# if [ $# = 1 ]; then # OUTPUT='$1.$2.$3.$4' # set 255.255.255.255 $1 # else # OUTPUT='$1.$2.$3.$4 $5.$6.$7.$8' # fi -# +# # if [ `expr $2 : ".*\\."` -gt 0 ]; then # MASK="$2 br b8<r b16<r b24< R|R|R|" # else # MASK="$2b 31b ^d D # 11111111111111111111111111111111 x>1> x<1<" # fi -# +# # set `echo "$1 br b8<r b16<r b24< R|R|R| D # Load address # $MASK D ~r # Load mask -# +# # & DDD 24>dpP 16>11111111& dpP 8>11111111& dpP 11111111& dpP # | DDD 24>dpP 16>11111111& dpP 8>11111111& dpP 11111111& dpP # " | sed -f binary.sed` diff --git a/testsuite/binary2.sed b/testsuite/binary2.sed index daf7706..115b942 100644 --- a/testsuite/binary2.sed +++ b/testsuite/binary2.sed @@ -38,23 +38,23 @@ # 255.255.255.0; 2 parameters => given host address and netmask compute # network and broadcast addresses): # -# if [ $# = 1 ]; then +# if [ $# = 1 ]; then # OUTPUT='$1.$2.$3.$4' # set 255.255.255.255 $1 # else # OUTPUT='$1.$2.$3.$4 $5.$6.$7.$8' # fi -# +# # if [ `expr $2 : ".*\\."` -gt 0 ]; then # MASK="$2 br b8<r b16<r b24< R|R|R|" # else # MASK="$2b 31b ^d D # 11111111111111111111111111111111 x>1> x<1<" # fi -# +# # set `echo "$1 br b8<r b16<r b24< R|R|R| D # Load address # $MASK D ~r # Load mask -# +# # & DDD 24>dpP 16>11111111& dpP 8>11111111& dpP 11111111& dpP # | DDD 24>dpP 16>11111111& dpP 8>11111111& dpP 11111111& dpP # " | sed -f binary.sed` diff --git a/testsuite/binary3.sed b/testsuite/binary3.sed index b877f14..ba6b7d1 100644 --- a/testsuite/binary3.sed +++ b/testsuite/binary3.sed @@ -41,23 +41,23 @@ # 255.255.255.0; 2 parameters => given host address and netmask compute # network and broadcast addresses): # -# if [ $# = 1 ]; then +# if [ $# = 1 ]; then # OUTPUT='$1.$2.$3.$4' # set 255.255.255.255 $1 # else # OUTPUT='$1.$2.$3.$4 $5.$6.$7.$8' # fi -# +# # if [ `expr $2 : ".*\\."` -gt 0 ]; then # MASK="$2 br b8<r b16<r b24< R|R|R|" # else # MASK="$2b 31b ^d D # 11111111111111111111111111111111 x>1> x<1<" # fi -# +# # set `echo "$1 br b8<r b16<r b24< R|R|R| D # Load address # $MASK D ~r # Load mask -# +# # & DDD 24>dpP 16>11111111& dpP 8>11111111& dpP 11111111& dpP # | DDD 24>dpP 16>11111111& dpP 8>11111111& dpP 11111111& dpP # " | sed -f binary.sed` diff --git a/testsuite/distrib.sh b/testsuite/distrib.sh index dbadbdc..21e4c08 100644 --- a/testsuite/distrib.sh +++ b/testsuite/distrib.sh @@ -1,7 +1,7 @@ #! /bin/sh # # This is stolen from C News -# +# # diff --git a/testsuite/eval.good b/testsuite/eval.good index 6fd021b..4988e12 100644 --- a/testsuite/eval.good +++ b/testsuite/eval.good @@ -13,20 +13,20 @@ cpu 17380: 2 2 5 11 79 cpu --- - abcd + abcd --- - abcd + abcd --- - abcd + abcd --- 17380: 2 2 5 11 79 - cpu + cpu --- 17380: 2 2 5 11 79 - cpu + cpu --- 17380: 2 2 5 11 79 - cpu + cpu --- Doing some more tests ----------------------- 17380: 2 2 5 11 79 diff --git a/testsuite/eval.inp b/testsuite/eval.inp index 4e30989..6c3df08 100644 --- a/testsuite/eval.inp +++ b/testsuite/eval.inp @@ -1,5 +1,5 @@ 17380: 2 2 5 11 79 abcd cpu - abcd - cpu + abcd + cpu diff --git a/testsuite/inclib.good b/testsuite/inclib.good index 6b1279a..cb04b39 100644 --- a/testsuite/inclib.good +++ b/testsuite/inclib.good @@ -1,34 +1,34 @@ - /usr/X11R6/include - /usr/X11R5/include - /usr/X11R4/include - - /usr/include/X11R6 - /usr/include/X11R5 - /usr/include/X11R4 - - /usr/local/X11R6/include - /usr/local/X11R5/include - /usr/local/X11R4/include - - /usr/local/include/X11R6 - /usr/local/include/X11R5 - /usr/local/include/X11R4 - - /usr/X11/include - /usr/include/X11 - /usr/local/X11/include - /usr/local/include/X11 - - /usr/X386/include - /usr/x386/include - /usr/XFree86/include/X11 - - /usr/include - /usr/local/include - /usr/unsupported/include - /usr/athena/include - /usr/local/x11r5/include - /usr/lpp/Xamples/include - - /usr/openwin/include - /usr/openwin/share/include + /usr/X11R6/include + /usr/X11R5/include + /usr/X11R4/include + + /usr/include/X11R6 + /usr/include/X11R5 + /usr/include/X11R4 + + /usr/local/X11R6/include + /usr/local/X11R5/include + /usr/local/X11R4/include + + /usr/local/include/X11R6 + /usr/local/include/X11R5 + /usr/local/include/X11R4 + + /usr/X11/include + /usr/include/X11 + /usr/local/X11/include + /usr/local/include/X11 + + /usr/X386/include + /usr/x386/include + /usr/XFree86/include/X11 + + /usr/include + /usr/local/include + /usr/unsupported/include + /usr/athena/include + /usr/local/x11r5/include + /usr/lpp/Xamples/include + + /usr/openwin/include + /usr/openwin/share/include diff --git a/testsuite/inclib.inp b/testsuite/inclib.inp index 552e9e2..1f71277 100644 --- a/testsuite/inclib.inp +++ b/testsuite/inclib.inp @@ -1,34 +1,34 @@ - /usr/X11R6/lib - /usr/X11R5/lib - /usr/X11R4/lib - - /usr/lib/X11R6 - /usr/lib/X11R5 - /usr/lib/X11R4 - - /usr/local/X11R6/lib - /usr/local/X11R5/lib - /usr/local/X11R4/lib - - /usr/local/lib/X11R6 - /usr/local/lib/X11R5 - /usr/local/lib/X11R4 - - /usr/X11/lib - /usr/lib/X11 - /usr/local/X11/lib - /usr/local/lib/X11 - - /usr/X386/lib - /usr/x386/lib - /usr/XFree86/lib/X11 - - /usr/lib - /usr/local/lib - /usr/unsupported/lib - /usr/athena/lib - /usr/local/x11r5/lib - /usr/lpp/Xamples/lib - - /usr/openwin/lib - /usr/openwin/share/lib + /usr/X11R6/lib + /usr/X11R5/lib + /usr/X11R4/lib + + /usr/lib/X11R6 + /usr/lib/X11R5 + /usr/lib/X11R4 + + /usr/local/X11R6/lib + /usr/local/X11R5/lib + /usr/local/X11R4/lib + + /usr/local/lib/X11R6 + /usr/local/lib/X11R5 + /usr/local/lib/X11R4 + + /usr/X11/lib + /usr/lib/X11 + /usr/local/X11/lib + /usr/local/lib/X11 + + /usr/X386/lib + /usr/x386/lib + /usr/XFree86/lib/X11 + + /usr/lib + /usr/local/lib + /usr/unsupported/lib + /usr/athena/lib + /usr/local/x11r5/lib + /usr/lpp/Xamples/lib + + /usr/openwin/lib + /usr/openwin/share/lib diff --git a/testsuite/khadafy.good b/testsuite/khadafy.good index e719f4e..57e21a1 100644 --- a/testsuite/khadafy.good +++ b/testsuite/khadafy.good @@ -26,7 +26,7 @@ 26) Muammar Quathafi 27) Muammar Gheddafi 28) Muamar Al-Kaddafi -29) Moammar Khadafy +29) Moammar Khadafy 30) Moammar Qudhafi 31) Mu'ammar al-Qaddafi 32) Mulazim Awwal Mu'ammar Muhammad Abu Minyar al-Qadhafi diff --git a/testsuite/khadafy.inp b/testsuite/khadafy.inp index e719f4e..57e21a1 100644 --- a/testsuite/khadafy.inp +++ b/testsuite/khadafy.inp @@ -26,7 +26,7 @@ 26) Muammar Quathafi 27) Muammar Gheddafi 28) Muamar Al-Kaddafi -29) Moammar Khadafy +29) Moammar Khadafy 30) Moammar Qudhafi 31) Mu'ammar al-Qaddafi 32) Mulazim Awwal Mu'ammar Muhammad Abu Minyar al-Qadhafi diff --git a/testsuite/linecnt.good b/testsuite/linecnt.good index 3cc1bd6..0488b62 100644 --- a/testsuite/linecnt.good +++ b/testsuite/linecnt.good @@ -33,7 +33,7 @@ A dialogue on poverty 17 But cold and bitter is the night! 18 - As for those poorer than myself, + As for those poorer than myself, 19 Their parents must be cold and hungry, 20 @@ -41,7 +41,7 @@ A dialogue on poverty 21 Then, how do you struggle through life? 22 - + 23 Wide as they call the heaven and earth, 24 diff --git a/testsuite/linecnt.inp b/testsuite/linecnt.inp index 9eb6070..a34df29 100644 --- a/testsuite/linecnt.inp +++ b/testsuite/linecnt.inp @@ -15,11 +15,11 @@ A dialogue on poverty I pull up my hempen bedclothes, Wear what few sleeveless clothes I have, But cold and bitter is the night! - As for those poorer than myself, + As for those poorer than myself, Their parents must be cold and hungry, Their wives and children beg and cry. Then, how do you struggle through life? - + Wide as they call the heaven and earth, For me they have shrunk quite small; Bright though they call the sun and moon, diff --git a/testsuite/mac-mf.good b/testsuite/mac-mf.good index 9be165d..4e8bc45 100644 --- a/testsuite/mac-mf.good +++ b/testsuite/mac-mf.good @@ -6,72 +6,72 @@ # # This first part is long enough that NFS:Share doesn't notice the non-ASCII # characters in the rest of the file, so it claims that the file is type -# TEXT, which is what we want. The non-ASCII chars are necessary for MPW +# TEXT, which is what we want. The non-ASCII chars are necessary for MPW # Make # # This first part is long enough that NFS:Share doesn't notice the non-ASCII # characters in the rest of the file, so it claims that the file is type -# TEXT, which is what we want. The non-ASCII chars are necessary for MPW +# TEXT, which is what we want. The non-ASCII chars are necessary for MPW # Make # # This first part is long enough that NFS:Share doesn't notice the non-ASCII # characters in the rest of the file, so it claims that the file is type -# TEXT, which is what we want. The non-ASCII chars are necessary for MPW +# TEXT, which is what we want. The non-ASCII chars are necessary for MPW # Make # # This first part is long enough that NFS:Share doesn't notice the non-ASCII # characters in the rest of the file, so it claims that the file is type -# TEXT, which is what we want. The non-ASCII chars are necessary for MPW +# TEXT, which is what we want. The non-ASCII chars are necessary for MPW # Make # # This first part is long enough that NFS:Share doesn't notice the non-ASCII # characters in the rest of the file, so it claims that the file is type -# TEXT, which is what we want. The non-ASCII chars are necessary for MPW +# TEXT, which is what we want. The non-ASCII chars are necessary for MPW # Make # # This first part is long enough that NFS:Share doesn't notice the non-ASCII # characters in the rest of the file, so it claims that the file is type -# TEXT, which is what we want. The non-ASCII chars are necessary for MPW +# TEXT, which is what we want. The non-ASCII chars are necessary for MPW # Make # # This first part is long enough that NFS:Share doesn't notice the non-ASCII # characters in the rest of the file, so it claims that the file is type -# TEXT, which is what we want. The non-ASCII chars are necessary for MPW +# TEXT, which is what we want. The non-ASCII chars are necessary for MPW # Make # # This first part is long enough that NFS:Share doesn't notice the non-ASCII # characters in the rest of the file, so it claims that the file is type -# TEXT, which is what we want. The non-ASCII chars are necessary for MPW +# TEXT, which is what we want. The non-ASCII chars are necessary for MPW # Make # # This first part is long enough that NFS:Share doesn't notice the non-ASCII # characters in the rest of the file, so it claims that the file is type -# TEXT, which is what we want. The non-ASCII chars are necessary for MPW +# TEXT, which is what we want. The non-ASCII chars are necessary for MPW # Make # # This first part is long enough that NFS:Share doesn't notice the non-ASCII # characters in the rest of the file, so it claims that the file is type -# TEXT, which is what we want. The non-ASCII chars are necessary for MPW +# TEXT, which is what we want. The non-ASCII chars are necessary for MPW # Make # # This first part is long enough that NFS:Share doesn't notice the non-ASCII # characters in the rest of the file, so it claims that the file is type -# TEXT, which is what we want. The non-ASCII chars are necessary for MPW +# TEXT, which is what we want. The non-ASCII chars are necessary for MPW # Make # # This first part is long enough that NFS:Share doesn't notice the non-ASCII # characters in the rest of the file, so it claims that the file is type -# TEXT, which is what we want. The non-ASCII chars are necessary for MPW +# TEXT, which is what we want. The non-ASCII chars are necessary for MPW # Make # # This first part is long enough that NFS:Share doesn't notice the non-ASCII # characters in the rest of the file, so it claims that the file is type -# TEXT, which is what we want. The non-ASCII chars are necessary for MPW +# TEXT, which is what we want. The non-ASCII chars are necessary for MPW # Make # # This first part is long enough that NFS:Share doesn't notice the non-ASCII # characters in the rest of the file, so it claims that the file is type -# TEXT, which is what we want. The non-ASCII chars are necessary for MPW +# TEXT, which is what we want. The non-ASCII chars are necessary for MPW # Make # @@ -80,18 +80,18 @@ WHAT = mac -# Directory syntax Ä +# Directory syntax Ä R= C= S=: U=: BUILDTOP = ::: -srcdir = +srcdir = # FIXME Ä This doesn't translate to MPW yet, srcdir must be same as objdir # File in object dir can come from either the current dir or srcdir -# +# # . Ä . "{srcdir}" # Default rule that puts each file into separate segment @@ -106,8 +106,8 @@ LD = link # The funny quoting in the LDFLAGS is to avoid xxx.c.o being mangled by # mac-mf.sed into xxx.c.o LDFLAGS=-t MPST -c "MPS " -sym on {Libraries}"Runtime."o {CLibraries}"StdClib."o {Libraries}"ToolLibs."o {Libraries}"Interface."o -CCOPTS = -LIBS = +CCOPTS = +LIBS = KRB5ROOT= @KRB5ROOT@ KRB4=@KRB4@ INSTALL=Duplicate -y @@ -157,7 +157,7 @@ OBJEXT = c.o LIBEXT = a EXEEXT = -all ÄÄ +all ÄÄ # Generated automatically from Makefile.in by configure CFLAGS = {CCOPTS} {DEFS} -i ::des @@ -169,32 +169,32 @@ OBJS= md5.{OBJEXT} md5glue.{OBJEXT} md5crypto.{OBJEXT} SRCS= md5.c md5glue.c md5crypto.c -all ÄÄ {OBJS} +all ÄÄ {OBJS} t_mddriver Ä t_mddriver.c.o md5.c.o Link {LDFLAGS} -o t_mddriver t_mddriver.c.o md5.c.o -t_mddriver.exe Ä +t_mddriver.exe Ä {CC} {CFLAGS2} -o t_mddriver.exe t_mddriver.c md5.c check ÄÄ t_mddriver{EXEEXT} {C}t_mddriver{EXEEXT} -x -clean ÄÄ +clean ÄÄ {RM} t_mddriver{EXEEXT} t_mddriver.{OBJEXT} # config:post.in # put all ÄÄ first just in case no other rules occur here # -all ÄÄ +all ÄÄ -check ÄÄ +check ÄÄ clean ÄÄ clean-{WHAT} {RM} config.log pre.c.out post.c.out Makefile.c.out -clean-unix ÄÄ +clean-unix ÄÄ if test -n "{OBJS}" ; then {RM} {OBJS}; else Ä ; fi -clean-windows ÄÄ +clean-windows ÄÄ {RM} Å.{OBJEXT} {RM} msvc.pdb Å.err diff --git a/testsuite/mac-mf.inp b/testsuite/mac-mf.inp index 3adaee2..7d80191 100644 --- a/testsuite/mac-mf.inp +++ b/testsuite/mac-mf.inp @@ -6,72 +6,72 @@ # # This first part is long enough that NFS/Share doesn't notice the non-ASCII # characters in the rest of the file, so it claims that the file is type -# TEXT, which is what we want. The non-ASCII chars are necessary for MPW +# TEXT, which is what we want. The non-ASCII chars are necessary for MPW # Make. # # This first part is long enough that NFS/Share doesn't notice the non-ASCII # characters in the rest of the file, so it claims that the file is type -# TEXT, which is what we want. The non-ASCII chars are necessary for MPW +# TEXT, which is what we want. The non-ASCII chars are necessary for MPW # Make. # # This first part is long enough that NFS/Share doesn't notice the non-ASCII # characters in the rest of the file, so it claims that the file is type -# TEXT, which is what we want. The non-ASCII chars are necessary for MPW +# TEXT, which is what we want. The non-ASCII chars are necessary for MPW # Make. # # This first part is long enough that NFS/Share doesn't notice the non-ASCII # characters in the rest of the file, so it claims that the file is type -# TEXT, which is what we want. The non-ASCII chars are necessary for MPW +# TEXT, which is what we want. The non-ASCII chars are necessary for MPW # Make. # # This first part is long enough that NFS/Share doesn't notice the non-ASCII # characters in the rest of the file, so it claims that the file is type -# TEXT, which is what we want. The non-ASCII chars are necessary for MPW +# TEXT, which is what we want. The non-ASCII chars are necessary for MPW # Make. # # This first part is long enough that NFS/Share doesn't notice the non-ASCII # characters in the rest of the file, so it claims that the file is type -# TEXT, which is what we want. The non-ASCII chars are necessary for MPW +# TEXT, which is what we want. The non-ASCII chars are necessary for MPW # Make. # # This first part is long enough that NFS/Share doesn't notice the non-ASCII # characters in the rest of the file, so it claims that the file is type -# TEXT, which is what we want. The non-ASCII chars are necessary for MPW +# TEXT, which is what we want. The non-ASCII chars are necessary for MPW # Make. # # This first part is long enough that NFS/Share doesn't notice the non-ASCII # characters in the rest of the file, so it claims that the file is type -# TEXT, which is what we want. The non-ASCII chars are necessary for MPW +# TEXT, which is what we want. The non-ASCII chars are necessary for MPW # Make. # # This first part is long enough that NFS/Share doesn't notice the non-ASCII # characters in the rest of the file, so it claims that the file is type -# TEXT, which is what we want. The non-ASCII chars are necessary for MPW +# TEXT, which is what we want. The non-ASCII chars are necessary for MPW # Make. # # This first part is long enough that NFS/Share doesn't notice the non-ASCII # characters in the rest of the file, so it claims that the file is type -# TEXT, which is what we want. The non-ASCII chars are necessary for MPW +# TEXT, which is what we want. The non-ASCII chars are necessary for MPW # Make. # # This first part is long enough that NFS/Share doesn't notice the non-ASCII # characters in the rest of the file, so it claims that the file is type -# TEXT, which is what we want. The non-ASCII chars are necessary for MPW +# TEXT, which is what we want. The non-ASCII chars are necessary for MPW # Make. # # This first part is long enough that NFS/Share doesn't notice the non-ASCII # characters in the rest of the file, so it claims that the file is type -# TEXT, which is what we want. The non-ASCII chars are necessary for MPW +# TEXT, which is what we want. The non-ASCII chars are necessary for MPW # Make. # # This first part is long enough that NFS/Share doesn't notice the non-ASCII # characters in the rest of the file, so it claims that the file is type -# TEXT, which is what we want. The non-ASCII chars are necessary for MPW +# TEXT, which is what we want. The non-ASCII chars are necessary for MPW # Make. # # This first part is long enough that NFS/Share doesn't notice the non-ASCII # characters in the rest of the file, so it claims that the file is type -# TEXT, which is what we want. The non-ASCII chars are necessary for MPW +# TEXT, which is what we want. The non-ASCII chars are necessary for MPW # Make. # @@ -91,7 +91,7 @@ srcdir = . # FIXME: This doesn't translate to MPW yet, srcdir must be same as objdir. # File in object dir can come from either the current dir or srcdir. -# +# # . : . "{srcdir}" # Default rule that puts each file into separate segment. @@ -106,8 +106,8 @@ LD = link # The funny quoting in the LDFLAGS is to avoid xxx.o being mangled by # mac-mf.sed into xxx.c.o. LDFLAGS=-t MPST -c "MPS " -sym on {Libraries}"Runtime."o {CLibraries}"StdClib."o {Libraries}"ToolLibs."o {Libraries}"Interface."o -CCOPTS = -LIBS = +CCOPTS = +LIBS = KRB5ROOT= @KRB5ROOT@ KRB4=@KRB4@ INSTALL=Duplicate -y @@ -169,7 +169,7 @@ OBJS= md5.$(OBJEXT) md5glue.$(OBJEXT) md5crypto.$(OBJEXT) SRCS= $(srcdir)/md5.c $(srcdir)/md5glue.c $(srcdir)/md5crypto.c -all:: $(OBJS) +all:: $(OBJS) t_mddriver: t_mddriver.o md5.o $(CC) $(CFLAGS) $(LDFLAGS) -o t_mddriver t_mddriver.o md5.o diff --git a/testsuite/mac-mf.sed b/testsuite/mac-mf.sed index 9b08e60..680ce89 100644 --- a/testsuite/mac-mf.sed +++ b/testsuite/mac-mf.sed @@ -26,7 +26,7 @@ # Rules for .. and . elsewhere in the line # Convert ../: to ::, recur to get whole paths. /\./s,\.\./:,::,g -# Convert ../../ to ::: +# Convert ../../ to ::: /\./s,\.\./\.\./,:::,g /\./s,\.\./,::,g /\.\//s,\./,:,g @@ -152,3 +152,4 @@ /Option/s/\\Option-f/Ä/g /Option/s/\\Option-d/¶/g /Option/s/\\Option-x/Å/g +s/ $// diff --git a/testsuite/manis.sed b/testsuite/manis.sed index 5017845..51c9a50 100644 --- a/testsuite/manis.sed +++ b/testsuite/manis.sed @@ -1,6 +1,6 @@ # straight out of an autoconf-generated configure. # The input should look just like the input after this is run. # -# Protect against being on the right side of a sed subst in config.status. -s/%@/@@/; s/@%/@@/; s/%g$/@g/; /@g$/s/[\\\\&%]/\\\\&/g; +# Protect against being on the right side of a sed subst in config.status. +s/%@/@@/; s/@%/@@/; s/%g$/@g/; /@g$/s/[\\\\&%]/\\\\&/g; s/@@/%@/; s/@@/@%/; s/@g$/%g/ diff --git a/testsuite/tst-pcre.c b/testsuite/tst-pcre.c index e8c6a0b..dcff1a4 100644 --- a/testsuite/tst-pcre.c +++ b/testsuite/tst-pcre.c @@ -141,7 +141,7 @@ main (int argc, char **argv) { regex_t re; int n; - + if (!pattern_valid) { printf ("%lu: No previous valid pattern %s\n", linenum, line); diff --git a/testsuite/uniq.good b/testsuite/uniq.good index 2941bec..95fc5ee 100644 --- a/testsuite/uniq.good +++ b/testsuite/uniq.good @@ -515,7 +515,7 @@ if (min > 0) if (min > md->end_subject - eptr) if (minimize) if (number > 0) -if (number > EXTRACT_BASIC_MAX) +if (number > EXTRACT_BASIC_MAX) if (offset < md->offset_max) if (offset >= md->offset_max) if (offset_top <= offset) diff --git a/testsuite/uniq.inp b/testsuite/uniq.inp index b1eddf3..aa61062 100644 --- a/testsuite/uniq.inp +++ b/testsuite/uniq.inp @@ -1240,8 +1240,8 @@ if (minimize) if (minimize) if (minimize) if (number > 0) -if (number > EXTRACT_BASIC_MAX) -if (number > EXTRACT_BASIC_MAX) +if (number > EXTRACT_BASIC_MAX) +if (number > EXTRACT_BASIC_MAX) if (offset < md->offset_max) if (offset >= md->offset_max) if (offset_top <= offset) diff --git a/testsuite/y-bracket.good b/testsuite/y-bracket.good index 278fee9..7e1a0ac 100644 --- a/testsuite/y-bracket.good +++ b/testsuite/y-bracket.good @@ -1 +1 @@ -Are you sure (y/n)? y] +Are you sure (y/n)? y] diff --git a/testsuite/y-bracket.inp b/testsuite/y-bracket.inp index fe6124f..131c38c 100644 --- a/testsuite/y-bracket.inp +++ b/testsuite/y-bracket.inp @@ -1 +1 @@ -Are you sure (y/n)? [y] +Are you sure (y/n)? [y] diff --git a/testsuite/y-newline.good b/testsuite/y-newline.good index b0f2bfe..371b9cb 100644 --- a/testsuite/y-newline.good +++ b/testsuite/y-newline.good @@ -1 +1 @@ -Are Sou Yure (S/n)? [S] $$Are Sou Yure (S/n)? [S] +Are Sou Yure (S/n)? [S]$$Are Sou Yure (S/n)? [S] diff --git a/testsuite/y-newline.inp b/testsuite/y-newline.inp index fe6124f..131c38c 100644 --- a/testsuite/y-newline.inp +++ b/testsuite/y-newline.inp @@ -1 +1 @@ -Are you sure (y/n)? [y] +Are you sure (y/n)? [y] |