head 1.10; access; symbols OPENPKG_E1_MP_HEAD:1.6 OPENPKG_E1_MP:1.6 OPENPKG_E1_MP_2_STABLE:1.4.8.2 OPENPKG_E1_FP:1.4.8.2 OPENPKG_2_STABLE_MP:1.5 OPENPKG_2_STABLE_20061018:1.4 OPENPKG_2_STABLE_20060622:1.4 OPENPKG_2_STABLE:1.4.0.8 OPENPKG_2_STABLE_BP:1.4 OPENPKG_2_5_RELEASE:1.4 OPENPKG_2_5_SOLID:1.4.0.6 OPENPKG_2_5_SOLID_BP:1.4 OPENPKG_2_4_RELEASE:1.4 OPENPKG_2_4_SOLID:1.4.0.4 OPENPKG_2_4_SOLID_BP:1.4 OPENPKG_CW_FP:1.4 OPENPKG_2_3_RELEASE:1.4 OPENPKG_2_3_SOLID:1.4.0.2 OPENPKG_2_3_SOLID_BP:1.4 OPENPKG_2_2_RELEASE:1.2 OPENPKG_2_2_SOLID:1.2.0.12 OPENPKG_2_2_SOLID_BP:1.2 OPENPKG_2_1_RELEASE:1.2 OPENPKG_2_1_SOLID:1.2.0.10 OPENPKG_2_1_SOLID_BP:1.2 OPENPKG_2_0_RELEASE:1.2 OPENPKG_2_0_SOLID:1.2.0.8 OPENPKG_2_0_SOLID_BP:1.2 OPENPKG_1_3_RELEASE:1.2 OPENPKG_1_3_SOLID:1.2.0.6 OPENPKG_1_3_SOLID_BP:1.2 OPENPKG_1_2_SOLID:1.2.0.4 OPENPKG_1_2_SOLID_BP:1.2 OPENPKG_1_STABLE:1.2.0.2 OPENPKG_1_STABLE_BP:1.2; locks; strict; comment @# @; 1.10 date 2009.06.20.15.46.18; author rse; state Exp; branches; next 1.9; commitid 1XEGdXNa2BPYSBSt; 1.9 date 2007.06.30.07.49.00; author rse; state Exp; branches; next 1.8; commitid nGwky3wx0oA7qUns; 1.8 date 2007.06.08.16.59.32; author rse; state Exp; branches; next 1.7; commitid FvijPnpNvM2Qa8ls; 1.7 date 2007.05.17.17.57.15; author rse; state Exp; branches; next 1.6; commitid n7Q5QWskucrtcjis; 1.6 date 2006.10.24.11.31.24; author rse; state Exp; branches; next 1.5; commitid an4xDVzfRPBDEVRr; 1.5 date 2006.10.22.09.30.54; author rse; state Exp; branches; next 1.4; commitid CImzsGxnFfgi3FRr; 1.4 date 2005.02.06.11.43.25; author rse; state Exp; branches 1.4.8.1; next 1.3; 1.3 date 2004.12.20.19.08.04; author rse; state Exp; branches; next 1.2; 1.2 date 2002.06.15.10.37.08; author rse; state dead; branches; next 1.1; 1.1 date 2002.05.29.19.56.10; author rse; state Exp; branches; next ; 1.4.8.1 date 2006.10.22.09.31.44; author rse; state Exp; branches; next 1.4.8.2; commitid vR6hDHLBWqCz3FRr; 1.4.8.2 date 2006.10.24.11.32.08; author rse; state Exp; branches; next ; commitid 1uPLDf1OiuiUEVRr; desc @@ 1.10 log @upgrading package: cpio 2.9 -> 2.10 @ text @Index: lib/rtapelib.c --- lib/rtapelib.c.orig 2009-03-19 12:47:19 +0100 +++ lib/rtapelib.c 2009-06-20 17:36:22 +0200 @@@@ -628,7 +628,7 @@@@ { char command_buffer[COMMAND_BUFFER_SIZE]; char operand_buffer[UINTMAX_STRSIZE_BOUND]; - uintmax_t u = offset < 0 ? - (uintmax_t) offset : (uintmax_t) offset; + unsigned long u = offset < 0 ? - (unsigned long) offset : (unsigned long) offset; char *p = operand_buffer + sizeof operand_buffer; *--p = 0; @@@@ -670,9 +670,9 @@@@ { char command_buffer[COMMAND_BUFFER_SIZE]; char operand_buffer[UINTMAX_STRSIZE_BOUND]; - uintmax_t u = (((struct mtop *) argument)->mt_count < 0 - ? - (uintmax_t) ((struct mtop *) argument)->mt_count - : (uintmax_t) ((struct mtop *) argument)->mt_count); + unsigned long u = (((struct mtop *) argument)->mt_count < 0 + ? - (unsigned long) ((struct mtop *) argument)->mt_count + : (unsigned long) ((struct mtop *) argument)->mt_count); char *p = operand_buffer + sizeof operand_buffer; *--p = 0; Index: lib/system.h --- lib/system.h.orig 2009-06-20 10:29:22 +0200 +++ lib/system.h 2009-06-20 17:36:22 +0200 @@@@ -425,7 +425,7 @@@@ #include -#define UINTMAX_STRSIZE_BOUND INT_BUFSIZE_BOUND (uintmax_t) +#define UINTMAX_STRSIZE_BOUND INT_BUFSIZE_BOUND (unsigned long) /* Prototypes for external functions. */ Index: src/userspec.c --- src/userspec.c.orig 2009-02-14 19:15:50 +0100 +++ src/userspec.c 2009-06-20 17:41:54 +0200 @@@@ -20,7 +20,6 @@@@ /* Written by David MacKenzie . */ #include -#include #include #include #include @ 1.9 log @upgrading package: cpio 2.8 -> 2.9 @ text @a0 12 Index: lib/argp-help.c --- lib/argp-help.c.orig 2007-06-28 19:18:55 +0200 +++ lib/argp-help.c 2007-06-30 09:44:04 +0200 @@@@ -570,7 +570,7 @@@@ return val; } -static inline int +static int __attribute__ ((always_inline)) hol_entry_long_iterate (const struct hol_entry *entry, int (*func)(const struct argp_option *opt, d2 3 a4 3 --- lib/rtapelib.c.orig 2007-06-27 15:49:45 +0200 +++ lib/rtapelib.c 2007-06-30 09:44:04 +0200 @@@@ -625,7 +625,7 @@@@ d13 1 a13 1 @@@@ -667,9 +667,9 @@@@ d27 2 a28 2 --- lib/system.h.orig 2007-06-27 15:49:45 +0200 +++ lib/system.h 2007-06-30 09:44:04 +0200 d39 5 a43 3 --- src/userspec.c.orig 2007-06-27 16:00:13 +0200 +++ src/userspec.c 2007-06-30 09:44:04 +0200 @@@@ -22,6 +22,7 @@@@ d45 4 a48 6 #ifdef __GNUC__ +#undef alloca #define alloca __builtin_alloca #else #ifdef HAVE_ALLOCA_H @ 1.8 log @upgrading package: cpio 2.7 -> 2.8 @ text @d2 2 a3 2 --- lib/argp-help.c.orig 2007-05-11 15:15:30 +0200 +++ lib/argp-help.c 2007-06-08 18:56:21 +0200 a12 9 @@@@ -595,7 +595,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) { d14 2 a15 2 --- lib/rtapelib.c.orig 2006-12-05 08:39:38 +0100 +++ lib/rtapelib.c 2007-06-08 18:56:21 +0200 d39 2 a40 2 --- lib/system.h.orig 2006-09-08 18:57:52 +0200 +++ lib/system.h 2007-06-08 18:56:21 +0200 d51 2 a52 2 --- src/userspec.c.orig 2007-05-18 12:02:31 +0200 +++ src/userspec.c 2007-06-08 18:56:21 +0200 @ 1.7 log @fix symlink creation by correctly terminating a buffer (patch comes from vendor CVS) @ text @d2 3 a4 3 --- lib/argp-help.c.orig 2006-09-12 10:59:04 +0200 +++ lib/argp-help.c 2006-10-24 13:29:40 +0200 @@@@ -567,7 +567,7 @@@@ d13 1 a13 1 @@@@ -592,7 +592,7 @@@@ d23 2 a24 2 --- lib/rtapelib.c.orig 2006-02-20 10:46:01 +0100 +++ lib/rtapelib.c 2006-10-24 13:18:23 +0200 d49 1 a49 1 +++ lib/system.h 2006-10-24 13:18:23 +0200 d60 2 a61 2 --- src/userspec.c.orig 2005-05-19 11:25:58 +0200 +++ src/userspec.c 2006-10-24 13:18:23 +0200 a69 17 ----------------------------------------------------------------------------- http://savannah.gnu.org/bugs/index.php?18094 http://savannah.gnu.org/file/cvs-diff.log?file_id=11044 Index: src/copyout.c --- src/copyout.c 27 Sep 2006 09:28:50 -0000 1.19 +++ src/copyout.c 24 Oct 2006 10:47:38 -0000 @@@@ -806,6 +806,7 @@@@ process_copy_out () free (link_name); continue; } + link_name[link_size] = 0; cpio_safer_name_suffix (link_name, false, !no_abs_paths_flag, true); link_size = strlen (link_name); @ 1.6 log @fix building under FreeBSD/amd64 where inline causes trouble @ text @d70 17 @ 1.5 log @upgrading package: cpio 2.6 -> 2.7 @ text @d1 21 d24 1 a24 1 +++ lib/rtapelib.c 2006-10-22 11:09:19 +0200 d49 1 a49 1 +++ lib/system.h 2006-10-22 11:09:58 +0200 d61 1 a61 1 +++ src/userspec.c 2006-10-22 11:09:19 +0200 @ 1.4 log @make portable to older systems (like FreeBSD 4) @ text @a0 38 Index: src/userspec.c --- src/userspec.c.orig 2004-09-06 14:23:06 +0200 +++ src/userspec.c 2004-12-20 19:58:04 +0100 @@@@ -20,6 +20,7 @@@@ #include #ifdef __GNUC__ +#undef alloca #define alloca __builtin_alloca #else #ifdef HAVE_ALLOCA_H @@@@ -72,7 +73,7 @@@@ otherwise return 0. */ static int -isnumber (const char *str) +my_isnumber (const char *str) { for (; *str; str++) if (!isdigit (*str)) @@@@ -136,7 +137,7 @@@@ if (pwd == NULL) { - if (!isnumber (u)) + if (!my_isnumber (u)) error_msg = _("invalid user"); else { @@@@ -182,7 +183,7 @@@@ grp = getgrnam (g); if (grp == NULL) { - if (!isnumber (g)) + if (!my_isnumber (g)) error_msg = _("invalid group"); else *gid = atoi (g); d2 2 a3 2 --- lib/rtapelib.c.orig 2004-09-06 15:49:42 +0200 +++ lib/rtapelib.c 2005-02-06 12:40:08 +0100 d27 3 a29 5 --- lib/system.h.orig 2004-09-06 15:49:42 +0200 +++ lib/system.h 2005-02-06 12:39:48 +0100 @@@@ -467,7 +467,7 @@@@ ((sizeof (t) * CHAR_BIT - TYPE_SIGNED (t)) * 302 / 1000 \ + 1 + TYPE_SIGNED (t)) d31 4 a34 2 -#define UINTMAX_STRSIZE_BOUND (INT_STRLEN_BOUND (uintmax_t) + 1) +#define UINTMAX_STRSIZE_BOUND (INT_STRLEN_BOUND (unsigned long) + 1) d38 11 @ 1.4.8.1 log @MFC: latest security fixed version @ text @d1 38 d40 2 a41 2 --- lib/rtapelib.c.orig 2006-02-20 10:46:01 +0100 +++ lib/rtapelib.c 2006-10-22 11:09:19 +0200 d65 5 a69 3 --- lib/system.h.orig 2006-09-08 18:57:52 +0200 +++ lib/system.h 2006-10-22 11:09:58 +0200 @@@@ -425,7 +425,7 @@@@ d71 2 a72 4 #include -#define UINTMAX_STRSIZE_BOUND INT_BUFSIZE_BOUND (uintmax_t) +#define UINTMAX_STRSIZE_BOUND INT_BUFSIZE_BOUND (unsigned long) a75 11 Index: src/userspec.c --- src/userspec.c.orig 2005-05-19 11:25:58 +0200 +++ src/userspec.c 2006-10-22 11:09:19 +0200 @@@@ -22,6 +22,7 @@@@ #include #ifdef __GNUC__ +#undef alloca #define alloca __builtin_alloca #else #ifdef HAVE_ALLOCA_H @ 1.4.8.2 log @MFC: fix building under FreeBSD/amd64 where inline causes trouble @ text @a0 21 Index: lib/argp-help.c --- lib/argp-help.c.orig 2006-09-12 10:59:04 +0200 +++ lib/argp-help.c 2006-10-24 13:29:40 +0200 @@@@ -567,7 +567,7 @@@@ return val; } -static inline int +static int __attribute__ ((always_inline)) hol_entry_long_iterate (const struct hol_entry *entry, int (*func)(const struct argp_option *opt, @@@@ -592,7 +592,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) { d3 1 a3 1 +++ lib/rtapelib.c 2006-10-24 13:18:23 +0200 d28 1 a28 1 +++ lib/system.h 2006-10-24 13:18:23 +0200 d40 1 a40 1 +++ src/userspec.c 2006-10-24 13:18:23 +0200 @ 1.3 log @upgrading package: cpio 2.5 -> 2.6 @ text @d39 37 @ 1.2 log @upgrading package: cpio 2.4.2 -> 2.5 @ text @d1 5 a5 4 --- rmt.c.orig Tue Feb 27 17:38:30 2001 +++ rmt.c Tue Feb 27 17:38:37 2001 @@@@ -75,7 +75,6 @@@@ char count[SSIZE], mode[SSIZE], pos[SSIZE], op[SSIZE]; d7 7 a13 8 extern errno; -extern char *sys_errlist[]; char resp[BUFSIZ]; FILE *debug; --- userspec.c.orig Tue Feb 27 17:38:08 2001 +++ userspec.c Tue Feb 27 17:38:13 2001 @@@@ -82,8 +82,6 @@@@ d15 9 a23 6 #define isdigit(c) ((c) >= '0' && (c) <= '9') -char *strdup (); - /* Return nonzero if STR represents an unsigned decimal integer, otherwise return 0. */ d25 14 @ 1.1 log @Finally rename all foo-X.Y.patch files to foo.patch in order to allow us to preserve history in CVS for patch files. @ text @@