comparison: openpkg/tar.patch
openpkg/tar.patch
- changeset 286
- 552d1939222f
- parent 13
- cb59d6afeb61
- child 428
- f880f219c566
equal
deleted
inserted
replaced
| 0:42c77de0c07e | 1:7ee94732d58d |
|---|---|
| 1 Index: Makefile.in | 1 Index: Makefile.in |
| 2 --- Makefile.in.orig 2007-10-10 13:00:22 +0200 | 2 --- Makefile.in.orig 2010-03-10 11:52:09.000000000 +0100 |
| 3 +++ Makefile.in 2007-10-17 08:40:12 +0200 | 3 +++ Makefile.in 2010-03-10 18:28:13.000000000 +0100 |
| 4 @@ -485,7 +485,7 @@ | 4 @@ -899,7 +899,7 @@ |
| 5 target_alias = @target_alias@ | 5 top_srcdir = @top_srcdir@ |
| 6 ACLOCAL_AMFLAGS = -I m4 | 6 ACLOCAL_AMFLAGS = -I m4 |
| 7 EXTRA_DIST = ChangeLog.1 PORTS | 7 EXTRA_DIST = ChangeLog.1 Make.rules |
| 8 -SUBDIRS = doc lib rmt src scripts po tests | 8 -SUBDIRS = doc gnu lib rmt src scripts po tests |
| 9 +SUBDIRS = doc lib src | 9 +SUBDIRS = doc gnu lib src |
| 10 all: config.h | 10 gen_start_date = 2009-03-06 |
| 11 $(MAKE) $(AM_MAKEFLAGS) all-recursive | 11 prev_change_log = ChangeLog.CVS |
| 12 | 12 changelog_dir = . |
| 13 Index: lib/argp-help.c | 13 Index: gnu/argp-help.c |
| 14 --- lib/argp-help.c.orig 2007-09-28 15:11:36 +0200 | 14 --- gnu/argp-help.c.orig 2010-03-10 11:50:33.000000000 +0100 |
| 15 +++ lib/argp-help.c 2007-10-17 08:40:12 +0200 | 15 +++ gnu/argp-help.c 2010-03-10 18:26:15.000000000 +0100 |
| 16 @@ -570,8 +570,7 @@ | 16 @@ -571,8 +571,7 @@ |
| 17 return val; | 17 return val; |
| 18 } | 18 } |
| 19 | 19 |
| 20 -static inline int | 20 -static inline int |
| 21 -__attribute__ ((always_inline)) | 21 -__attribute__ ((always_inline)) |
| 22 +static int | 22 +static int |
| 23 hol_entry_long_iterate (const struct hol_entry *entry, | 23 hol_entry_long_iterate (const struct hol_entry *entry, |
| 24 int (*func)(const struct argp_option *opt, | 24 int (*func)(const struct argp_option *opt, |
| 25 const struct argp_option *real, | 25 const struct argp_option *real, |
| 26 Index: gnu/strerror.c | |
| 27 --- gnu/strerror.c.orig 2010-03-10 11:50:43.000000000 +0100 | |
| 28 +++ gnu/strerror.c 2010-03-10 18:26:15.000000000 +0100 | |
| 29 @@ -25,6 +25,7 @@ | |
| 30 | |
| 31 # include <errno.h> | |
| 32 # include <stdio.h> | |
| 33 +# include <limits.h> | |
| 34 | |
| 35 # if GNULIB_defined_ESOCK /* native Windows platforms */ | |
| 36 # if HAVE_WINSOCK2_H | |
| 26 Index: src/compare.c | 37 Index: src/compare.c |
| 27 --- src/compare.c.orig 2007-08-26 10:56:55 +0200 | 38 --- src/compare.c.orig 2010-01-26 12:28:09.000000000 +0100 |
| 28 +++ src/compare.c 2007-10-17 08:40:12 +0200 | 39 +++ src/compare.c 2010-03-10 18:26:15.000000000 +0100 |
| 29 @@ -278,7 +278,7 @@ | 40 @@ -277,7 +277,7 @@ |
| 30 size_t len = strlen (current_stat_info.link_name); | 41 size_t len = strlen (current_stat_info.link_name); |
| 31 char *linkbuf = alloca (len + 1); | 42 char *linkbuf = alloca (len + 1); |
| 32 | 43 |
| 33 - int status = readlink (current_stat_info.file_name, linkbuf, len + 1); | 44 - int status = readlink (current_stat_info.file_name, linkbuf, len + 1); |
| 34 + int status = readlink (current_stat_info.file_name, linkbuf, len); | 45 + int status = readlink (current_stat_info.file_name, linkbuf, len); |
| 35 | 46 |
| 36 if (status < 0) | 47 if (status < 0) |
| 37 { | 48 { |
| 38 Index: src/create.c | 49 Index: src/create.c |
| 39 --- src/create.c.orig 2007-10-05 19:46:49 +0200 | 50 --- src/create.c.orig 2010-03-09 13:52:41.000000000 +0100 |
| 40 +++ src/create.c 2007-10-17 08:40:12 +0200 | 51 +++ src/create.c 2010-03-10 18:26:15.000000000 +0100 |
| 41 @@ -1696,7 +1696,7 @@ | 52 @@ -1690,7 +1690,7 @@ |
| 42 if (linklen != st->stat.st_size || linklen + 1 == 0) | 53 if (linklen != st->stat.st_size || linklen + 1 == 0) |
| 43 xalloc_die (); | 54 xalloc_die (); |
| 44 buffer = (char *) alloca (linklen + 1); | 55 buffer = (char *) alloca (linklen + 1); |
| 45 - size = readlink (p, buffer, linklen + 1); | 56 - size = readlink (p, buffer, linklen + 1); |
| 46 + size = readlink (p, buffer, linklen); | 57 + size = readlink (p, buffer, linklen); |
| 47 if (size < 0) | 58 if (size < 0) |
| 48 { | 59 { |
| 49 readlink_diag (p); | 60 file_removed_diag (p, top_level, readlink_diag); |
| 50 Index: src/incremen.c | |
| 51 --- src/incremen.c.orig 2007-10-01 23:19:55 +0200 | |
| 52 +++ src/incremen.c 2007-10-17 08:40:12 +0200 | |
| 53 @@ -526,6 +526,7 @@ | |
| 54 children = CHANGED_CHILDREN; | |
| 55 but changed to: */ | |
| 56 free (name_buffer); | |
| 57 + if (dirp) | |
| 58 free (dirp); | |
| 59 return NULL; | |
| 60 } | |
| 61 Index: src/tar.c | 61 Index: src/tar.c |
| 62 --- src/tar.c.orig 2007-09-26 23:36:58 +0200 | 62 --- src/tar.c.orig 2010-03-09 13:52:41.000000000 +0100 |
| 63 +++ src/tar.c 2007-10-17 08:40:12 +0200 | 63 +++ src/tar.c 2010-03-10 18:26:15.000000000 +0100 |
| 64 @@ -20,6 +20,7 @@ | 64 @@ -20,6 +20,7 @@ |
| 65 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ | 65 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ |
| 66 | 66 |
| 67 #include <system.h> | 67 #include <system.h> |
| 68 +#include <locale.h> | 68 +#include <locale.h> |
| 69 | 69 |
| 70 #include <fnmatch.h> | 70 #include <fnmatch.h> |
| 71 #include <argp.h> | 71 #include <argp.h> |
| 72 Index: src/utf8.c | 72 Index: src/utf8.c |
| 73 --- src/utf8.c.orig 2007-06-27 15:30:32 +0200 | 73 --- src/utf8.c.orig 2010-01-26 12:30:20.000000000 +0100 |
| 74 +++ src/utf8.c 2007-10-17 08:40:12 +0200 | 74 +++ src/utf8.c 2010-03-10 18:26:15.000000000 +0100 |
| 75 @@ -22,6 +22,9 @@ | 75 @@ -22,6 +22,9 @@ |
| 76 #include "common.h" | 76 #include "common.h" |
| 77 #ifdef HAVE_ICONV_H | 77 #ifdef HAVE_ICONV_H |
| 78 # include <iconv.h> | 78 # include <iconv.h> |
| 79 +#else | 79 +#else |
| 81 +# define ICONV_CONST const | 81 +# define ICONV_CONST const |
| 82 #endif | 82 #endif |
| 83 | 83 |
| 84 #ifndef ICONV_CONST | 84 #ifndef ICONV_CONST |
| 85 Index: src/xheader.c | 85 Index: src/xheader.c |
| 86 --- src/xheader.c.orig 2007-06-27 15:30:32 +0200 | 86 --- src/xheader.c.orig 2010-02-12 11:03:09.000000000 +0100 |
| 87 +++ src/xheader.c 2007-10-17 08:40:12 +0200 | 87 +++ src/xheader.c 2010-03-10 18:26:15.000000000 +0100 |
| 88 @@ -27,6 +27,10 @@ | 88 @@ -26,6 +26,10 @@ |
| 89 | 89 |
| 90 #include <fnmatch.h> | 90 #include "common.h" |
| 91 | 91 |
| 92 +#ifndef SIZE_MAX | 92 +#ifndef SIZE_MAX |
| 93 +# define SIZE_MAX ((size_t) -1) | 93 +# define SIZE_MAX ((size_t) -1) |
| 94 +#endif | 94 +#endif |
| 95 + | 95 + |
| 96 static bool xheader_protected_pattern_p (char const *pattern); | 96 static bool xheader_protected_pattern_p (char const *pattern); |
| 97 static bool xheader_protected_keyword_p (char const *keyword); | 97 static bool xheader_protected_keyword_p (char const *keyword); |
| 98 static void xheader_set_single_keyword (char *) __attribute__ ((noreturn)); | 98 static void xheader_set_single_keyword (char *) __attribute__ ((noreturn)); |
| 99 Index: lib/strerror.c | |
| 100 --- lib/strerror.c.orig 2007-09-28 15:11:37 +0200 | |
| 101 +++ lib/strerror.c 2007-10-18 00:55:28 +0200 | |
| 102 @@ -23,6 +23,7 @@ | |
| 103 | |
| 104 # include <string.h> | |
| 105 # include <stdio.h> | |
| 106 +# include <limits.h> | |
| 107 | |
| 108 # undef strerror | |
| 109 |
