Import of patch-2.4.tar.gzv2.4

4 files changed, 72 insertions, 172 deletions

diff --git a/pc/djgpp/config.h b/pc/djgpp/config.h
deleted file mode 100644
index d2f6cb5..0000000
--- a/pc/djgpp/config.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/* config.h for compiling `patch' with DJGPP for MS-DOS and MS-Windows.
-   Please keep this file as similar as possible to ../../config.h
-   to simplify maintenance later.  */
-
-/* This does most of the work; the rest of this file defines only those
-   symbols that <sys/config.h> doesn't define correctly.  */
-#include <sys/config.h>
-
-/* Define if on AIX 3.
-   System headers sometimes define this.
-   We just want to avoid a redefinition error message.  */
-#ifndef _ALL_SOURCE
-/* #undef _ALL_SOURCE */
-#endif
-
-/* Define if the closedir function returns void instead of int.  */
-/* #undef CLOSEDIR_VOID */
-
-/* Define to empty if the keyword does not work.  */
-/* #undef const */
-
-/* Define if you don't have vprintf but do have _doprnt.  */
-/* #undef HAVE_DOPRNT */
-
-/* Define if you support file names longer than 14 characters.  */
-#define HAVE_LONG_FILE_NAMES 1
-
-/* Define if you have the vprintf function.  */
-#define HAVE_VPRINTF 1
-
-/* Define if on MINIX.  */
-/* #undef _MINIX */
-
-/* Define to `int' if <sys/types.h> doesn't define.  */
-/* #undef mode_t */
-
-/* Define to `long' if <sys/types.h> doesn't define.  */
-/* #undef off_t */
-
-/* Define if the system does not provide POSIX.1 features except
-   with this defined.  */
-/* #undef _POSIX_1_SOURCE */
-
-/* Define if you need to in order for stat and other things to work.  */
-/* #undef _POSIX_SOURCE */
-
-/* Define as the return type of signal handlers (int or void).  */
-/* #undef RETSIGTYPE */
-
-/* Define to `unsigned' if <sys/types.h> doesn't define.  */
-/* #undef size_t */
-
-/* Define if you have the ANSI C header files.  */
-/* #undef STDC_HEADERS */
-
-/* Define if there is a member named d_ino in the struct describing
-   directory headers.  */
-/* #undef D_INO_IN_DIRENT */
-
-/* Define if memchr works.  */
-/* #undef HAVE_MEMCHR */
-
-/* Define if you have the _doprintf function.  */
-/* #undef HAVE__DOPRINTF */
-
-/* Define if you have the isascii function.  */
-/* #undef HAVE_ISASCII */
-
-/* Define if you have the memchr function.  */
-/* #undef HAVE_MEMCHR 1 */
-
-/* Define if you have the memcmp function.  */
-#define HAVE_MEMCMP 1
-
-/* Define if you have the mkdir function.  */
-/* #undef HAVE_MKDIR */
-
-/* Define if you have the mktemp function.  */
-#define HAVE_MKTEMP 1
-
-/* Define if you have the pathconf function.  */
-#define HAVE_PATHCONF 1
-
-/* Define if you have the rename function.  */
-/* #undef HAVE_RENAME */
-
-/* Define if you have the sigaction function.  */
-/* #undef HAVE_SIGACTION */
-
-/* Define if you have the sigprocmask function.  */
-#define HAVE_SIGPROCMASK 1
-
-/* Define if you have the sigsetmask function.  */
-/* #undef HAVE_SIGSETMASK */
-
-/* Define if you have the <dirent.h> header file.  */
-/* #undef HAVE_DIRENT_H */
-
-/* Define if you have the <fcntl.h> header file.  */
-/* #undef HAVE_FCNTL_H */
-
-/* Define if you have the <limits.h> header file.  */
-/* #undef HAVE_LIMITS_H */
-
-/* Define if you have the <ndir.h> header file.  */
-/* #undef HAVE_NDIR_H */
-
-/* Define if you have the <string.h> header file.  */
-/* #undef HAVE_STRING_H */
-
-/* Define if you have the <sys/dir.h> header file.  */
-/* #undef HAVE_SYS_DIR_H */
-
-/* Define if you have the <sys/ndir.h> header file.  */
-/* #undef HAVE_SYS_NDIR_H */
-
-/* Define if you have the <unistd.h> header file.  */
-/* #undef HAVE_UNISTD_H */
-
-/* Define if you have the <varargs.h> header file.  */
-/* #undef HAVE_VARARGS_H */
-
-
-/* PC-specific definitions */
-
-#define chdir chdir_safer
-int chdir_safer (char const *);
-
-#define FILESYSTEM_PREFIX_LEN(f) ((f)[0] && (f)[1] == ':' ? 2 : 0)
-#define ISSLASH(c) ((c) == '/'  ||  (c) == '\\')
-
-#define HAVE_DOS_FILE_NAMES 1
-
-#define HAVE_SETMODE 1
-#ifdef WIN32
-# define setmode _setmode
-#endif
-
-#define TMPDIR "c:"
diff --git a/pc/djgpp/config.sed b/pc/djgpp/config.sed
index cc449fd..f97d210 100644
--- a/pc/djgpp/config.sed
+++ b/pc/djgpp/config.sed
@@ -1,35 +1,38 @@
-# Edit Makefile.in to produce Makefile for DJGPP v2
-#	$Id: config.sed,v 1.4 1997/05/26 17:52:29 eggert Exp $
+1c\
+/* config.h for compiling `patch' with DJGPP for MS-DOS and MS-Windows.\
+   Please keep this file as similar as possible to ../../config.h\
+   to simplify maintenance later.  */\
+\
+/* This does most of the work; the rest of this file defines only those\
+   symbols that <sys/config.h> doesn't define correctly.  */\
+#include <sys/config.h>
 
-1i\
-# Makefile generated by "configure.bat" for DJGPP v2\
+s/#undef HAVE_LONG_FILE_NAMES/#define HAVE_LONG_FILE_NAMES 1/
+s/#undef HAVE_MEMCMP/#define HAVE_MEMCMP 1/
+s/#undef HAVE_MKTEMP/#define HAVE_MKTEMP 1/
+s/#undef HAVE_PATHCONF/#define HAVE_PATHCONF 1/
+s/#undef HAVE_RAISE/#define HAVE_RAISE 1/
+s/#undef HAVE_SIGPROCMASK/#define HAVE_SIGPROCMASK 1/
+s/#undef HAVE_UTIME_H/#define HAVE_UTIME_H 1/
+s/#undef HAVE_STRUCT_UTIMBUF/#define HAVE_STRUCT_UTIMBUF 1/
+s/#undef HAVE_VPRINTF/#define HAVE_VPRINTF 1/
 
-/@SET_MAKE@/d
-
-s|@CC@|gcc|g
-s|@ed_PROGRAM@|ed|g
-s|@INSTALL@|${DJDIR}/bin/ginstall -c|g
-s|@INSTALL_PROGRAM@|${INSTALL}|g
-s|@INSTALL_DATA@|${INSTALL} -m 644|g
-
-s|@CFLAGS@|-g -O2|g
-s|@CPPFLAGS@|-I$(srcdir)/pc/djgpp|g
-s|@DEFS@|-DHAVE_CONFIG_H|g
-s|@LDFLAGS@||g
-s|@LIBOBJS@|getopt1.o getopt.o chdirsaf.o|g
-s|@LIBS@||g
-s|@PACKAGE@|patch|g
-/@VERSION@/d
-
-s|@prefix@|${DJDIR}|g
-s|@exec_prefix@|${prefix}|g
-
-/^CONFIG_HDRS *=/s|=.*|= pc/djgpp/config.h|
-/^CONFIG_STATUS *=/s|=.*|= $(srcdir)/pc/djgpp/configure.bat|
-/^	\$(SHELL) \$(CONFIG_STATUS) *$/s//	$(CONFIG_STATUS) $(srcdir)/
+s,#undef.*,/* & */,
 
 $a\
-chdirsaf.o: chdirsaf.c\
-# Use sed instead of cp, since cp might not be installed.\
-chdirsaf.c: pc/chdirsaf.c; sed -e '' $? > $@\
-distclean::; rm -f chdirsaf.c
+/* DGJPP-specific definitions */\
+\
+#define chdir chdir_safer\
+int chdir_safer (char const *);\
+\
+#define FILESYSTEM_PREFIX_LEN(f) ((f)[0] && (f)[1] == ':' ? 2 : 0)\
+#define ISSLASH(c) ((c) == '/'  ||  (c) == '\\\\')\
+\
+#define HAVE_DOS_FILE_NAMES 1\
+\
+#define HAVE_SETMODE 1\
+#ifdef WIN32\
+# define setmode _setmode\
+#endif\
+\
+#define TMPDIR "c:"
diff --git a/pc/djgpp/configure.bat b/pc/djgpp/configure.bat
index c5313ea..c4e06d1 100644
--- a/pc/djgpp/configure.bat
+++ b/pc/djgpp/configure.bat
@@ -1,6 +1,6 @@
 @echo off

 Rem	Configure patch for DJGPP v2.

-Rem	$Id: configure.bat,v 1.3 1997/05/26 17:52:29 eggert Exp $

+Rem	$Id: configure.bat,v 1.4 1997/06/17 06:52:12 eggert Exp $

 

 Rem	The DOS shell has fixed-size environment storage.

 Rem	When the environment is full, the shell prints

@@ -15,7 +15,7 @@ if not "%1" == "" set srcdir=%1
 if not "%1" == "" if not "%srcdir%" == "%1" goto SmallEnv

 

 Rem	Create Makefile

-sed -f %srcdir%/pc/djgpp/config.sed -e "s,@srcdir@,%srcdir%,g" %srcdir%/Makefile.in >Makefile

+sed -f %srcdir%/pc/djgpp/configure.sed -e "s,@srcdir@,%srcdir%,g" %srcdir%/Makefile.in >Makefile

 sed -n -e "/^VERSION/p" %srcdir%/configure.in >>Makefile

 

 goto Exit

diff --git a/pc/djgpp/configure.sed b/pc/djgpp/configure.sed
new file mode 100644
index 0000000..6f14c38
--- /dev/null
+++ b/pc/djgpp/configure.sed
@@ -0,0 +1,36 @@
+# Edit Makefile.in to produce Makefile for DJGPP v2
+#	$Id: configure.sed,v 1.8 1997/06/18 06:26:43 eggert Exp $
+
+1i\
+# Makefile generated by "configure.bat" for DJGPP v2\
+
+/@SET_MAKE@/d
+
+s|@CC@|gcc|g
+s|@ed_PROGRAM@|ed|g
+s|@INSTALL@|${DJDIR}/bin/ginstall -c|g
+s|@INSTALL_PROGRAM@|${INSTALL}|g
+s|@INSTALL_DATA@|${INSTALL} -m 644|g
+s|@program_transform_name@||g
+
+s|@CFLAGS@|-g -O2|g
+s|@CPPFLAGS@|-I$(srcdir)/pc/djgpp|g
+s|@DEFS@|-DHAVE_CONFIG_H|g
+s|@LDFLAGS@||g
+s|@LIBOBJS@|getopt1.o getopt.o chdirsaf.o|g
+s|@LIBS@||g
+s|@PACKAGE@|patch|g
+/@VERSION@/d
+
+s|@prefix@|${DJDIR}|g
+s|@exec_prefix@|${prefix}|g
+
+/^CONFIG_STATUS *=/s|=.*|= $(srcdir)/pc/djgpp/configure.bat|
+/^	\$(SHELL) \$(CONFIG_STATUS) *$/s//	$(CONFIG_STATUS) $(srcdir)/
+
+$a\
+config.h: config.hin pc/djgpp/config.sed; sed -f $(srcdir)/pc/djgpp/config.sed $(srcdir)/config.hin >$@\
+chdirsaf.o: chdirsaf.c\
+# Use sed instead of cp, since cp might not be installed.\
+chdirsaf.c: pc/chdirsaf.c; sed -e '' $? > $@\
+distclean::; rm -f chdirsaf.c