🚀 go-pugleaf

Since USG is an obsolete #define to test for these days, here are patches
to grep 1.6 which remove all traces of USG from the source code.  You'll
need to re-generate the configure file from configure.in (with autoconf).

  david d 'zoo' zuhn |    There is great disorder under the heavens,
    cygnus support   |         and the situation is excellent.
    zoo@cygnus.com   |    

--- share and enjoy ---

Only in grep-1.6: Makefile
diff -ru2 grep-1.6/Makefile.in grep-zoo/Makefile.in
--- grep-1.6/Makefile.in	Sun May 17 10:35:19 1992
+++ grep-zoo/Makefile.in	Thu Nov 19 17:47:03 1992
@@ -32,5 +32,5 @@
 # -DSTDC_HEADERS	If you have ANSI C headers and libraries.
 # -DHAVE_UNISTD_H	If you have unistd.h.
-# -DUSG			If you have System V/ANSI C string
+# -DHAVE_STRING_H	If you have System V/ANSI C string
 #			and memory functions and headers.
 # -D__CHAR_UNSIGNED__	If type `char' is unsigned.
diff -ru2 grep-1.6/configure.in grep-zoo/configure.in
--- grep-1.6/configure.in	Mon May  4 13:30:54 1992
+++ grep-zoo/configure.in	Thu Nov 19 17:47:03 1992
@@ -4,5 +4,5 @@
 AC_PROG_INSTALL
 AC_STDC_HEADERS
-AC_USG
+AC_HAVE_HEADERS(string.h)
 AC_UNISTD_H
 AC_CHAR_UNSIGNED
diff -ru2 grep-1.6/dfa.c grep-zoo/dfa.c
--- grep-1.6/dfa.c	Tue May  5 19:32:11 1992
+++ grep-zoo/dfa.c	Thu Nov 19 17:47:04 1992
@@ -22,5 +22,5 @@
 #include <assert.h>
 
-#if defined(USG) || defined(STDC_HEADERS)
+#if HAVE_STRING_H==1 || defined(STDC_HEADERS)
 #include <string.h>
 #ifndef index
diff -ru2 grep-1.6/getopt.c grep-zoo/getopt.c
--- grep-1.6/getopt.c	Mon May  4 12:17:35 1992
+++ grep-zoo/getopt.c	Thu Nov 19 17:47:52 1992
@@ -24,5 +24,5 @@
 #define alloca __builtin_alloca
 #else /* not __GNUC__ */
-#if defined(sparc) && !defined(USG) && !defined(SVR4) && !defined(__svr4__)
+#if defined(sparc) && !defined(SVR4) && !defined(__svr4__)
 #include <alloca.h>
 #else
diff -ru2 grep-1.6/grep.c grep-zoo/grep.c
--- grep-1.6/grep.c	Tue May  5 19:40:20 1992
+++ grep-zoo/grep.c	Thu Nov 19 17:47:39 1992
@@ -21,5 +21,5 @@
 #include <stdio.h>
 
-#if defined(USG) || defined(STDC_HEADERS)
+#if HAVE_STRING_H==1 || defined(STDC_HEADERS)
 #include <string.h>
 #ifndef bcopy
diff -ru2 grep-1.6/regex.c grep-zoo/regex.c
--- grep-1.6/regex.c	Sun May 17 11:12:29 1992
+++ grep-zoo/regex.c	Thu Nov 19 17:48:10 1992
@@ -32,5 +32,5 @@
 #define alloca __builtin_alloca
 #else /* not __GNUC__ */
-#if defined(sparc) && !defined(USG) && !defined(SVR4) && !defined(__svr4__)
+#if defined(sparc) && !defined(SVR4) && !defined(__svr4__)
 #include <alloca.h>
 #else
@@ -56,5 +56,5 @@
 #else  /* not emacs */
 
-#if defined(USG) || defined(STDC_HEADERS)
+#if HAVE_STRING_H==1 || defined(STDC_HEADERS)
 #include <string.h>
 #ifndef bcopy