|
|
diff -r -U3 coreutils-5.0/src/Makefile.in coreutils-5.0-patched/src/Makefile.in |
|
|
|
|
|
|
|
|
@@ -209,7 +209,7 @@ |
|
|
printf_LDADD = $(LDADD) @POW_LIB@ @LIBICONV@ |
|
|
|
|
|
# If necessary, add -lm to resolve use of floor, rint, modf. |
|
|
-seq_LDADD = $(LDADD) @SEQ_LIBM@ |
|
|
+seq_LDADD = $(LDADD) @SEQ_LIBM@ -lm |
|
|
|
|
|
# If necessary, add -lm to resolve the `pow' reference in lib/strtod.c |
|
|
# or for the fesetround reference in programs using nanosec.c. |
|
|
diff -r -U3 coreutils-5.0/src/tee.c coreutils-5.0-patched/src/tee.c |
|
|
|
|
|
|
|
|
@@ -32,7 +32,7 @@ |
|
|
|
|
|
#define AUTHORS N_ ("Mike Parker, Richard M. Stallman, and David MacKenzie") |
|
|
|
|
|
-static int tee (int nfiles, const char **files); |
|
|
+static int tee_FOO (int nfiles, const char **files); |
|
|
|
|
|
/* If nonzero, append to output files rather than truncating them. */ |
|
|
static int append; |
|
|
@@ -146,7 +146,7 @@ |
|
|
/* Do *not* warn if tee is given no file arguments. |
|
|
POSIX requires that it work when given no arguments. */ |
|
|
|
|
|
- errs = tee (argc - optind, (const char **) &argv[optind]); |
|
|
+ errs = tee_FOO (argc - optind, (const char **) &argv[optind]); |
|
|
if (close (STDIN_FILENO) != 0) |
|
|
error (EXIT_FAILURE, errno, _("standard input")); |
|
|
|
|
|
@@ -158,7 +158,7 @@ |
|
|
Return 0 if successful, 1 if any errors occur. */ |
|
|
|
|
|
static int |
|
|
-tee (int nfiles, const char **files) |
|
|
+tee_FOO (int nfiles, const char **files) |
|
|
{ |
|
|
FILE **descriptors; |
|
|
char buffer[BUFSIZ]; |
|
|
diff -r -U3 coreutils-5.0/src/test.c coreutils-5.0-patched/src/test.c |
|
|
|
|
|
|
|
|
@@ -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) |
|
|
+eaccess_FOO (char const *file, int mode) |
|
|
{ |
|
|
static int have_ids; |
|
|
static uid_t uid, euid; |
|
|
@@ -635,17 +635,17 @@ |
|
|
|
|
|
case 'r': /* file is readable? */ |
|
|
unary_advance (); |
|
|
- value = -1 != eaccess (argv[pos - 1], R_OK); |
|
|
+ value = -1 != eaccess_FOO (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 != eaccess_FOO (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 != eaccess_FOO (argv[pos - 1], X_OK); |
|
|
return (TRUE == value); |
|
|
|
|
|
case 'O': /* File is owned by you? */ |
|
|
|