From 544baf5482a56229515f24806f35ab1a847f3504 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Wed, 19 Oct 1994 03:39:33 +0000 Subject: [PATCH] merge with 1.9.1h --- lib/regex.c | 10 +++------- old/textutils/ChangeLog | 13 +++++++++++++ src/cat.c | 9 --------- src/cksum.c | 9 --------- src/comm.c | 9 --------- src/csplit.c | 9 --------- src/cut.c | 9 --------- src/expand.c | 9 --------- src/fold.c | 9 --------- src/head.c | 9 --------- src/join.c | 9 --------- src/nl.c | 9 --------- src/od.c | 9 --------- src/paste.c | 9 --------- src/pr.c | 9 --------- src/split.c | 9 --------- src/sum.c | 9 --------- src/tac.c | 9 --------- src/tail.c | 9 --------- src/tr.c | 9 --------- src/unexpand.c | 9 --------- src/uniq.c | 9 --------- src/wc.c | 9 --------- 23 files changed, 16 insertions(+), 196 deletions(-) diff --git a/lib/regex.c b/lib/regex.c index fd3c6a8852..7598572fe2 100644 --- a/lib/regex.c +++ b/lib/regex.c @@ -261,18 +261,14 @@ static int re_match_2_internal (); /* These are the command codes that appear in compiled regular expressions. Some opcodes are followed by argument bytes. A command code can specify any interpretation whatsoever for its - arguments. Zero bytes may appear in the compiled regular expression. - - The value of `exactn' is needed in search.c (search_buffer) in Emacs. - So regex.h defines a symbol `RE_EXACTN_VALUE' to be 1; the value of - `exactn' we use here must also be 1. */ + arguments. Zero bytes may appear in the compiled regular expression. */ typedef enum { no_op = 0, /* Followed by one byte giving n, then by n literal bytes. */ - exactn = 1, + exactn, /* Matches any (more or less) character. */ anychar, @@ -904,7 +900,7 @@ static const char *re_error_msg[] = #define MATCH_MAY_ALLOCATE /* The match routines may not allocate if (1) they would do it with malloc - and (2) it's not safe for htem to use malloc. */ + and (2) it's not safe for them to use malloc. */ #if (defined (C_ALLOCA) || defined (REGEX_MALLOC)) && (defined (emacs) || defined (REL_ALLOC)) #undef MATCH_MAY_ALLOCATE #endif diff --git a/old/textutils/ChangeLog b/old/textutils/ChangeLog index 972cc54224..ba08e8b5a6 100644 --- a/old/textutils/ChangeLog +++ b/old/textutils/ChangeLog @@ -1,3 +1,16 @@ +Sat Oct 08 10:44:30 1994 Jim Meyering (meyering@comco.com) + + * Makefile.in (All of them): Update from the ones in sh-utils. + From now on, rules and definitions that are comon to the fileutils, + textutils, and sh-utils will get ChangeLog entries only in the + sh-utils. + +Tue Oct 04 20:42:46 1994 Jim Meyering (meyering@comco.com) + + * od.c (my_strtoul): Set errno to zero before calling strtoul. + Otherwise, od can fail complaining about a valid integer argument. + From Andreas Schwab. + Sun Oct 02 17:57:09 1994 Jim Meyering (meyering@comco.com) * tr.c (main): Give an error and fail when squeezing repeats diff --git a/src/cat.c b/src/cat.c index 44fb7885ae..415c646068 100644 --- a/src/cat.c +++ b/src/cat.c @@ -22,16 +22,7 @@ By tege@sics.se, Torbjorn Granlund, advised by rms, Richard Stallman. */ -#ifdef HAVE_CONFIG_H -#if defined (CONFIG_BROKETS) -/* We use instead of "config.h" so that a compilation - using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h - (which it would do because it found this file in $srcdir). */ #include -#else -#include "config.h" -#endif -#endif #include #include diff --git a/src/cksum.c b/src/cksum.c index 6304c071fa..802816d960 100644 --- a/src/cksum.c +++ b/src/cksum.c @@ -40,16 +40,7 @@ except foreign language interface (4.9.5.3 of P1003.2/D11.2) support. Any inconsistency with the standard except 4.9.5.3 is a bug. */ -#ifdef HAVE_CONFIG_H -#if defined (CONFIG_BROKETS) -/* We use instead of "config.h" so that a compilation - using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h - (which it would do because it found this file in $srcdir). */ #include -#else -#include "config.h" -#endif -#endif #ifdef CRCTAB diff --git a/src/comm.c b/src/comm.c index 9f6ddc1edd..3ed34cdf22 100644 --- a/src/comm.c +++ b/src/comm.c @@ -17,16 +17,7 @@ /* Written by Richard Stallman and David MacKenzie. */ -#ifdef HAVE_CONFIG_H -#if defined (CONFIG_BROKETS) -/* We use instead of "config.h" so that a compilation - using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h - (which it would do because it found this file in $srcdir). */ #include -#else -#include "config.h" -#endif -#endif #include #include diff --git a/src/csplit.c b/src/csplit.c index b7216cfd70..fa3dd70c04 100644 --- a/src/csplit.c +++ b/src/csplit.c @@ -18,16 +18,7 @@ /* Written by Stuart Kemp, cpsrk@groper.jcu.edu.au. Modified by David MacKenzie, djm@gnu.ai.mit.edu. */ -#ifdef HAVE_CONFIG_H -#if defined (CONFIG_BROKETS) -/* We use instead of "config.h" so that a compilation - using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h - (which it would do because it found this file in $srcdir). */ #include -#else -#include "config.h" -#endif -#endif #include #include diff --git a/src/cut.c b/src/cut.c index edd68f0b84..0087880e49 100644 --- a/src/cut.c +++ b/src/cut.c @@ -59,16 +59,7 @@ A FILE of `-' means standard input. */ -#ifdef HAVE_CONFIG_H -#if defined (CONFIG_BROKETS) -/* We use instead of "config.h" so that a compilation - using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h - (which it would do because it found this file in $srcdir). */ #include -#else -#include "config.h" -#endif -#endif /* Get isblank from GNU libc. */ #define _GNU_SOURCE diff --git a/src/expand.c b/src/expand.c index 581960873d..fb6774abfc 100644 --- a/src/expand.c +++ b/src/expand.c @@ -33,16 +33,7 @@ David MacKenzie */ -#ifdef HAVE_CONFIG_H -#if defined (CONFIG_BROKETS) -/* We use instead of "config.h" so that a compilation - using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h - (which it would do because it found this file in $srcdir). */ #include -#else -#include "config.h" -#endif -#endif /* Get isblank from GNU libc. */ #define _GNU_SOURCE diff --git a/src/fold.c b/src/fold.c index 78abbc642a..307a7a941f 100644 --- a/src/fold.c +++ b/src/fold.c @@ -17,16 +17,7 @@ /* Written by David MacKenzie, djm@gnu.ai.mit.edu. */ -#ifdef HAVE_CONFIG_H -#if defined (CONFIG_BROKETS) -/* We use instead of "config.h" so that a compilation - using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h - (which it would do because it found this file in $srcdir). */ #include -#else -#include "config.h" -#endif -#endif /* Get isblank from GNU libc. */ #define _GNU_SOURCE diff --git a/src/head.c b/src/head.c index 45a2a65507..5b69dcda95 100644 --- a/src/head.c +++ b/src/head.c @@ -33,16 +33,7 @@ David MacKenzie */ -#ifdef HAVE_CONFIG_H -#if defined (CONFIG_BROKETS) -/* We use instead of "config.h" so that a compilation - using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h - (which it would do because it found this file in $srcdir). */ #include -#else -#include "config.h" -#endif -#endif #include #include diff --git a/src/join.c b/src/join.c index 8de6b94337..12c05b3b04 100644 --- a/src/join.c +++ b/src/join.c @@ -17,16 +17,7 @@ Written by Mike Haertel, mike@gnu.ai.mit.edu. */ -#ifdef HAVE_CONFIG_H -#if defined (CONFIG_BROKETS) -/* We use instead of "config.h" so that a compilation - using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h - (which it would do because it found this file in $srcdir). */ #include -#else -#include "config.h" -#endif -#endif /* Get isblank from GNU libc. */ #define _GNU_SOURCE diff --git a/src/nl.c b/src/nl.c index 976f1ff74d..ca98a2b565 100644 --- a/src/nl.c +++ b/src/nl.c @@ -18,16 +18,7 @@ /* Written by Scott Bartram (nancy!scott@uunet.uu.net) Revised by David MacKenzie (djm@gnu.ai.mit.edu) */ -#ifdef HAVE_CONFIG_H -#if defined (CONFIG_BROKETS) -/* We use instead of "config.h" so that a compilation - using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h - (which it would do because it found this file in $srcdir). */ #include -#else -#include "config.h" -#endif -#endif #include #include diff --git a/src/od.c b/src/od.c index 287bbf7180..a7ddd4a5d1 100644 --- a/src/od.c +++ b/src/od.c @@ -18,16 +18,7 @@ /* Written by Jim Meyering. */ /* AIX requires this to be the first thing in the file. */ -#ifdef HAVE_CONFIG_H -#if defined (CONFIG_BROKETS) -/* We use instead of "config.h" so that a compilation - using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h - (which it would do because it found this file in $srcdir). */ #include -#else -#include "config.h" -#endif -#endif #ifdef __GNUC__ #define alloca __builtin_alloca diff --git a/src/paste.c b/src/paste.c index fcdf52b26b..33a134f73d 100644 --- a/src/paste.c +++ b/src/paste.c @@ -38,16 +38,7 @@ A FILE of `-' means standard input. If no FILEs are given, standard input is used. */ -#ifdef HAVE_CONFIG_H -#if defined (CONFIG_BROKETS) -/* We use instead of "config.h" so that a compilation - using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h - (which it would do because it found this file in $srcdir). */ #include -#else -#include "config.h" -#endif -#endif #include #include diff --git a/src/pr.c b/src/pr.c index 734173da92..89c84975c7 100644 --- a/src/pr.c +++ b/src/pr.c @@ -94,16 +94,7 @@ -w width Set the page width to WIDTH characters. */ -#ifdef HAVE_CONFIG_H -#if defined (CONFIG_BROKETS) -/* We use instead of "config.h" so that a compilation - using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h - (which it would do because it found this file in $srcdir). */ #include -#else -#include "config.h" -#endif -#endif #include #include diff --git a/src/split.c b/src/split.c index c8fddc423c..3dcfaa0afc 100644 --- a/src/split.c +++ b/src/split.c @@ -21,16 +21,7 @@ * Implement -t CHAR or -t REGEX to specify break characters other than newline. */ -#ifdef HAVE_CONFIG_H -#if defined (CONFIG_BROKETS) -/* We use instead of "config.h" so that a compilation - using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h - (which it would do because it found this file in $srcdir). */ #include -#else -#include "config.h" -#endif -#endif #include #include diff --git a/src/sum.c b/src/sum.c index bf7003cab4..6c68c0b1a0 100644 --- a/src/sum.c +++ b/src/sum.c @@ -19,16 +19,7 @@ /* Written by Kayvan Aghaiepour and David MacKenzie. */ -#ifdef HAVE_CONFIG_H -#if defined (CONFIG_BROKETS) -/* We use instead of "config.h" so that a compilation - using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h - (which it would do because it found this file in $srcdir). */ #include -#else -#include "config.h" -#endif -#endif #include #include diff --git a/src/tac.c b/src/tac.c index f5669a91a8..d4326a604d 100644 --- a/src/tac.c +++ b/src/tac.c @@ -35,16 +35,7 @@ tac -r -s '.\| ' file */ -#ifdef HAVE_CONFIG_H -#if defined (CONFIG_BROKETS) -/* We use instead of "config.h" so that a compilation - using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h - (which it would do because it found this file in $srcdir). */ #include -#else -#include "config.h" -#endif -#endif #include #include diff --git a/src/tail.c b/src/tail.c index f96f804a1c..87983253c0 100644 --- a/src/tail.c +++ b/src/tail.c @@ -45,16 +45,7 @@ Extensions by David MacKenzie . tail -f for multiple files by Ian Lance Taylor . */ -#ifdef HAVE_CONFIG_H -#if defined (CONFIG_BROKETS) -/* We use instead of "config.h" so that a compilation - using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h - (which it would do because it found this file in $srcdir). */ #include -#else -#include "config.h" -#endif -#endif #include #include diff --git a/src/tr.c b/src/tr.c index 7e1f3a2c54..f4ec9e0e8d 100644 --- a/src/tr.c +++ b/src/tr.c @@ -17,16 +17,7 @@ /* Written by Jim Meyering, meyering@cs.utexas.edu. */ -#ifdef HAVE_CONFIG_H -#if defined (CONFIG_BROKETS) -/* We use instead of "config.h" so that a compilation - using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h - (which it would do because it found this file in $srcdir). */ #include -#else -#include "config.h" -#endif -#endif /* Get isblank from GNU libc. */ #define _GNU_SOURCE diff --git a/src/unexpand.c b/src/unexpand.c index 46d820c7ca..97d3569c32 100644 --- a/src/unexpand.c +++ b/src/unexpand.c @@ -35,16 +35,7 @@ David MacKenzie */ -#ifdef HAVE_CONFIG_H -#if defined (CONFIG_BROKETS) -/* We use instead of "config.h" so that a compilation - using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h - (which it would do because it found this file in $srcdir). */ #include -#else -#include "config.h" -#endif -#endif /* Get isblank from GNU libc. */ #define _GNU_SOURCE diff --git a/src/uniq.c b/src/uniq.c index dd36103aec..c4a05edbb8 100644 --- a/src/uniq.c +++ b/src/uniq.c @@ -17,16 +17,7 @@ /* Written by Richard Stallman and David MacKenzie. */ -#ifdef HAVE_CONFIG_H -#if defined (CONFIG_BROKETS) -/* We use instead of "config.h" so that a compilation - using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h - (which it would do because it found this file in $srcdir). */ #include -#else -#include "config.h" -#endif -#endif /* Get isblank from GNU libc. */ #define _GNU_SOURCE diff --git a/src/wc.c b/src/wc.c index 904efe5c90..62da906466 100644 --- a/src/wc.c +++ b/src/wc.c @@ -18,16 +18,7 @@ /* Written by Paul Rubin, phr@ocf.berkeley.edu and David MacKenzie, djm@gnu.ai.mit.edu. */ -#ifdef HAVE_CONFIG_H -#if defined (CONFIG_BROKETS) -/* We use instead of "config.h" so that a compilation - using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h - (which it would do because it found this file in $srcdir). */ #include -#else -#include "config.h" -#endif -#endif #include #include -- 2.47.3