diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2009-07-04 16:50:43 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2009-07-04 16:50:43 +0200 |
| commit | b22bbfffec182997827b0a71eeb93ddafbde602c (patch) | |
| tree | c7822f5ed12ed82e4116121ea775510db232b111 | |
| parent | fca70a8cce579ce8cc8caf246c22f0c6e6c6e139 (diff) | |
| download | busybox-w32-b22bbfffec182997827b0a71eeb93ddafbde602c.tar.gz busybox-w32-b22bbfffec182997827b0a71eeb93ddafbde602c.tar.bz2 busybox-w32-b22bbfffec182997827b0a71eeb93ddafbde602c.zip | |
fix dependencies of FEATURE_GETOPT_LONG
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | e2fsprogs/old_e2fsprogs/e2fsck.c | 2 | ||||
| -rw-r--r-- | editors/vi.c | 6 | ||||
| -rw-r--r-- | examples/inittab | 2 | ||||
| -rw-r--r-- | miscutils/hdparm.c | 2 | ||||
| -rw-r--r-- | networking/arping.c | 2 | ||||
| -rw-r--r-- | util-linux/Config.in | 4 |
6 files changed, 9 insertions, 9 deletions
diff --git a/e2fsprogs/old_e2fsprogs/e2fsck.c b/e2fsprogs/old_e2fsprogs/e2fsck.c index d1f8d1ecb..6531f5d16 100644 --- a/e2fsprogs/old_e2fsprogs/e2fsck.c +++ b/e2fsprogs/old_e2fsprogs/e2fsck.c | |||
| @@ -1886,7 +1886,7 @@ static void e2fsck_journal_reset_super(e2fsck_t ctx, journal_superblock_t *jsb, | |||
| 1886 | int i; | 1886 | int i; |
| 1887 | 1887 | ||
| 1888 | /* Leave a valid existing V1 superblock signature alone. | 1888 | /* Leave a valid existing V1 superblock signature alone. |
| 1889 | * Anything unrecognisable we overwrite with a new V2 | 1889 | * Anything unrecognizable we overwrite with a new V2 |
| 1890 | * signature. */ | 1890 | * signature. */ |
| 1891 | 1891 | ||
| 1892 | if (jsb->s_header.h_magic != htonl(JFS_MAGIC_NUMBER) || | 1892 | if (jsb->s_header.h_magic != htonl(JFS_MAGIC_NUMBER) || |
diff --git a/editors/vi.c b/editors/vi.c index b5696fb28..31a1edc9f 100644 --- a/editors/vi.c +++ b/editors/vi.c | |||
| @@ -687,7 +687,7 @@ static char *get_one_address(char *p, int *addr) // get colon addr, if present | |||
| 687 | sscanf(p, "%d%n", addr, &st); | 687 | sscanf(p, "%d%n", addr, &st); |
| 688 | p += st; | 688 | p += st; |
| 689 | } else { | 689 | } else { |
| 690 | // unrecognised address - assume -1 | 690 | // unrecognized address - assume -1 |
| 691 | *addr = -1; | 691 | *addr = -1; |
| 692 | } | 692 | } |
| 693 | return p; | 693 | return p; |
| @@ -2979,7 +2979,7 @@ static void do_cmd(int c) | |||
| 2979 | //case '`': // `- | 2979 | //case '`': // `- |
| 2980 | //case 'u': // u- FIXME- there is no undo | 2980 | //case 'u': // u- FIXME- there is no undo |
| 2981 | //case 'v': // v- | 2981 | //case 'v': // v- |
| 2982 | default: // unrecognised command | 2982 | default: // unrecognized command |
| 2983 | buf[0] = c; | 2983 | buf[0] = c; |
| 2984 | buf[1] = '\0'; | 2984 | buf[1] = '\0'; |
| 2985 | if (c < ' ') { | 2985 | if (c < ' ') { |
| @@ -3356,7 +3356,7 @@ static void do_cmd(int c) | |||
| 3356 | } else if (sscanf(p, "%d", &j) > 0) { | 3356 | } else if (sscanf(p, "%d", &j) > 0) { |
| 3357 | dot = find_line(j); // go to line # j | 3357 | dot = find_line(j); // go to line # j |
| 3358 | dot_skip_over_ws(); | 3358 | dot_skip_over_ws(); |
| 3359 | } else { // unrecognised cmd | 3359 | } else { // unrecognized cmd |
| 3360 | not_implemented(p); | 3360 | not_implemented(p); |
| 3361 | } | 3361 | } |
| 3362 | #endif /* !FEATURE_VI_COLON */ | 3362 | #endif /* !FEATURE_VI_COLON */ |
diff --git a/examples/inittab b/examples/inittab index 5f2af8724..64fc4fce1 100644 --- a/examples/inittab +++ b/examples/inittab | |||
| @@ -30,7 +30,7 @@ | |||
| 30 | # console." and then waits for the user to press enter before starting | 30 | # console." and then waits for the user to press enter before starting |
| 31 | # the specified process. | 31 | # the specified process. |
| 32 | # | 32 | # |
| 33 | # Note: unrecognised actions (like initdefault) will cause init to emit | 33 | # Note: unrecognized actions (like initdefault) will cause init to emit |
| 34 | # an error message, and then go along with its business. | 34 | # an error message, and then go along with its business. |
| 35 | # | 35 | # |
| 36 | # <process>: Specifies the process to be executed and it's command line. | 36 | # <process>: Specifies the process to be executed and it's command line. |
diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c index 0d374ca4a..e8a483830 100644 --- a/miscutils/hdparm.c +++ b/miscutils/hdparm.c | |||
| @@ -675,7 +675,7 @@ static void identify(uint16_t *val) | |||
| 675 | swab(val, buf, sizeof(buf)); | 675 | swab(val, buf, sizeof(buf)); |
| 676 | val = buf; | 676 | val = buf; |
| 677 | #endif | 677 | #endif |
| 678 | /* check if we recognise the device type */ | 678 | /* check if we recognize the device type */ |
| 679 | bb_putchar('\n'); | 679 | bb_putchar('\n'); |
| 680 | if (!(val[GEN_CONFIG] & NOT_ATA)) { | 680 | if (!(val[GEN_CONFIG] & NOT_ATA)) { |
| 681 | dev = ATA_DEV; | 681 | dev = ATA_DEV; |
diff --git a/networking/arping.c b/networking/arping.c index ab39c717b..71690cf30 100644 --- a/networking/arping.c +++ b/networking/arping.c | |||
| @@ -169,7 +169,7 @@ static bool recv_pack(unsigned char *buf, int len, struct sockaddr_ll *FROM) | |||
| 169 | && FROM->sll_pkttype != PACKET_MULTICAST) | 169 | && FROM->sll_pkttype != PACKET_MULTICAST) |
| 170 | return false; | 170 | return false; |
| 171 | 171 | ||
| 172 | /* Only these types are recognised */ | 172 | /* Only these types are recognized */ |
| 173 | if (ah->ar_op != htons(ARPOP_REQUEST) && ah->ar_op != htons(ARPOP_REPLY)) | 173 | if (ah->ar_op != htons(ARPOP_REQUEST) && ah->ar_op != htons(ARPOP_REPLY)) |
| 174 | return false; | 174 | return false; |
| 175 | 175 | ||
diff --git a/util-linux/Config.in b/util-linux/Config.in index 559e4c17a..5f5adc0fe 100644 --- a/util-linux/Config.in +++ b/util-linux/Config.in | |||
| @@ -253,9 +253,9 @@ config GETOPT | |||
| 253 | config FEATURE_GETOPT_LONG | 253 | config FEATURE_GETOPT_LONG |
| 254 | bool "Support option -l" | 254 | bool "Support option -l" |
| 255 | default y if LONG_OPTS | 255 | default y if LONG_OPTS |
| 256 | depends on GETOPT | ||
| 256 | help | 257 | help |
| 257 | Enable support for recognising long options using the -l option to | 258 | Enable support for long options (option -l). |
| 258 | getopt. | ||
| 259 | 259 | ||
| 260 | config HEXDUMP | 260 | config HEXDUMP |
| 261 | bool "hexdump" | 261 | bool "hexdump" |
