b22bbfffe
Denys Vlasenko
2009-07-04
Subject
fix dependencies of FEATURE_GETOPT_LONG
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
e2fsprogs/old_e2fsprogs/e2fsck.c +1 -1editors/vi.c +3 -3examples/inittab +1 -1miscutils/hdparm.c +1 -1networking/arping.c +1 -1util-linux/Config.in +2 -2
e2fsprogs/old_e2fsprogs/e2fsck.c+1 -1
| @@ -1886,7 +1886,7 @@ static void e2fsck_journal_reset_super(e2fsck_t ctx, journal_superblock_t *jsb, | |
| int i; | |
| /* Leave a valid existing V1 superblock signature alone. | |
| - | * Anything unrecognisable we overwrite with a new V2 |
| + | * Anything unrecognizable we overwrite with a new V2 |
| * signature. */ | |
| if (jsb->s_header.h_magic != htonl(JFS_MAGIC_NUMBER) || | |
editors/vi.c+3 -3
| @@ -687,7 +687,7 @@ static char *get_one_address(char *p, int *addr) // get colon addr, if present | |
| sscanf(p, "%d%n", addr, &st); | |
| p += st; | |
| } else { | |
| - | // unrecognised address - assume -1 |
| + | // unrecognized address - assume -1 |
| *addr = -1; | |
| } | |
| return p; | |
| @@ -2979,7 +2979,7 @@ static void do_cmd(int c) | |
| //case '`': // `- | |
| //case 'u': // u- FIXME- there is no undo | |
| //case 'v': // v- | |
| - | default: // unrecognised command |
| + | default: // unrecognized command |
| buf[0] = c; | |
| buf[1] = '\0'; | |
| if (c < ' ') { | |
| @@ -3356,7 +3356,7 @@ static void do_cmd(int c) | |
| } else if (sscanf(p, "%d", &j) > 0) { | |
| dot = find_line(j); // go to line # j | |
| dot_skip_over_ws(); | |
| - | } else { // unrecognised cmd |
| + | } else { // unrecognized cmd |
| not_implemented(p); | |
| } | |
| #endif /* !FEATURE_VI_COLON */ | |
examples/inittab+1 -1
| @@ -30,7 +30,7 @@ | |
| # console." and then waits for the user to press enter before starting | |
| # the specified process. | |
| # | |
| - | # Note: unrecognised actions (like initdefault) will cause init to emit |
| + | # Note: unrecognized actions (like initdefault) will cause init to emit |
| # an error message, and then go along with its business. | |
| # | |
| # <process>: Specifies the process to be executed and it's command line. | |
miscutils/hdparm.c+1 -1
| @@ -675,7 +675,7 @@ static void identify(uint16_t *val) | |
| swab(val, buf, sizeof(buf)); | |
| val = buf; | |
| #endif | |
| - | /* check if we recognise the device type */ |
| + | /* check if we recognize the device type */ |
| bb_putchar('\n'); | |
| if (!(val[GEN_CONFIG] & NOT_ATA)) { | |
| dev = ATA_DEV; | |
networking/arping.c+1 -1
| @@ -169,7 +169,7 @@ static bool recv_pack(unsigned char *buf, int len, struct sockaddr_ll *FROM) | |
| && FROM->sll_pkttype != PACKET_MULTICAST) | |
| return false; | |
| - | /* Only these types are recognised */ |
| + | /* Only these types are recognized */ |
| if (ah->ar_op != htons(ARPOP_REQUEST) && ah->ar_op != htons(ARPOP_REPLY)) | |
| return false; | |
util-linux/Config.in+2 -2
| @@ -253,9 +253,9 @@ config GETOPT | |
| config FEATURE_GETOPT_LONG | |
| bool "Support option -l" | |
| default y if LONG_OPTS | |
| + | depends on GETOPT |
| help | |
| - | Enable support for recognising long options using the -l option to |
| - | getopt. |
| + | Enable support for long options (option -l). |
| config HEXDUMP | |
| bool "hexdump" | |