Index: Makefile.in --- Makefile.in.orig 2006-10-21 17:41:31 +0200 +++ Makefile.in 2006-12-05 10:09:24 +0100 @@ -310,7 +310,7 @@ target_alias = @target_alias@ ACLOCAL_AMFLAGS = -I m4 EXTRA_DIST = ChangeLog.1 PORTS -SUBDIRS = doc lib rmt src scripts po tests +SUBDIRS = doc lib src all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive Index: lib/argp-help.c --- lib/argp-help.c.orig 2006-09-12 10:59:04 +0200 +++ lib/argp-help.c 2006-10-22 11:35:12 +0200 @@ -567,8 +567,7 @@ return val; } -static inline int -__attribute__ ((always_inline)) +static int hol_entry_long_iterate (const struct hol_entry *entry, int (*func)(const struct argp_option *opt, const struct argp_option *real, @@ -592,7 +591,7 @@ } /* Iterator that returns true for the first short option. */ -static inline int +static int until_short (const struct argp_option *opt, const struct argp_option *real, const char *domain, void *cookie) { Index: src/compare.c --- src/compare.c.orig 2006-03-20 10:23:29 +0100 +++ src/compare.c 2006-10-22 11:36:29 +0200 @@ -295,7 +295,7 @@ size_t len = strlen (current_stat_info.link_name); char *linkbuf = alloca (len + 1); - int status = readlink (current_stat_info.file_name, linkbuf, len + 1); + int status = readlink (current_stat_info.file_name, linkbuf, len); if (status < 0) { Index: src/create.c --- src/create.c.orig 2006-10-16 08:33:55 +0200 +++ src/create.c 2006-10-22 11:36:18 +0200 @@ -1600,7 +1600,7 @@ if (linklen != st->stat.st_size || linklen + 1 == 0) xalloc_die (); buffer = (char *) alloca (linklen + 1); - size = readlink (p, buffer, linklen + 1); + size = readlink (p, buffer, linklen); if (size < 0) { readlink_diag (p); Index: src/incremen.c --- src/incremen.c.orig 2006-09-08 18:42:18 +0200 +++ src/incremen.c 2006-10-22 11:43:46 +0200 @@ -479,6 +479,7 @@ children = CHANGED_CHILDREN; but changed to: */ free (name_buffer); + if (dirp) free (dirp); return NULL; } Index: src/tar.c --- src/tar.c.orig 2006-10-17 10:11:31 +0200 +++ src/tar.c 2006-10-22 11:35:12 +0200 @@ -20,6 +20,7 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include +#include #include #include Index: src/utf8.c --- src/utf8.c.orig 2005-05-18 14:23:49 +0200 +++ src/utf8.c 2006-10-22 11:35:12 +0200 @@ -22,6 +22,9 @@ #include "common.h" #ifdef HAVE_ICONV_H # include +#else +# define iconv_t void * +# define ICONV_CONST const #endif #ifndef ICONV_CONST Index: src/xheader.c --- src/xheader.c.orig 2006-10-22 11:35:12 +0200 +++ src/xheader.c 2006-10-22 11:40:55 +0200 @@ -28,6 +28,10 @@ #include +#ifndef SIZE_MAX +# define SIZE_MAX ((size_t) -1) +#endif + static bool xheader_protected_pattern_p (char const *pattern); static bool xheader_protected_keyword_p (char const *keyword); static void xheader_set_single_keyword (char *) __attribute__ ((noreturn));