Import GnuWin32 patch for Windows 2.5.9-6

Author: sdottaka

manifest/patch-2.5.9-5-src.mft renamed to manifest/patch-2.5.9-6-src.mft

@@ -21,9 +21,8 @@
 #### Start of system configuration section. ####
 
 srcdir = @srcdir@
-VPATH = @srcdir@
 resdir = @top_builddir@res
-vpath %.rc @top_builddir@res
+VPATH = @srcdir@ @srcdir@/pc $(resdir)
 
 @SET_MAKE@
 
@@ -90,7 +89,7 @@ OBJS = patch-res.o $(LIBOBJS) \
 	patch.$(OBJEXT) pch.$(OBJEXT) \
 	quote.$(OBJEXT) quotearg.$(OBJEXT) quotesys.$(OBJEXT) \
 	util.$(OBJEXT) version.$(OBJEXT) xmalloc.$(OBJEXT) hash.$(OBJEXT) \
-	pc_quote.$(OBJEXT)
+	pc_quote.$(OBJEXT) rename.$(OBJEXT)
 HDRS = argmatch.h backupfile.h common.h dirname.h \
 	error.h getopt.h gettext.h \
 	inp.h maketime.h partime.h pch.h \

manifest/patch-2.5.9-5-src.ver renamed to manifest/patch-2.5.9-6-src.ver

@@ -35,6 +35,13 @@
 #include <time.h>
 
 #include <sys/stat.h>
+#ifdef _WIN32
+# define _stat	_stati64
+# define stat	_stati64
+# define _fstat	_fstati64
+# define fstat	_fstati64
+# define off_t	__int64
+#endif /* _WIN32 */
 #if ! defined S_ISDIR && defined S_IFDIR
 # define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
 #endif
@@ -237,6 +244,16 @@ void *realloc ();
 #ifndef STDERR_FILENO
 #define STDERR_FILENO 2
 #endif
+#ifdef __MINGW32__
+# define fseek fseeko64
+# define fseeko     fseeko64
+# define lseek _lseeki64
+# define lseek64 _lseeki64
+# define ftell ftello64
+# define ftell64 ftello64
+# define tell  _telli64
+# define tell64 _telli64
+#endif
 #if HAVE_FSEEKO
   typedef off_t file_offset;
 # define file_seek fseeko
@@ -303,3 +320,14 @@ void *realloc ();
 #define TTY_DEVICE (_fileno(stdout))
 #endif /* _WIN32 */
 #endif
+
+#ifdef _WIN32
+# ifdef MKDIR_TAKES_ONE_ARG
+#  undefine MKDIR_TAKES_ONE_ARG
+# endif
+# ifdef mkdir
+#  undef mkdir
+# endif
+# define mkdir(name, mode) ((_mkdir) (name))
+# define rename(old,new) w32_rename(old,new)
+#endif /* _WIN32 */

src/patch/2.5.9/patch-2.5.9-src/Makefile.in

@@ -319,8 +319,6 @@ main (int argc, char **argv)
 		}
 	    }
 	}
-	printf ("got_hunk = %ld\n", got_hunk);
-	
 	if (!skip_rest_of_patch)
 	  {
 	    if (got_hunk < 0  &&  using_plan_a)
@@ -338,7 +336,6 @@ main (int argc, char **argv)
 	      }
 
 	    /* Finish spewing out the new file.  */
-		printf ("hunk = %ld\n", hunk);
 		assert (hunk);
 	    if (! spew_output (&outstate))
 	      {

src/patch/2.5.9/patch-2.5.9-src/common.h

@@ -0,0 +1,39 @@
+/* Copyright (C) 2006 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <stdio.h>
+#include <errno.h>
+#include <unistd.h>
+#include <windows.h>
+
+/* Rename the file OLD to NEW.  */
+int
+w32_rename (old, new)
+	const char *old;
+	const char *new;
+{
+	if (old == NULL || new == NULL) {
+		errno = EINVAL;
+		return -1;
+	}
+
+	if (!_access (new, F_OK))
+		unlink (new);
+	return rename (old, new);
+}
+

src/patch/2.5.9/patch-2.5.9-src/patch.c

@@ -21,9 +21,8 @@
 #### Start of system configuration section. ####
 
 srcdir = ../patch-2.5.9-src
-VPATH = ../patch-2.5.9-src
 resdir = res
-vpath %.rc res
+VPATH = ../patch-2.5.9-src ../patch-2.5.9-src/pc $(resdir)
 
 
 
@@ -34,13 +33,13 @@ INSTALL_PROGRAM = /bin/install.exe -cp
 INSTALL_DATA = /bin/install.exe -cp
 transform = s,$$,,;s,^,,;s/i386-pc-mingw32//
 
-CFLAGS =  -Wall -O3 -fms-extensions -mms-bitfields -fno-exceptions -fomit-frame-pointer -march=i386 -mcpu=i686 -ffast-math  
-CPPFLAGS =   -D__GW32__ -D_LARGEFILE_SOURCE=1 -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64     -idirafter D:/Progra~1/GnuWin32/include -idirafter g:/glibc/include   
+CFLAGS =  -Wall -O3 -fms-extensions -mms-bitfields -fno-exceptions -fomit-frame-pointer -march=i386 -ffast-math  
+CPPFLAGS =   -D__GW32__ -D_LARGEFILE_SOURCE=1 -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64     -idirafter D:/Progra~1/GnuWin32/include -Ig:/winx/include   
 DEFS = -DINSTALLDIR=\"$(prefix)\"  -DINSTALLDIR=\"$(prefix)\"  -DINSTALLDIR=\"$(prefix)\"  -DINSTALLDIR=\"$(prefix)\"  -DHAVE_CONFIG_H
 EXEEXT = .exe
 LDFLAGS =  -Wl,-s -Wl,--force-exe-suffix -Wl,--enable-auto-import -Wl,--enable-runtime-pseudo-reloc -Wl,--allow-multiple-definition -Wl,--enable-stdcall-fixup -LD:/Progra~1/GnuWin32/lib   	-Wl,--major-image-version=$(MAJOR) -Wl,--minor-image-version=$(MINOR)
-LIBOBJS = 
-LIBS =  -Wl,-s  -LD:/Progra~1/GnuWin32/lib -lgw32c  -liberty -lintl -lwsock32 -lole32 -luuid -lmsvcp60  
+LIBOBJS =  error$U.o
+LIBS =  -Wl,-s  -LD:/Progra~1/GnuWin32/lib   -liberty -lintl -lwsock32 -lole32 -luuid -lmsvcp60  
 OBJEXT = o
 PACKAGE_NAME = patch
 PACKAGE_VERSION = 2.5.9
@@ -90,7 +89,7 @@ OBJS = patch-res.o $(LIBOBJS) \
 	patch.$(OBJEXT) pch.$(OBJEXT) \
 	quote.$(OBJEXT) quotearg.$(OBJEXT) quotesys.$(OBJEXT) \
 	util.$(OBJEXT) version.$(OBJEXT) xmalloc.$(OBJEXT) hash.$(OBJEXT) \
-	pc_quote.$(OBJEXT)
+	pc_quote.$(OBJEXT) rename.$(OBJEXT)
 HDRS = argmatch.h backupfile.h common.h dirname.h \
 	error.h getopt.h gettext.h \
 	inp.h maketime.h partime.h pch.h \