head 1.13; access; symbols OPENPKG_E1_MP_HEAD:1.13 OPENPKG_E1_MP:1.13 OPENPKG_E1_MP_2_STABLE:1.10.2.2 OPENPKG_E1_FP:1.10.2.2 OPENPKG_2_STABLE_MP:1.13 OPENPKG_2_STABLE_20061018:1.10.2.1 OPENPKG_2_STABLE_20060622:1.10 OPENPKG_2_STABLE:1.10.0.2 OPENPKG_2_STABLE_BP:1.10 OPENPKG_2_5_RELEASE:1.9 OPENPKG_2_5_SOLID:1.9.0.10 OPENPKG_2_5_SOLID_BP:1.9 OPENPKG_2_4_RELEASE:1.9 OPENPKG_2_4_SOLID:1.9.0.8 OPENPKG_2_4_SOLID_BP:1.9 OPENPKG_CW_FP:1.9 OPENPKG_2_3_RELEASE:1.9 OPENPKG_2_3_SOLID:1.9.0.6 OPENPKG_2_3_SOLID_BP:1.9 OPENPKG_2_2_RELEASE:1.9 OPENPKG_2_2_SOLID:1.9.0.4 OPENPKG_2_2_SOLID_BP:1.9 OPENPKG_2_1_RELEASE:1.9 OPENPKG_2_1_SOLID:1.9.0.2 OPENPKG_2_1_SOLID_BP:1.9 OPENPKG_2_0_RELEASE:1.6 OPENPKG_2_0_SOLID:1.6.0.2 OPENPKG_2_0_SOLID_BP:1.6 OPENPKG_1_3_RELEASE:1.1.2.1 OPENPKG_1_3_SOLID:1.1.2.1.0.2 OPENPKG_1_3_SOLID_BP:1.1.2.1 OPENPKG_1_STABLE_MP:1.2 OPENPKG_1_2_RELEASE:1.1 OPENPKG_1_2_SOLID:1.1.0.4 OPENPKG_1_2_SOLID_BP:1.1 OPENPKG_1_STABLE:1.1.0.2 OPENPKG_1_STABLE_BP:1.1; locks; strict; comment @# @; 1.13 date 2006.10.23.07.47.33; author rse; state Exp; branches; next 1.12; commitid nzKe4JdlnxsQrMRr; 1.12 date 2006.10.01.15.05.20; author rse; state Exp; branches; next 1.11; commitid BJww4x6V1aRRzZOr; 1.11 date 2006.07.15.12.56.41; author cs; state Exp; branches; next 1.10; commitid rbo7bBMM2jMbnXEr; 1.10 date 2005.11.21.09.41.01; author thl; state Exp; branches 1.10.2.1; next 1.9; commitid TWTQXsz0Q3ioSBar; 1.9 date 2004.05.26.12.50.18; author tho; state Exp; branches; next 1.8; 1.8 date 2004.04.21.13.19.50; author rse; state Exp; branches; next 1.7; 1.7 date 2004.03.24.15.10.20; author cs; state Exp; branches; next 1.6; 1.6 date 2004.01.17.20.05.11; author rse; state Exp; branches 1.6.2.1; next 1.5; 1.5 date 2003.10.23.12.50.24; author thl; state Exp; branches; next 1.4; 1.4 date 2003.09.12.11.26.07; author rse; state Exp; branches; next 1.3; 1.3 date 2003.08.01.08.07.49; author rse; state Exp; branches; next 1.2; 1.2 date 2003.02.23.19.50.03; author rse; state Exp; branches; next 1.1; 1.1 date 2003.01.12.12.19.07; author rse; state Exp; branches 1.1.2.1 1.1.4.1; next ; 1.10.2.1 date 2006.10.16.14.49.01; author rse; state Exp; branches; next 1.10.2.2; commitid iZxwRSmmWscPXUQr; 1.10.2.2 date 2006.10.23.07.49.04; author rse; state Exp; branches; next ; commitid L6owfud5vWAmsMRr; 1.6.2.1 date 2004.04.05.14.16.09; author rse; state Exp; branches; next ; 1.1.2.1 date 2003.07.24.20.43.55; author rse; state Exp; branches 1.1.2.1.2.1; next ; 1.1.2.1.2.1 date 2003.10.21.08.14.29; author rse; state Exp; branches; next 1.1.2.1.2.2; 1.1.2.1.2.2 date 2003.10.23.13.09.30; author thl; state Exp; branches; next ; 1.1.4.1 date 2003.10.23.13.14.40; author thl; state Exp; branches; next ; desc @@ 1.13 log @upgrading package: coreutils 6.3 -> 6.4 @ text @Index: doc/Makefile.in --- doc/Makefile.in.orig 2006-10-22 22:36:24 +0200 +++ doc/Makefile.in 2006-10-23 09:43:48 +0200 @@@@ -824,7 +824,7 @@@@ mv t-$@@ $@@ $(DVIS): $(EXTRA_DIST) -$(INFO_DEPS): $(EXTRA_DIST) +###$(INFO_DEPS): $(EXTRA_DIST) # List words/regexps here that should not appear in the texinfo documentation. # E.g., use @@sc{nul}, not `NUL' Index: lib/mountlist.c --- lib/mountlist.c.orig 2006-09-14 11:53:59 +0200 +++ lib/mountlist.c 2006-10-23 09:43:48 +0200 @@@@ -168,6 +168,11 @@@@ #if MOUNTED_GETMNTINFO +# if defined(__NetBSD__) && (__NetBSD_Version__ > 299000000) +# define statfs statvfs +# define HAVE_F_FSTYPENAME_IN_STATFS 1 +# endif + # if ! HAVE_STRUCT_STATFS_F_FSTYPENAME static char * fstype_to_string (short int t) Index: src/nice.c --- src/nice.c.orig 2006-10-22 18:54:15 +0200 +++ src/nice.c 2006-10-23 09:43:48 +0200 @@@@ -20,6 +20,7 @@@@ #include #include #include +#include #include #include "system.h" Index: src/stat.c --- src/stat.c.orig 2006-10-22 18:54:15 +0200 +++ src/stat.c 2006-10-23 09:43:48 +0200 @@@@ -148,6 +148,12 @@@@ #define hextobin(c) ((c) >= 'a' && (c) <= 'f' ? (c) - 'a' + 10 : \ (c) >= 'A' && (c) <= 'F' ? (c) - 'A' + 10 : (c) - '0') +#if (defined(__NetBSD__) && (__NetBSD_Version__ > 299000000)) +#include +#define statfs statvfs +#define STATXFS_FILE_SYSTEM_TYPE_MEMBER_NAME f_fstypename +#endif + #define PROGRAM_NAME "stat" #define AUTHORS "Michael Meskes" @ 1.12 log @upgrading package: coreutils 5.97 -> 6.3 @ text @d2 3 a4 3 --- doc/Makefile.in.orig 2006-09-30 11:09:22 +0200 +++ doc/Makefile.in 2006-10-01 16:53:13 +0200 @@@@ -725,7 +725,7 @@@@ d15 1 a15 1 +++ lib/mountlist.c 2006-10-01 16:56:44 +0200 d29 2 a30 2 --- src/nice.c.orig 2005-12-28 11:28:13 +0100 +++ src/nice.c 2006-10-01 16:53:13 +0200 d40 3 a42 3 --- src/stat.c.orig 2006-10-01 16:53:13 +0200 +++ src/stat.c 2006-10-01 16:53:13 +0200 @@@@ -154,6 +154,12 @@@@ @ 1.11 log @fix build on NetBSD @ text @d1 4 a4 3 --- doc/Makefile.in.orig 2004-03-11 09:57:59.000000000 +0100 +++ doc/Makefile.in 2004-04-21 15:11:16.000000000 +0200 @@@@ -600,7 +600,7 @@@@ d12 5 a16 29 check-texinfo: --- src/stat.c.orig Sun Dec 1 10:48:21 2002 +++ src/stat.c Sun Jan 12 11:30:01 2003 @@@@ -43,6 +43,12 @@@@ # endif #endif +/* FreeBSD 5.0 need this for struct statfs */ +#if HAVE_SYS_MOUNT_H +# include +# include +#endif + #include "system.h" #include "closeout.h" --- src/nice.c.orig 2003-08-10 19:43:35.000000000 +0200 +++ src/nice.c 2003-09-10 20:03:27.000000000 +0200 @@@@ -23,6 +23,7 @@@@ #include #include +#include #include #include "system.h" --- lib/mountlist.c.orig Mon Jan 26 03:58:12 2004 +++ lib/mountlist.c @@@@ -173,6 +173,11 @@@@ xatoi (char *cp) d25 1 a25 1 # if ! HAVE_F_FSTYPENAME_IN_STATFS d27 18 a44 6 fstype_to_string (short t) --- src/stat.c.orig Thu Feb 5 08:46:12 2004 +++ src/stat.c @@@@ -86,6 +86,12 @@@@ # endif #endif @ 1.10 log @upgrading package: coreutils 5.2.1 -> 5.93 @ text @d37 29 a65 1 @ 1.10.2.1 log @Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class) @ text @d1 3 a3 4 Index: doc/Makefile.in --- doc/Makefile.in.orig 2006-09-30 11:09:22 +0200 +++ doc/Makefile.in 2006-10-01 16:53:13 +0200 @@@@ -725,7 +725,7 @@@@ d11 12 a22 12 # E.g., use @@sc{nul}, not `NUL' Index: lib/mountlist.c --- lib/mountlist.c.orig 2006-09-14 11:53:59 +0200 +++ lib/mountlist.c 2006-10-01 16:56:44 +0200 @@@@ -168,6 +168,11 @@@@ #if MOUNTED_GETMNTINFO +# if defined(__NetBSD__) && (__NetBSD_Version__ > 299000000) +# define statfs statvfs +# define HAVE_F_FSTYPENAME_IN_STATFS 1 +# endif d24 8 a31 9 # if ! HAVE_STRUCT_STATFS_F_FSTYPENAME static char * fstype_to_string (short int t) Index: src/nice.c --- src/nice.c.orig 2005-12-28 11:28:13 +0100 +++ src/nice.c 2006-10-01 16:53:13 +0200 @@@@ -20,6 +20,7 @@@@ #include #include d37 1 a37 16 Index: src/stat.c --- src/stat.c.orig 2006-10-01 16:53:13 +0200 +++ src/stat.c 2006-10-01 16:53:13 +0200 @@@@ -154,6 +154,12 @@@@ #define hextobin(c) ((c) >= 'a' && (c) <= 'f' ? (c) - 'a' + 10 : \ (c) >= 'A' && (c) <= 'F' ? (c) - 'A' + 10 : (c) - '0') +#if (defined(__NetBSD__) && (__NetBSD_Version__ > 299000000)) +#include +#define statfs statvfs +#define STATXFS_FILE_SYSTEM_TYPE_MEMBER_NAME f_fstypename +#endif + #define PROGRAM_NAME "stat" #define AUTHORS "Michael Meskes" @ 1.10.2.2 log @MFC: latest version @ text @d2 3 a4 3 --- doc/Makefile.in.orig 2006-10-22 22:36:24 +0200 +++ doc/Makefile.in 2006-10-23 09:43:48 +0200 @@@@ -824,7 +824,7 @@@@ d15 1 a15 1 +++ lib/mountlist.c 2006-10-23 09:43:48 +0200 d29 2 a30 2 --- src/nice.c.orig 2006-10-22 18:54:15 +0200 +++ src/nice.c 2006-10-23 09:43:48 +0200 d40 3 a42 3 --- src/stat.c.orig 2006-10-22 18:54:15 +0200 +++ src/stat.c 2006-10-23 09:43:48 +0200 @@@@ -148,6 +148,12 @@@@ @ 1.9 log @modifying package: coreutils-5.2.1 20040421 -> 20040526 @ text @d1 11 a26 41 --- src/test.c.orig Mon Feb 10 10:19:09 2003 +++ src/test.c Sun Feb 23 20:44:50 2003 @@@@ -139,7 +139,7 @@@@ /* Do the same thing access(2) does, but use the effective uid and gid. */ static int -eaccess (char const *file, int mode) +my_eaccess (char const *file, int mode) { static int have_ids; static uid_t uid, euid; @@@@ -172,7 +172,7 @@@@ return result; } #else -# define eaccess(F, M) euidaccess (F, M) +# define my_eaccess(F, M) euidaccess (F, M) #endif /* Increment our position in the argument list. Check that we're not @@@@ -635,17 +635,17 @@@@ case 'r': /* file is readable? */ unary_advance (); - value = -1 != eaccess (argv[pos - 1], R_OK); + value = -1 != my_eaccess (argv[pos - 1], R_OK); return (TRUE == value); case 'w': /* File is writable? */ unary_advance (); - value = -1 != eaccess (argv[pos - 1], W_OK); + value = -1 != my_eaccess (argv[pos - 1], W_OK); return (TRUE == value); case 'x': /* File is executable? */ unary_advance (); - value = -1 != eaccess (argv[pos - 1], X_OK); + value = -1 != my_eaccess (argv[pos - 1], X_OK); return (TRUE == value); case 'O': /* File is owned by you? */ a37 176 --- src/date.c.orig 2004-02-05 10:36:07.000000000 +0100 +++ src/date.c 2004-03-24 15:22:04.000000000 +0100 @@@@ -299,7 +299,8 @@@@ int n_args; int status; int option_specified_date; - char const *short_options = (posix2_version () < 200112 + char const *short_options = (posix2_version () < 200112 || + !getenv ("POSIXLY_CORRECT") ? COMMON_SHORT_OPTIONS "I::" : COMMON_SHORT_OPTIONS "I:"); --- src/expand.c.orig 2004-01-21 23:27:02.000000000 +0100 +++ src/expand.c 2004-03-24 15:23:21.000000000 +0100 @@@@ -406,6 +406,8 @@@@ } if (obsolete_tablist && 200112 <= posix2_version ()) + if (obsolete_tablist && 200112 <= posix2_version () && + getenv ("POSIXLY_CORRECT")) { error (0, 0, _("`-LIST' option is obsolete; use `-t LIST'")); usage (EXIT_FAILURE); --- src/fold.c.orig 2004-01-21 23:27:02.000000000 +0100 +++ src/fold.c 2004-03-24 15:26:20.000000000 +0100 @@@@ -270,6 +270,7 @@@@ memcpy (s + 2, a + 1, len_a); argv[i] = s; if (200112 <= posix2_version ()) + if (200112 <= posix2_version () && getenv ("POSIXLY_CORRECT")) { error (0, 0, _("`%s' option is obsolete; use `%s'"), a, s); usage (EXIT_FAILURE); --- src/head.c.orig 2004-01-21 23:27:02.000000000 +0100 +++ src/head.c 2004-03-24 15:27:04.000000000 +0100 @@@@ -996,6 +996,7 @@@@ } if (200112 <= posix2_version ()) + if (200112 <= posix2_version () && getenv ("POSIXLY_CORRECT")) { error (0, 0, _("`-%s' option is obsolete; use `-%c %.*s%.*s%s'"), n_string, count_lines ? 'n' : 'c', --- src/nice.c.orig 2004-01-22 00:23:24.000000000 +0100 +++ src/nice.c 2004-03-24 15:28:51.000000000 +0100 @@@@ -107,7 +107,7 @@@@ char *s = argv[i]; if (s[0] == '-' && s[1] == '-' && ISDIGIT (s[2]) - && posix2_version () < 200112) + && (posix2_version () < 200112 || !getenv ("POSIXLY_CORRECT"))) { if (xstrtol (&s[2], NULL, 10, &adjustment, "") != LONGINT_OK) error (EXIT_FAIL, 0, _("invalid option `%s'"), s); @@@@ -118,7 +118,7 @@@@ } else if (s[0] == '-' && (ISDIGIT (s[1]) || (s[1] == '+' && ISDIGIT (s[2]))) - && posix2_version () < 200112) + && (posix2_version () < 200112 || !getenv ("POSIXLY_CORRECT"))) { if (s[1] == '+') ++s; --- src/od.c.orig 2004-01-21 23:27:02.000000000 +0100 +++ src/od.c 2004-03-24 15:29:59.000000000 +0100 @@@@ -1621,7 +1621,8 @@@@ int width_specified = 0; int n_failed_decodes = 0; int err; - char const *short_options = (posix2_version () < 200112 + char const *short_options = (posix2_version () < 200112 || + !getenv ("POSIXLY_CORRECT") ? COMMON_SHORT_OPTIONS "s::w::" : COMMON_SHORT_OPTIONS "s:w:"); --- src/pr.c.orig 2004-01-21 23:27:02.000000000 +0100 +++ src/pr.c 2004-03-24 15:30:48.000000000 +0100 @@@@ -854,7 +854,8 @@@@ int old_w = FALSE; int old_s = FALSE; char **file_names; - char const *short_options = (posix2_version () < 200112 + char const *short_options = (posix2_version () < 200112 || + !getenv ("POSIXLY_CORRECT") ? COMMON_SHORT_OPTIONS "S::" : COMMON_SHORT_OPTIONS "S:"); --- src/sort.c.orig 2004-02-17 11:47:35.000000000 +0100 +++ src/sort.c 2004-03-24 15:31:54.000000000 +0100 @@@@ -2219,7 +2219,7 @@@@ bool mergeonly = false; int nfiles = 0; bool posixly_correct = (getenv ("POSIXLY_CORRECT") != NULL); - bool obsolete_usage = (posix2_version () < 200112); + bool obsolete_usage = (posix2_version () < 200112) || !posixly_correct; char const *short_options = (obsolete_usage ? COMMON_SHORT_OPTIONS "y::" : COMMON_SHORT_OPTIONS "y:"); --- src/split.c.orig 2004-01-21 23:27:02.000000000 +0100 +++ src/split.c 2004-03-24 15:32:48.000000000 +0100 @@@@ -498,6 +498,8 @@@@ } if (digits_optind && 200112 <= posix2_version ()) + if (digits_optind && 200112 <= posix2_version () + && getenv ("POSIXLY_CORRECT")) { char buffer[INT_BUFSIZE_BOUND (uintmax_t)]; char const *a = umaxtostr (n_units, buffer); --- src/tail.c.orig 2004-01-21 23:27:02.000000000 +0100 +++ src/tail.c 2004-03-24 15:33:32.000000000 +0100 @@@@ -1364,7 +1364,7 @@@@ if (argc < 2) return 0; - obsolete_usage = (posix2_version () < 200112); + obsolete_usage = (posix2_version () < 200112) || !getenv ("POSIXLY_CORRECT"); /* If P starts with `+' and the POSIX version predates 1003.1-2001, or if P starts with `-N' (where N is a digit), or `-l', then it --- src/touch.c.orig 2004-01-21 23:27:02.000000000 +0100 +++ src/touch.c 2004-03-24 15:34:28.000000000 +0100 @@@@ -385,7 +385,7 @@@@ /* The obsolete `MMDDhhmm[YY]' form is valid IFF there are two or more non-option arguments. */ if (!date_set && 2 <= argc - optind && !STREQ (argv[optind - 1], "--") - && posix2_version () < 200112) + && (posix2_version () < 200112 || !getenv ("POSIXLY_CORRECT"))) { if (posixtime (&newtime.tv_sec, argv[optind], PDS_TRAILING_YEAR)) { --- src/unexpand.c.orig 2004-01-21 23:27:02.000000000 +0100 +++ src/unexpand.c 2004-03-24 15:35:09.000000000 +0100 @@@@ -461,7 +461,8 @@@@ } } - if (obsolete_tablist && 200112 <= posix2_version ()) + if (obsolete_tablist && 200112 <= posix2_version () + && getenv ("POSIXLY_CORRECT")) { error (0, 0, _("`-LIST' option is obsolete; use `--first-only -t LIST'")); --- src/uniq.c.orig 2004-01-21 23:27:02.000000000 +0100 +++ src/uniq.c 2004-03-24 15:36:59.000000000 +0100 @@@@ -446,7 +446,7 @@@@ { unsigned long int size; if (optarg[0] == '+' - && posix2_version () < 200112 + && (posix2_version () < 200112 || !getenv ("POSIXLY_CORRECT")) && xstrtoul (optarg, NULL, 10, &size, "") == LONGINT_OK && size <= SIZE_MAX) skip_chars = size; @@@@ -531,7 +531,8 @@@@ } } - if (obsolete_skip_fields && 200112 <= posix2_version ()) + if (obsolete_skip_fields && 200112 <= posix2_version () + && getenv ("POSIXLY_CORRECT")) { error (0, 0, _("`-%lu' option is obsolete; use `-f %lu'"), (unsigned long) skip_fields, (unsigned long) skip_fields); Index: doc/Makefile.in --- doc/Makefile.in.orig 2004-03-11 09:57:59.000000000 +0100 +++ doc/Makefile.in 2004-04-21 15:11:16.000000000 +0200 @@@@ -600,7 +600,7 @@@@ mv t-$@@ $@@ $(DVIS): $(EXTRA_DIST) -$(INFO_DEPS): $(EXTRA_DIST) +###$(INFO_DEPS): $(EXTRA_DIST) # List words/regexps here that should not appear in the texinfo documentation. check-texinfo: @ 1.8 log @make sure makeinfo is not run (because it is run unconditionally and actually not needed at all) and remove some hacks from the past which are no longer needed @ text @d235 2 a236 2 @@@@ -319,29 +319,6 @@@@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh d238 3 a240 24 .texi.info: - restore=: && \ - backupdir="$(am__leading_dot)am$$$$" && \ - am__cwd=`pwd` && cd $(srcdir) && \ - rm -rf $$backupdir && mkdir $$backupdir && \ - for f in $@@ $@@-[0-9] $@@-[0-9][0-9] $(@@:.info=).i[0-9] $(@@:.info=).i[0-9][0-9]; do \ - if test -f $$f; then \ - mv $$f $$backupdir; \ - restore=mv; \ - fi; \ - done; \ - cd "$$am__cwd"; \ - if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ - -o $@@ $<; \ - then \ - rc=0; \ - cd $(srcdir); \ - else \ - rc=$$?; \ - cd $(srcdir) && \ - $$restore $$backupdir/* `echo "./$@@" | sed 's|[^/]*$$||'`; \ - fi; \ - rm -rf $$backupdir; \ - exit $$rc d242 2 a243 2 .texi.dvi: TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ @ 1.7 log @preserve legacy options @ text @d232 33 @ 1.6 log @upgrading package: coreutils 5.0.91 -> 5.1.1 @ text @d68 164 @ 1.6.2.1 log @MFC: run-time POSIX mode adjustments for better backward compatibility @ text @a67 164 --- src/date.c.orig 2004-02-05 10:36:07.000000000 +0100 +++ src/date.c 2004-03-24 15:22:04.000000000 +0100 @@@@ -299,7 +299,8 @@@@ int n_args; int status; int option_specified_date; - char const *short_options = (posix2_version () < 200112 + char const *short_options = (posix2_version () < 200112 || + !getenv ("POSIXLY_CORRECT") ? COMMON_SHORT_OPTIONS "I::" : COMMON_SHORT_OPTIONS "I:"); --- src/expand.c.orig 2004-01-21 23:27:02.000000000 +0100 +++ src/expand.c 2004-03-24 15:23:21.000000000 +0100 @@@@ -406,6 +406,8 @@@@ } if (obsolete_tablist && 200112 <= posix2_version ()) + if (obsolete_tablist && 200112 <= posix2_version () && + getenv ("POSIXLY_CORRECT")) { error (0, 0, _("`-LIST' option is obsolete; use `-t LIST'")); usage (EXIT_FAILURE); --- src/fold.c.orig 2004-01-21 23:27:02.000000000 +0100 +++ src/fold.c 2004-03-24 15:26:20.000000000 +0100 @@@@ -270,6 +270,7 @@@@ memcpy (s + 2, a + 1, len_a); argv[i] = s; if (200112 <= posix2_version ()) + if (200112 <= posix2_version () && getenv ("POSIXLY_CORRECT")) { error (0, 0, _("`%s' option is obsolete; use `%s'"), a, s); usage (EXIT_FAILURE); --- src/head.c.orig 2004-01-21 23:27:02.000000000 +0100 +++ src/head.c 2004-03-24 15:27:04.000000000 +0100 @@@@ -996,6 +996,7 @@@@ } if (200112 <= posix2_version ()) + if (200112 <= posix2_version () && getenv ("POSIXLY_CORRECT")) { error (0, 0, _("`-%s' option is obsolete; use `-%c %.*s%.*s%s'"), n_string, count_lines ? 'n' : 'c', --- src/nice.c.orig 2004-01-22 00:23:24.000000000 +0100 +++ src/nice.c 2004-03-24 15:28:51.000000000 +0100 @@@@ -107,7 +107,7 @@@@ char *s = argv[i]; if (s[0] == '-' && s[1] == '-' && ISDIGIT (s[2]) - && posix2_version () < 200112) + && (posix2_version () < 200112 || !getenv ("POSIXLY_CORRECT"))) { if (xstrtol (&s[2], NULL, 10, &adjustment, "") != LONGINT_OK) error (EXIT_FAIL, 0, _("invalid option `%s'"), s); @@@@ -118,7 +118,7 @@@@ } else if (s[0] == '-' && (ISDIGIT (s[1]) || (s[1] == '+' && ISDIGIT (s[2]))) - && posix2_version () < 200112) + && (posix2_version () < 200112 || !getenv ("POSIXLY_CORRECT"))) { if (s[1] == '+') ++s; --- src/od.c.orig 2004-01-21 23:27:02.000000000 +0100 +++ src/od.c 2004-03-24 15:29:59.000000000 +0100 @@@@ -1621,7 +1621,8 @@@@ int width_specified = 0; int n_failed_decodes = 0; int err; - char const *short_options = (posix2_version () < 200112 + char const *short_options = (posix2_version () < 200112 || + !getenv ("POSIXLY_CORRECT") ? COMMON_SHORT_OPTIONS "s::w::" : COMMON_SHORT_OPTIONS "s:w:"); --- src/pr.c.orig 2004-01-21 23:27:02.000000000 +0100 +++ src/pr.c 2004-03-24 15:30:48.000000000 +0100 @@@@ -854,7 +854,8 @@@@ int old_w = FALSE; int old_s = FALSE; char **file_names; - char const *short_options = (posix2_version () < 200112 + char const *short_options = (posix2_version () < 200112 || + !getenv ("POSIXLY_CORRECT") ? COMMON_SHORT_OPTIONS "S::" : COMMON_SHORT_OPTIONS "S:"); --- src/sort.c.orig 2004-02-17 11:47:35.000000000 +0100 +++ src/sort.c 2004-03-24 15:31:54.000000000 +0100 @@@@ -2219,7 +2219,7 @@@@ bool mergeonly = false; int nfiles = 0; bool posixly_correct = (getenv ("POSIXLY_CORRECT") != NULL); - bool obsolete_usage = (posix2_version () < 200112); + bool obsolete_usage = (posix2_version () < 200112) || !posixly_correct; char const *short_options = (obsolete_usage ? COMMON_SHORT_OPTIONS "y::" : COMMON_SHORT_OPTIONS "y:"); --- src/split.c.orig 2004-01-21 23:27:02.000000000 +0100 +++ src/split.c 2004-03-24 15:32:48.000000000 +0100 @@@@ -498,6 +498,8 @@@@ } if (digits_optind && 200112 <= posix2_version ()) + if (digits_optind && 200112 <= posix2_version () + && getenv ("POSIXLY_CORRECT")) { char buffer[INT_BUFSIZE_BOUND (uintmax_t)]; char const *a = umaxtostr (n_units, buffer); --- src/tail.c.orig 2004-01-21 23:27:02.000000000 +0100 +++ src/tail.c 2004-03-24 15:33:32.000000000 +0100 @@@@ -1364,7 +1364,7 @@@@ if (argc < 2) return 0; - obsolete_usage = (posix2_version () < 200112); + obsolete_usage = (posix2_version () < 200112) || !getenv ("POSIXLY_CORRECT"); /* If P starts with `+' and the POSIX version predates 1003.1-2001, or if P starts with `-N' (where N is a digit), or `-l', then it --- src/touch.c.orig 2004-01-21 23:27:02.000000000 +0100 +++ src/touch.c 2004-03-24 15:34:28.000000000 +0100 @@@@ -385,7 +385,7 @@@@ /* The obsolete `MMDDhhmm[YY]' form is valid IFF there are two or more non-option arguments. */ if (!date_set && 2 <= argc - optind && !STREQ (argv[optind - 1], "--") - && posix2_version () < 200112) + && (posix2_version () < 200112 || !getenv ("POSIXLY_CORRECT"))) { if (posixtime (&newtime.tv_sec, argv[optind], PDS_TRAILING_YEAR)) { --- src/unexpand.c.orig 2004-01-21 23:27:02.000000000 +0100 +++ src/unexpand.c 2004-03-24 15:35:09.000000000 +0100 @@@@ -461,7 +461,8 @@@@ } } - if (obsolete_tablist && 200112 <= posix2_version ()) + if (obsolete_tablist && 200112 <= posix2_version () + && getenv ("POSIXLY_CORRECT")) { error (0, 0, _("`-LIST' option is obsolete; use `--first-only -t LIST'")); --- src/uniq.c.orig 2004-01-21 23:27:02.000000000 +0100 +++ src/uniq.c 2004-03-24 15:36:59.000000000 +0100 @@@@ -446,7 +446,7 @@@@ { unsigned long int size; if (optarg[0] == '+' - && posix2_version () < 200112 + && (posix2_version () < 200112 || !getenv ("POSIXLY_CORRECT")) && xstrtoul (optarg, NULL, 10, &size, "") == LONGINT_OK && size <= SIZE_MAX) skip_chars = size; @@@@ -531,7 +531,8 @@@@ } } - if (obsolete_skip_fields && 200112 <= posix2_version ()) + if (obsolete_skip_fields && 200112 <= posix2_version () + && getenv ("POSIXLY_CORRECT")) { error (0, 0, _("`-%lu' option is obsolete; use `-f %lu'"), (unsigned long) skip_fields, (unsigned long) skip_fields); @ 1.5 log @workaround to defeat "ls -w" resource starvation @ text @a67 61 http://www.guninski.com/binls.html Workaround to defeat resource starvation using "ls -W hugenumber" taken from Conectiva Updates , CLA-2003:768 Index: src/ls.c --- src/ls.c.orig 2003-07-27 08:33:36.000000000 +0200 +++ src/ls.c 2003-10-23 13:45:46.000000000 +0200 @@@@ -180,6 +180,8 @@@@ #define ID_LENGTH_MAX \ MAX (LOGIN_NAME_MAX - 1, LONGEST_HUMAN_READABLE) +#define COLUMNS_MAX 1024 + enum filetype { unknown DT_INIT (DT_UNKNOWN), @@@@ -1316,7 +1318,7 @@@@ { long int tmp_long; if (xstrtol (p, NULL, 0, &tmp_long, NULL) == LONGINT_OK - && 0 < tmp_long && tmp_long <= INT_MAX) + && 0 < tmp_long && tmp_long <= COLUMNS_MAX) { line_length = (int) tmp_long; } @@@@ -1334,7 +1336,7 @@@@ struct winsize ws; if (ioctl (STDOUT_FILENO, TIOCGWINSZ, &ws) != -1 && ws.ws_col != 0) - line_length = ws.ws_col; + line_length = MIN(ws.ws_col, COLUMNS_MAX); } #endif @@@@ -1347,7 +1349,7 @@@@ { long int tmp_long; if (xstrtol (p, NULL, 0, &tmp_long, NULL) == LONGINT_OK - && 0 <= tmp_long && tmp_long <= INT_MAX) + && 0 <= tmp_long && tmp_long <= COLUMNS_MAX) { tabsize = (int) tmp_long; } @@@@ -1470,7 +1472,7 @@@@ { long int tmp_long; if (xstrtol (optarg, NULL, 0, &tmp_long, NULL) != LONGINT_OK - || tmp_long <= 0 || tmp_long > INT_MAX) + || tmp_long <= 0 || tmp_long > COLUMNS_MAX) error (EXIT_FAILURE, 0, _("invalid line width: %s"), quotearg (optarg)); line_length = (int) tmp_long; @@@@ -1544,7 +1546,7 @@@@ { long int tmp_long; if (xstrtol (optarg, NULL, 0, &tmp_long, NULL) != LONGINT_OK - || tmp_long < 0 || tmp_long > INT_MAX) + || tmp_long < 0 || tmp_long > COLUMNS_MAX) error (EXIT_FAILURE, 0, _("invalid tab size: %s"), quotearg (optarg)); tabsize = (int) tmp_long; @ 1.4 log @upgrading package: coreutils 5.0.90 -> 5.0.91 @ text @d67 62 @ 1.3 log @upgrading package: coreutils 5.0.1 -> 5.0.90 @ text @d57 4 a60 3 --- src/nice.c.orig Fri Aug 1 09:57:15 2003 +++ src/nice.c Fri Aug 1 09:57:33 2003 @@@@ -24,6 +24,7 @@@@ d63 1 d65 2 a66 4 +#include #ifndef NICE_PRIORITY # include #endif @ 1.2 log @upgrading package: coreutils 4.5.7 -> 4.5.8 @ text @d57 10 @ 1.1 log @port to FreeBSD 5.0 @ text @d16 5 a20 5 --- src/test.c.orig Wed Sep 25 10:22:37 2002 +++ src/test.c Sun Jan 12 11:49:50 2003 @@@@ -151,7 +151,7 @@@@ and don't make the mistake of telling root that any file is executable. But this loses when the containing filesystem is mounted e.g. read-only. */ d22 2 a23 2 -eaccess (char *path, int mode) +myeaccess (char *path, int mode) d25 12 a36 3 struct stat st; static uid_t euid = -1; @@@@ -645,17 +645,17 @@@@ d41 1 a41 1 + value = -1 != myeaccess (argv[pos - 1], R_OK); d47 1 a47 1 + value = -1 != myeaccess (argv[pos - 1], W_OK); d53 1 a53 1 + value = -1 != myeaccess (argv[pos - 1], X_OK); @ 1.1.4.1 log @workaround to defeat "ls -w" resource starvation @ text @a47 63 http://www.guninski.com/binls.html Workaround to defeat resource starvation using "ls -W hugenumber" taken from Conectiva Updates , CLA-2003:768 Index: src/ls.c --- src/ls.c.orig 2003-07-27 08:33:36.000000000 +0200 +++ src/ls.c 2003-10-23 13:45:46.000000000 +0200 @@@@ -180,6 +180,8 @@@@ #define ID_LENGTH_MAX \ MAX (LOGIN_NAME_MAX - 1, LONGEST_HUMAN_READABLE) +#define COLUMNS_MAX 1024 + enum filetype { unknown DT_INIT (DT_UNKNOWN), @@@@ -1316,7 +1318,7 @@@@ { long int tmp_long; if (xstrtol (p, NULL, 0, &tmp_long, NULL) == LONGINT_OK - && 0 < tmp_long && tmp_long <= INT_MAX) + && 0 < tmp_long && tmp_long <= COLUMNS_MAX) { line_length = (int) tmp_long; } @@@@ -1334,7 +1336,7 @@@@ struct winsize ws; if (ioctl (STDOUT_FILENO, TIOCGWINSZ, &ws) != -1 && ws.ws_col != 0) - line_length = ws.ws_col; + line_length = line_length = MIN(ws.ws_col, COLUMNS_MAX); } #endif @@@@ -1347,7 +1349,7 @@@@ { long int tmp_long; if (xstrtol (p, NULL, 0, &tmp_long, NULL) == LONGINT_OK - && 0 <= tmp_long && tmp_long <= INT_MAX) + && 0 <= tmp_long && tmp_long <= COLUMNS_MAX) { tabsize = (int) tmp_long; } @@@@ -1470,7 +1472,7 @@@@ { long int tmp_long; if (xstrtol (optarg, NULL, 0, &tmp_long, NULL) != LONGINT_OK - || tmp_long <= 0 || tmp_long > INT_MAX) + || tmp_long <= 0 || tmp_long > COLUMNS_MAX) error (EXIT_FAILURE, 0, _("invalid line width: %s"), quotearg (optarg)); line_length = (int) tmp_long; @@@@ -1544,7 +1546,7 @@@@ { long int tmp_long; if (xstrtol (optarg, NULL, 0, &tmp_long, NULL) != LONGINT_OK - || tmp_long < 0 || tmp_long > INT_MAX) + || tmp_long < 0 || tmp_long > COLUMNS_MAX) error (EXIT_FAILURE, 0, _("invalid tab size: %s"), quotearg (optarg)); tabsize = (int) tmp_long; @ 1.1.2.1 log @mass Merge-From-CURRENT (MFC) in preparation for OpenPKG 1.3 [class BASE only] @ text @d16 5 a20 5 --- src/test.c.orig Mon Feb 10 10:19:09 2003 +++ src/test.c Sun Feb 23 20:44:50 2003 @@@@ -139,7 +139,7 @@@@ /* Do the same thing access(2) does, but use the effective uid and gid. */ d22 2 a23 2 -eaccess (char const *file, int mode) +my_eaccess (char const *file, int mode) d25 3 a27 12 static int have_ids; static uid_t uid, euid; @@@@ -172,7 +172,7 @@@@ return result; } #else -# define eaccess(F, M) euidaccess (F, M) +# define my_eaccess(F, M) euidaccess (F, M) #endif /* Increment our position in the argument list. Check that we're not @@@@ -635,17 +635,17 @@@@ d32 1 a32 1 + value = -1 != my_eaccess (argv[pos - 1], R_OK); d38 1 a38 1 + value = -1 != my_eaccess (argv[pos - 1], W_OK); d44 1 a44 1 + value = -1 != my_eaccess (argv[pos - 1], X_OK); @ 1.1.2.1.2.1 log @fix sort(1) and uniq(1) commands @ text @a56 24 Index: configure --- configure.orig 2003-07-12 20:50:05.000000000 +0200 +++ configure 2003-10-21 10:06:46.000000000 +0200 @@@@ -34882,6 +34883,7 @@@@ realpath \ sethostname \ strchr \ + strcoll \ strerror \ strrchr \ sysctl \ Index: config.hin --- config.hin.orig 2003-07-12 20:50:19.000000000 +0200 +++ config.hin 2003-10-21 10:06:46.000000000 +0200 @@@@ -738,6 +738,9 @@@@ /* Define to 1 if you have the `strchr' function. */ #undef HAVE_STRCHR +/* Define to 1 if you have the `strcoll' function. */ +#undef HAVE_STRCOLL + /* Define to 1 if you have the `strcspn' function. */ #undef HAVE_STRCSPN @ 1.1.2.1.2.2 log @workaround to defeat "ls -w" resource starvation @ text @a80 62 http://www.guninski.com/binls.html Workaround to defeat resource starvation using "ls -W hugenumber" taken from Conectiva Updates , CLA-2003:768 Index: src/ls.c --- src/ls.c.orig 2003-07-27 08:33:36.000000000 +0200 +++ src/ls.c 2003-10-23 13:45:46.000000000 +0200 @@@@ -180,6 +180,8 @@@@ #define ID_LENGTH_MAX \ MAX (LOGIN_NAME_MAX - 1, LONGEST_HUMAN_READABLE) +#define COLUMNS_MAX 1024 + enum filetype { unknown DT_INIT (DT_UNKNOWN), @@@@ -1316,7 +1318,7 @@@@ { long int tmp_long; if (xstrtol (p, NULL, 0, &tmp_long, NULL) == LONGINT_OK - && 0 < tmp_long && tmp_long <= INT_MAX) + && 0 < tmp_long && tmp_long <= COLUMNS_MAX) { line_length = (int) tmp_long; } @@@@ -1334,7 +1336,7 @@@@ struct winsize ws; if (ioctl (STDOUT_FILENO, TIOCGWINSZ, &ws) != -1 && ws.ws_col != 0) - line_length = ws.ws_col; + line_length = line_length = MIN(ws.ws_col, COLUMNS_MAX); } #endif @@@@ -1347,7 +1349,7 @@@@ { long int tmp_long; if (xstrtol (p, NULL, 0, &tmp_long, NULL) == LONGINT_OK - && 0 <= tmp_long && tmp_long <= INT_MAX) + && 0 <= tmp_long && tmp_long <= COLUMNS_MAX) { tabsize = (int) tmp_long; } @@@@ -1470,7 +1472,7 @@@@ { long int tmp_long; if (xstrtol (optarg, NULL, 0, &tmp_long, NULL) != LONGINT_OK - || tmp_long <= 0 || tmp_long > INT_MAX) + || tmp_long <= 0 || tmp_long > COLUMNS_MAX) error (EXIT_FAILURE, 0, _("invalid line width: %s"), quotearg (optarg)); line_length = (int) tmp_long; @@@@ -1544,7 +1546,7 @@@@ { long int tmp_long; if (xstrtol (optarg, NULL, 0, &tmp_long, NULL) != LONGINT_OK - || tmp_long < 0 || tmp_long > INT_MAX) + || tmp_long < 0 || tmp_long > COLUMNS_MAX) error (EXIT_FAILURE, 0, _("invalid tab size: %s"), quotearg (optarg)); tabsize = (int) tmp_long; @