mirror of
https://github.com/sheumann/hush.git
synced 2024-12-27 01:32:08 +00:00
fix dependencies of FEATURE_GETOPT_LONG
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
parent
fca70a8cce
commit
b22bbfffec
@ -1886,7 +1886,7 @@ static void e2fsck_journal_reset_super(e2fsck_t ctx, journal_superblock_t *jsb,
|
|||||||
int i;
|
int i;
|
||||||
|
|
||||||
/* Leave a valid existing V1 superblock signature alone.
|
/* 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. */
|
* signature. */
|
||||||
|
|
||||||
if (jsb->s_header.h_magic != htonl(JFS_MAGIC_NUMBER) ||
|
if (jsb->s_header.h_magic != htonl(JFS_MAGIC_NUMBER) ||
|
||||||
|
@ -687,7 +687,7 @@ static char *get_one_address(char *p, int *addr) // get colon addr, if present
|
|||||||
sscanf(p, "%d%n", addr, &st);
|
sscanf(p, "%d%n", addr, &st);
|
||||||
p += st;
|
p += st;
|
||||||
} else {
|
} else {
|
||||||
// unrecognised address - assume -1
|
// unrecognized address - assume -1
|
||||||
*addr = -1;
|
*addr = -1;
|
||||||
}
|
}
|
||||||
return p;
|
return p;
|
||||||
@ -2979,7 +2979,7 @@ static void do_cmd(int c)
|
|||||||
//case '`': // `-
|
//case '`': // `-
|
||||||
//case 'u': // u- FIXME- there is no undo
|
//case 'u': // u- FIXME- there is no undo
|
||||||
//case 'v': // v-
|
//case 'v': // v-
|
||||||
default: // unrecognised command
|
default: // unrecognized command
|
||||||
buf[0] = c;
|
buf[0] = c;
|
||||||
buf[1] = '\0';
|
buf[1] = '\0';
|
||||||
if (c < ' ') {
|
if (c < ' ') {
|
||||||
@ -3356,7 +3356,7 @@ static void do_cmd(int c)
|
|||||||
} else if (sscanf(p, "%d", &j) > 0) {
|
} else if (sscanf(p, "%d", &j) > 0) {
|
||||||
dot = find_line(j); // go to line # j
|
dot = find_line(j); // go to line # j
|
||||||
dot_skip_over_ws();
|
dot_skip_over_ws();
|
||||||
} else { // unrecognised cmd
|
} else { // unrecognized cmd
|
||||||
not_implemented(p);
|
not_implemented(p);
|
||||||
}
|
}
|
||||||
#endif /* !FEATURE_VI_COLON */
|
#endif /* !FEATURE_VI_COLON */
|
||||||
|
@ -30,7 +30,7 @@
|
|||||||
# console." and then waits for the user to press enter before starting
|
# console." and then waits for the user to press enter before starting
|
||||||
# the specified process.
|
# 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.
|
# an error message, and then go along with its business.
|
||||||
#
|
#
|
||||||
# <process>: Specifies the process to be executed and it's command line.
|
# <process>: Specifies the process to be executed and it's command line.
|
||||||
|
@ -675,7 +675,7 @@ static void identify(uint16_t *val)
|
|||||||
swab(val, buf, sizeof(buf));
|
swab(val, buf, sizeof(buf));
|
||||||
val = buf;
|
val = buf;
|
||||||
#endif
|
#endif
|
||||||
/* check if we recognise the device type */
|
/* check if we recognize the device type */
|
||||||
bb_putchar('\n');
|
bb_putchar('\n');
|
||||||
if (!(val[GEN_CONFIG] & NOT_ATA)) {
|
if (!(val[GEN_CONFIG] & NOT_ATA)) {
|
||||||
dev = ATA_DEV;
|
dev = ATA_DEV;
|
||||||
|
@ -169,7 +169,7 @@ static bool recv_pack(unsigned char *buf, int len, struct sockaddr_ll *FROM)
|
|||||||
&& FROM->sll_pkttype != PACKET_MULTICAST)
|
&& FROM->sll_pkttype != PACKET_MULTICAST)
|
||||||
return false;
|
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))
|
if (ah->ar_op != htons(ARPOP_REQUEST) && ah->ar_op != htons(ARPOP_REPLY))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
@ -253,9 +253,9 @@ config GETOPT
|
|||||||
config FEATURE_GETOPT_LONG
|
config FEATURE_GETOPT_LONG
|
||||||
bool "Support option -l"
|
bool "Support option -l"
|
||||||
default y if LONG_OPTS
|
default y if LONG_OPTS
|
||||||
|
depends on GETOPT
|
||||||
help
|
help
|
||||||
Enable support for recognising long options using the -l option to
|
Enable support for long options (option -l).
|
||||||
getopt.
|
|
||||||
|
|
||||||
config HEXDUMP
|
config HEXDUMP
|
||||||
bool "hexdump"
|
bool "hexdump"
|
||||||
|
Loading…
Reference in New Issue
Block a user