1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89
|
Description: fix other bugs
Index: cpio-2.11+dfsg/po/Makefile.in.in
===================================================================
--- cpio-2.11+dfsg.orig/po/Makefile.in.in
+++ cpio-2.11+dfsg/po/Makefile.in.in
@@ -1,5 +1,3 @@
-# -*- buffer-read-only: t -*- vi: set ro:
-# DO NOT EDIT! GENERATED AUTOMATICALLY!
# Makefile for PO directory in any package using GNU gettext.
# Copyright (C) 1995-1997, 2000-2007 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
#
Index: cpio-2.11+dfsg/lib/sysdep.h
===================================================================
--- cpio-2.11+dfsg.orig/lib/sysdep.h
+++ cpio-2.11+dfsg/lib/sysdep.h
@@ -20,6 +20,8 @@
You should have received a copy of the GNU General Public License
along with GNU cpiio. If not, see <http://www.gnu.org/licenses/>. */
+#ifndef LIB_SYSDEP_H
+#define LIB_SYSDEP_H 1
#ifdef HAVE_PROCESS_H
# include <process.h>
@@ -141,4 +143,4 @@ int link (const char *oldname,const char
int chown (const char *filename,int owner,int group);
#endif
-
+#endif
Index: cpio-2.11+dfsg/lib/rtapelib.c
===================================================================
--- cpio-2.11+dfsg.orig/lib/rtapelib.c
+++ cpio-2.11+dfsg/lib/rtapelib.c
@@ -425,7 +425,9 @@ rmt_open__ (const char *file_name, int o
}
/* FIXME: Should somewhat validate the decoding, here. */
+#ifndef __WIN32__
if (gethostbyname (remote_host) == NULL)
+#endif
error (EXIT_ON_EXEC_ERROR, 0, _("Cannot connect to %s: resolve failed"),
remote_host);
Index: cpio-2.11+dfsg/lib/sysdep.c
===================================================================
--- cpio-2.11+dfsg.orig/lib/sysdep.c
+++ cpio-2.11+dfsg/lib/sysdep.c
@@ -187,4 +187,12 @@ chown ( const char *filename __attribute
return -1;
}
#endif
-
+#ifdef __WIN32__
+# warning "Providing stub placeholder for readlink function"
+int
+readlink ( const char *path __attribute__ ((unused)) , char *buf __attribute__ ((unused)) , size_t bufsiz __attribute__ ((unused)) )
+{
+ errno = ENOSYS;
+ return -1;
+}
+#endif
Index: cpio-2.11+dfsg/src/filetypes.h
===================================================================
--- cpio-2.11+dfsg.orig/src/filetypes.h
+++ cpio-2.11+dfsg/src/filetypes.h
@@ -81,5 +81,8 @@
#ifndef S_ISLNK
#define lstat stat
#endif
+
+#ifndef __WIN32__
int lstat ();
int stat ();
+#endif
Index: cpio-2.11+dfsg/src/main.c
===================================================================
--- cpio-2.11+dfsg.orig/src/main.c
+++ cpio-2.11+dfsg/src/main.c
@@ -734,6 +734,8 @@ main (int argc, char *argv[])
initialize_buffers ();
+ SET_BINARY_MODE (1);
+
(*copy_function) ();
if (archive_des >= 0 && rmtclose (archive_des) == -1)
|