michael@13: Index: Makefile.in michael@13: --- Makefile.in.orig 2007-10-10 13:00:22 +0200 michael@13: +++ Makefile.in 2007-10-17 08:40:12 +0200 michael@13: @@ -485,7 +485,7 @@ michael@13: target_alias = @target_alias@ michael@13: ACLOCAL_AMFLAGS = -I m4 michael@13: EXTRA_DIST = ChangeLog.1 PORTS michael@13: -SUBDIRS = doc lib rmt src scripts po tests michael@13: +SUBDIRS = doc lib src michael@13: all: config.h michael@13: $(MAKE) $(AM_MAKEFLAGS) all-recursive michael@13: michael@13: Index: lib/argp-help.c michael@13: --- lib/argp-help.c.orig 2007-09-28 15:11:36 +0200 michael@13: +++ lib/argp-help.c 2007-10-17 08:40:12 +0200 michael@13: @@ -570,8 +570,7 @@ michael@13: return val; michael@13: } michael@13: michael@13: -static inline int michael@13: -__attribute__ ((always_inline)) michael@13: +static int michael@13: hol_entry_long_iterate (const struct hol_entry *entry, michael@13: int (*func)(const struct argp_option *opt, michael@13: const struct argp_option *real, michael@13: Index: src/compare.c michael@13: --- src/compare.c.orig 2007-08-26 10:56:55 +0200 michael@13: +++ src/compare.c 2007-10-17 08:40:12 +0200 michael@13: @@ -278,7 +278,7 @@ michael@13: size_t len = strlen (current_stat_info.link_name); michael@13: char *linkbuf = alloca (len + 1); michael@13: michael@13: - int status = readlink (current_stat_info.file_name, linkbuf, len + 1); michael@13: + int status = readlink (current_stat_info.file_name, linkbuf, len); michael@13: michael@13: if (status < 0) michael@13: { michael@13: Index: src/create.c michael@13: --- src/create.c.orig 2007-10-05 19:46:49 +0200 michael@13: +++ src/create.c 2007-10-17 08:40:12 +0200 michael@13: @@ -1696,7 +1696,7 @@ michael@13: if (linklen != st->stat.st_size || linklen + 1 == 0) michael@13: xalloc_die (); michael@13: buffer = (char *) alloca (linklen + 1); michael@13: - size = readlink (p, buffer, linklen + 1); michael@13: + size = readlink (p, buffer, linklen); michael@13: if (size < 0) michael@13: { michael@13: readlink_diag (p); michael@13: Index: src/incremen.c michael@13: --- src/incremen.c.orig 2007-10-01 23:19:55 +0200 michael@13: +++ src/incremen.c 2007-10-17 08:40:12 +0200 michael@13: @@ -526,6 +526,7 @@ michael@13: children = CHANGED_CHILDREN; michael@13: but changed to: */ michael@13: free (name_buffer); michael@13: + if (dirp) michael@13: free (dirp); michael@13: return NULL; michael@13: } michael@13: Index: src/tar.c michael@13: --- src/tar.c.orig 2007-09-26 23:36:58 +0200 michael@13: +++ src/tar.c 2007-10-17 08:40:12 +0200 michael@13: @@ -20,6 +20,7 @@ michael@13: 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ michael@13: michael@13: #include michael@13: +#include michael@13: michael@13: #include michael@13: #include michael@13: Index: src/utf8.c michael@13: --- src/utf8.c.orig 2007-06-27 15:30:32 +0200 michael@13: +++ src/utf8.c 2007-10-17 08:40:12 +0200 michael@13: @@ -22,6 +22,9 @@ michael@13: #include "common.h" michael@13: #ifdef HAVE_ICONV_H michael@13: # include michael@13: +#else michael@13: +# define iconv_t void * michael@13: +# define ICONV_CONST const michael@13: #endif michael@13: michael@13: #ifndef ICONV_CONST michael@13: Index: src/xheader.c michael@13: --- src/xheader.c.orig 2007-06-27 15:30:32 +0200 michael@13: +++ src/xheader.c 2007-10-17 08:40:12 +0200 michael@13: @@ -27,6 +27,10 @@ michael@13: michael@13: #include michael@13: michael@13: +#ifndef SIZE_MAX michael@13: +# define SIZE_MAX ((size_t) -1) michael@13: +#endif michael@13: + michael@13: static bool xheader_protected_pattern_p (char const *pattern); michael@13: static bool xheader_protected_keyword_p (char const *keyword); michael@13: static void xheader_set_single_keyword (char *) __attribute__ ((noreturn)); michael@13: Index: lib/strerror.c michael@13: --- lib/strerror.c.orig 2007-09-28 15:11:37 +0200 michael@13: +++ lib/strerror.c 2007-10-18 00:55:28 +0200 michael@13: @@ -23,6 +23,7 @@ michael@13: michael@13: # include michael@13: # include michael@13: +# include michael@13: michael@13: # undef strerror michael@13: