diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-04-02 20:17:55 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-04-02 20:17:55 +0000 |
| commit | a1bccc0ba82cc2eef117bb90cd33867df35ad33a (patch) | |
| tree | b0cd49908a23f040419e14f3678651005416d2fa | |
| parent | 9457e703570524e8bdf36e711445f49e4f9f54d9 (diff) | |
| download | busybox-w32-a1bccc0ba82cc2eef117bb90cd33867df35ad33a.tar.gz busybox-w32-a1bccc0ba82cc2eef117bb90cd33867df35ad33a.tar.bz2 busybox-w32-a1bccc0ba82cc2eef117bb90cd33867df35ad33a.zip | |
- typos: s/compatability/compatibility/g;s/compatable/compatible/g;
| -rw-r--r-- | Config.in | 2 | ||||
| -rw-r--r-- | archival/Config.in | 2 | ||||
| -rw-r--r-- | archival/libunarchive/get_header_tar.c | 4 | ||||
| -rw-r--r-- | archival/tar.c | 2 | ||||
| -rw-r--r-- | coreutils/cp.c | 2 | ||||
| -rw-r--r-- | coreutils/install.c | 2 | ||||
| -rw-r--r-- | include/libbb.h | 2 | ||||
| -rw-r--r-- | include/usage.h | 2 |
8 files changed, 9 insertions, 9 deletions
| @@ -345,7 +345,7 @@ config CONFIG_DEBUG_YANK_SUSv2 | |||
| 345 | bool "Disable obsolete features removed before SUSv3?" | 345 | bool "Disable obsolete features removed before SUSv3?" |
| 346 | default y | 346 | default y |
| 347 | help | 347 | help |
| 348 | This option will disable backwards compatability with SuSv2, | 348 | This option will disable backwards compatibility with SuSv2, |
| 349 | specifically, old-style numeric options ('command -1 <file>') | 349 | specifically, old-style numeric options ('command -1 <file>') |
| 350 | will not be supported in head, tail, and fold. (Note: should | 350 | will not be supported in head, tail, and fold. (Note: should |
| 351 | yank from renice too.) | 351 | yank from renice too.) |
diff --git a/archival/Config.in b/archival/Config.in index 7810c354d..e3f6239f2 100644 --- a/archival/Config.in +++ b/archival/Config.in | |||
| @@ -189,7 +189,7 @@ config CONFIG_FEATURE_TAR_COMPRESS | |||
| 189 | If you enable this option tar will be able to call uncompress, | 189 | If you enable this option tar will be able to call uncompress, |
| 190 | when extracting .tar.Z archives. | 190 | when extracting .tar.Z archives. |
| 191 | 191 | ||
| 192 | config CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY | 192 | config CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY |
| 193 | bool " Enable support for old tar header format" | 193 | bool " Enable support for old tar header format" |
| 194 | default N | 194 | default N |
| 195 | depends on CONFIG_TAR | 195 | depends on CONFIG_TAR |
diff --git a/archival/libunarchive/get_header_tar.c b/archival/libunarchive/get_header_tar.c index 682179a02..cd38f4560 100644 --- a/archival/libunarchive/get_header_tar.c +++ b/archival/libunarchive/get_header_tar.c | |||
| @@ -80,7 +80,7 @@ char get_header_tar(archive_handle_t *archive_handle) | |||
| 80 | * 0's are for the old tar format | 80 | * 0's are for the old tar format |
| 81 | */ | 81 | */ |
| 82 | if (strncmp(tar.formated.magic, "ustar", 5) != 0) { | 82 | if (strncmp(tar.formated.magic, "ustar", 5) != 0) { |
| 83 | #ifdef CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY | 83 | #ifdef CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY |
| 84 | if (strncmp(tar.formated.magic, "\0\0\0\0\0", 5) != 0) | 84 | if (strncmp(tar.formated.magic, "\0\0\0\0\0", 5) != 0) |
| 85 | #endif | 85 | #endif |
| 86 | bb_error_msg_and_die("Invalid tar magic"); | 86 | bb_error_msg_and_die("Invalid tar magic"); |
| @@ -144,7 +144,7 @@ char get_header_tar(archive_handle_t *archive_handle) | |||
| 144 | /* Reserved for high performance files, treat as normal file */ | 144 | /* Reserved for high performance files, treat as normal file */ |
| 145 | case 0: | 145 | case 0: |
| 146 | case '0': | 146 | case '0': |
| 147 | #ifdef CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY | 147 | #ifdef CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY |
| 148 | if (last_char_is(file_header->name, '/')) { | 148 | if (last_char_is(file_header->name, '/')) { |
| 149 | file_header->mode |= S_IFDIR; | 149 | file_header->mode |= S_IFDIR; |
| 150 | } else | 150 | } else |
diff --git a/archival/tar.c b/archival/tar.c index ab4d1f266..9d0a7c5e4 100644 --- a/archival/tar.c +++ b/archival/tar.c | |||
| @@ -44,7 +44,7 @@ | |||
| 44 | 44 | ||
| 45 | /* Tar file constants */ | 45 | /* Tar file constants */ |
| 46 | # define TAR_MAGIC "ustar" /* ustar and a null */ | 46 | # define TAR_MAGIC "ustar" /* ustar and a null */ |
| 47 | # define TAR_VERSION " " /* Be compatable with GNU tar format */ | 47 | # define TAR_VERSION " " /* Be compatible with GNU tar format */ |
| 48 | 48 | ||
| 49 | #define TAR_BLOCK_SIZE 512 | 49 | #define TAR_BLOCK_SIZE 512 |
| 50 | #define TAR_MAGIC_LEN 6 | 50 | #define TAR_MAGIC_LEN 6 |
diff --git a/coreutils/cp.c b/coreutils/cp.c index 87f229196..f5baa0d62 100644 --- a/coreutils/cp.c +++ b/coreutils/cp.c | |||
| @@ -46,7 +46,7 @@ int cp_main(int argc, char **argv) | |||
| 46 | } | 46 | } |
| 47 | if (flags & 64) { | 47 | if (flags & 64) { |
| 48 | /* Make -r a synonym for -R, | 48 | /* Make -r a synonym for -R, |
| 49 | * -r was marked as obsolete in SUSv3, but is included for compatability | 49 | * -r was marked as obsolete in SUSv3, but is included for compatibility |
| 50 | */ | 50 | */ |
| 51 | flags |= FILEUTILS_RECUR; | 51 | flags |= FILEUTILS_RECUR; |
| 52 | } | 52 | } |
diff --git a/coreutils/install.c b/coreutils/install.c index e8dd5060c..7739fb615 100644 --- a/coreutils/install.c +++ b/coreutils/install.c | |||
| @@ -62,7 +62,7 @@ int install_main(int argc, char **argv) | |||
| 62 | 62 | ||
| 63 | bb_applet_long_options = install_long_options; | 63 | bb_applet_long_options = install_long_options; |
| 64 | bb_opt_complementally = "?:s--d:d--s"; | 64 | bb_opt_complementally = "?:s--d:d--s"; |
| 65 | /* -c exists for backwards compatability, its needed */ | 65 | /* -c exists for backwards compatibility, its needed */ |
| 66 | flags = bb_getopt_ulflags(argc, argv, "cdpsg:m:o:", &gid_str, &mode_str, &uid_str); /* 'a' must be 2nd */ | 66 | flags = bb_getopt_ulflags(argc, argv, "cdpsg:m:o:", &gid_str, &mode_str, &uid_str); /* 'a' must be 2nd */ |
| 67 | 67 | ||
| 68 | /* preserve access and modification time, this is GNU behaviour, BSD only preserves modification time */ | 68 | /* preserve access and modification time, this is GNU behaviour, BSD only preserves modification time */ |
diff --git a/include/libbb.h b/include/libbb.h index 0ec332b30..f444084b3 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
| @@ -218,7 +218,7 @@ extern int vdprintf(int d, const char *format, va_list ap); | |||
| 218 | int nfsmount(const char *spec, const char *node, int *flags, | 218 | int nfsmount(const char *spec, const char *node, int *flags, |
| 219 | char **mount_opts, int running_bg); | 219 | char **mount_opts, int running_bg); |
| 220 | 220 | ||
| 221 | /* Include our own copy of struct sysinfo to avoid binary compatability | 221 | /* Include our own copy of struct sysinfo to avoid binary compatibility |
| 222 | * problems with Linux 2.4, which changed things. Grumble, grumble. */ | 222 | * problems with Linux 2.4, which changed things. Grumble, grumble. */ |
| 223 | struct sysinfo { | 223 | struct sysinfo { |
| 224 | long uptime; /* Seconds since boot */ | 224 | long uptime; /* Seconds since boot */ |
diff --git a/include/usage.h b/include/usage.h index c8984e99b..0ac0284ce 100644 --- a/include/usage.h +++ b/include/usage.h | |||
| @@ -2743,7 +2743,7 @@ | |||
| 2743 | USAGE_SORT_BIG("\t-s\tstable (don't sort ties alphabetically)\n") \ | 2743 | USAGE_SORT_BIG("\t-s\tstable (don't sort ties alphabetically)\n") \ |
| 2744 | "\t-u\tsuppress duplicate lines" \ | 2744 | "\t-u\tsuppress duplicate lines" \ |
| 2745 | USAGE_SORT_BIG("\n\t-z\tinput terminated by nulls, not newlines\n") \ | 2745 | USAGE_SORT_BIG("\n\t-z\tinput terminated by nulls, not newlines\n") \ |
| 2746 | USAGE_SORT_BIG("\t-mST\tignored for GNU compatability") \ | 2746 | USAGE_SORT_BIG("\t-mST\tignored for GNU compatibility") \ |
| 2747 | "" | 2747 | "" |
| 2748 | #define sort_example_usage \ | 2748 | #define sort_example_usage \ |
| 2749 | "$ echo -e \"e\\nf\\nb\\nd\\nc\\na\" | sort\n" \ | 2749 | "$ echo -e \"e\\nf\\nb\\nd\\nc\\na\" | sort\n" \ |
