diff options
| author | Jim Meyering <jim@meyering.net> | 1993-10-30 15:57:46 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 1993-10-30 15:57:46 +0000 |
| commit | c7ebcc8326dfe8b9455ec8995a38b73826538928 (patch) | |
| tree | 2cb0b23f3bfd37e82c4f884c064f558c801c30c3 /src | |
| parent | 01e9d7611ab5840e415f3c6c2e29b0951238ae58 (diff) | |
| download | coreutils-c7ebcc8326dfe8b9455ec8995a38b73826538928.tar.xz | |
merge with 1.8.1a
Diffstat (limited to 'src')
| -rw-r--r-- | src/csplit.c | 6 | ||||
| -rw-r--r-- | src/od.c | 10 |
2 files changed, 11 insertions, 5 deletions
diff --git a/src/csplit.c b/src/csplit.c index aad7f3171..f27290b77 100644 --- a/src/csplit.c +++ b/src/csplit.c @@ -33,7 +33,9 @@ #include <getopt.h> #include <sys/types.h> #include <signal.h> +#ifdef HAVE_LIMITS_H #include <limits.h> +#endif /* HAVE_LIMITS_H */ #include "regex.h" #include "system.h" #include "version.h" @@ -49,6 +51,10 @@ char *realloc (); #define MAX(a,b) (((a) > (b)) ? (a) : (b)) #endif +#ifndef INT_MAX +#define INT_MAX (~(1 << (sizeof (int) * 8 - 1))) +#endif /* INT_MAX */ + void error (); @@ -215,7 +215,7 @@ static unsigned long int flag_dump_strings; /* Non-zero if we should recognize the pre-POSIX non-option arguments that specified at most one file and optional arguments specifying offset and pseudo-start address. */ -static int backward_compatibility; +static int traditional; /* Non-zero if an old-style `pseudo-address' was specified. */ static long int flag_pseudo_start; @@ -298,8 +298,8 @@ static struct option const long_options[] = {"output-duplicates", no_argument, NULL, 'v'}, /* non-POSIX options. */ - {"backward-compatible", no_argument, NULL, 'B'}, {"strings", optional_argument, NULL, 's'}, + {"traditional", no_argument, NULL, 'B'}, {"width", optional_argument, NULL, 'w'}, {"help", no_argument, &show_help, 1}, {"version", no_argument, &show_version, 1}, @@ -1732,7 +1732,7 @@ main (argc, argv) address_pad_len = 7; flag_dump_strings = 0; - while ((c = getopt_long (argc, argv, "abBcdfhilos::xw::A:j:N:t:v", + while ((c = getopt_long (argc, argv, "abcdfhilos::xw::A:j:N:t:v", long_options, (int *) 0)) != EOF) { @@ -1810,7 +1810,7 @@ main (argc, argv) break; case 'B': - backward_compatibility = 1; + traditional = 1; break; /* The next several cases map the old, pre-POSIX format @@ -1880,7 +1880,7 @@ main (argc, argv) od [file] [[+]offset[.][b] [[+]label[.][b]]] The offset and pseudo_start have the same syntax. */ - if (backward_compatibility) + if (traditional) { long int offset; |