emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

help text: regularize format, and shrink

Browse Source 
getty: shrink, and improve comments
mount: OPT_ALL is superfluous, we already have OPT_a

function                                             old     new   delta
bcode                                                 47      25     -22
getty_main                                          2503    2349    -154
packed_usage                                       23928   23698    -230
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/3 up/down: 0/-406)           Total: -406 bytes
   text    data     bss     dec     hex filename
 798031     658    7428  806117   c4ce5 busybox_old
 797604     658    7428  805690   c4b3a busybox_unstripped
This commit is contained in:
Denis Vlasenko 2008-03-17 08:55:44 +00:00
parent a4522c5a66
commit 397de617f3
3 changed files with 1629 additions and 1568 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3023
include/usage.h
View File

File diff suppressed because it is too large Load Diff

170
loginutils/getty.c
View File

@ -61,7 +61,7 @@ extern void updwtmp(const char *filename, const struct utmp *ut);
#define ISSUE "/etc/issue" /* displayed before the login prompt */ #define ISSUE "/etc/issue" /* displayed before the login prompt */
/* Some shorthands for control characters. */ /* Some shorthands for control characters. */
#define CTL(x) (x ^ 0100) /* Assumes ASCII dialect */ #define CTL(x) ((x) ^ 0100) /* Assumes ASCII dialect */
#define CR CTL('M') /* carriage return */ #define CR CTL('M') /* carriage return */
#define NL CTL('J') /* line feed */ #define NL CTL('J') /* line feed */
#define BS CTL('H') /* back space */ #define BS CTL('H') /* back space */
@ -100,6 +100,13 @@ struct chardata {
unsigned char kill; /* kill character */ unsigned char kill; /* kill character */
unsigned char eol; /* end-of-line character */ unsigned char eol; /* end-of-line character */
unsigned char parity; /* what parity did we see */ unsigned char parity; /* what parity did we see */
/* (parity & 1): saw odd parity char with 7th bit set */
/* (parity & 2): saw even parity char with 7th bit set */
/* parity == 0: probably 7-bit, space parity? */
/* parity == 1: probably 7-bit, odd parity? */
/* parity == 2: probably 7-bit, even parity? */
/* parity == 3: definitely 8 bit, no parity! */
/* Hmm... with any value of "parity" 8 bit, no parity is possible */
#ifdef HANDLE_ALLCAPS #ifdef HANDLE_ALLCAPS
unsigned char capslock; /* upper case without lower case */ unsigned char capslock; /* upper case without lower case */
#endif #endif
@ -135,27 +142,21 @@ static const char opt_string[] ALIGN1 = "I:LH:f:hil:mt:wn";
/* The following is used for understandable diagnostics. */ /* The following is used for understandable diagnostics. */
#ifdef DEBUGGING #ifdef DEBUGGING
#define debug(s) fprintf(dbf,s); fflush(dbf)
#define DEBUGTERM "/dev/ttyp0"
static FILE *dbf; static FILE *dbf;
#define DEBUGTERM "/dev/ttyp0"
#define debug(...) do { fprintf(dbf, __VA_ARGS__); fflush(dbf); } while (0)
#else #else
#define debug(s) /* nothing */ #define debug(...) ((void)0)
#endif #endif
/* bcode - convert speed string to speed code; return 0 on failure */ /* bcode - convert speed string to speed code; return <= 0 on failure */
static int bcode(const char *s) static int bcode(const char *s)
{ {
int r; int value = bb_strtou(s, NULL, 10); /* yes, int is intended! */
unsigned value = bb_strtou(s, NULL, 10); if (value < 0) /* bad terminating char, overflow, etc */
if (errno) { return value;
return -1; return tty_value_to_baud(value);
}
r = tty_value_to_baud(value);
if (r > 0) {
return r;
}
return 0;
} }
/* parse_speeds - parse alternate baud rates */ /* parse_speeds - parse alternate baud rates */
@ -181,10 +182,10 @@ static void parse_args(char **argv, struct options *op, char **fakehost_p)
{ {
char *ts; char *ts;
opt_complementary = "-2"; /* at least 2 args */ opt_complementary = "-2:t+"; /* at least 2 args; -t N */
op->flags = getopt32(argv, opt_string, op->flags = getopt32(argv, opt_string,
&(op->initstring), fakehost_p, &(op->issue), &(op->initstring), fakehost_p, &(op->issue),
&(op->login), &ts); &(op->login), &op->timeout);
argv += optind; argv += optind;
if (op->flags & F_INITSTRING) { if (op->flags & F_INITSTRING) {
const char *p = op->initstring; const char *p = op->initstring;
@ -203,10 +204,7 @@ static void parse_args(char **argv, struct options *op, char **fakehost_p)
} }
*q = '\0'; *q = '\0';
} }
op->flags ^= F_ISSUE; /* invert flag show /etc/issue */ op->flags ^= F_ISSUE; /* invert flag "show /etc/issue" */
if (op->flags & F_TIMEOUT) {
op->timeout = xatoi_u(ts);
}
debug("after getopt\n"); debug("after getopt\n");
/* we loosen up a bit and accept both "baudrate tty" and "tty baudrate" */ /* we loosen up a bit and accept both "baudrate tty" and "tty baudrate" */
@ -219,8 +217,11 @@ static void parse_args(char **argv, struct options *op, char **fakehost_p)
} }
parse_speeds(op, ts); parse_speeds(op, ts);
// TODO: if applet_name is set to "getty: TTY", bb_error_msg's get simpler!
// grep for "%s:"
if (argv[2]) if (argv[2])
setenv("TERM", argv[2], 1); xsetenv("TERM", argv[2]);
debug("exiting parse_args\n"); debug("exiting parse_args\n");
} }
@ -230,37 +231,37 @@ static void open_tty(const char *tty)
{ {
/* Set up new standard input, unless we are given an already opened port. */ /* Set up new standard input, unless we are given an already opened port. */
if (NOT_LONE_DASH(tty)) { if (NOT_LONE_DASH(tty)) {
struct stat st; // struct stat st;
int cur_dir_fd; // int cur_dir_fd;
int fd; // int fd;
/* Sanity checks... */ /* Sanity checks... */
cur_dir_fd = xopen(".", O_DIRECTORY | O_NONBLOCK); // cur_dir_fd = xopen(".", O_DIRECTORY | O_NONBLOCK);
xchdir("/dev"); // xchdir("/dev");
xstat(tty, &st); // xstat(tty, &st);
if ((st.st_mode & S_IFMT) != S_IFCHR) // if ((st.st_mode & S_IFMT) != S_IFCHR)
bb_error_msg_and_die("%s: not a character device", tty); // bb_error_msg_and_die("%s: not a character device", tty);
if (tty[0] != '/')
tty = xasprintf("/dev/%s", tty); /* will leak it */
/* Open the tty as standard input. */ /* Open the tty as standard input. */
debug("open(2)\n"); debug("open(2)\n");
fd = xopen(tty, O_RDWR | O_NONBLOCK); close(0);
/*fd =*/ xopen(tty, O_RDWR | O_NONBLOCK); /* uses fd 0 */
/* Restore current directory */ // /* Restore current directory */
fchdir(cur_dir_fd); // fchdir(cur_dir_fd);
/* Open the tty as standard input, continued */ /* Open the tty as standard input, continued */
xdup2(fd, 0); // xmove_fd(fd, 0);
/* fd is >= cur_dir_fd, and cur_dir_fd gets closed too here: */ // /* fd is >= cur_dir_fd, and cur_dir_fd gets closed too here: */
while (fd > 2) // while (fd > 2)
close(fd--); // close(fd--);
/* Set proper protections and ownership. Mode 0622 /* Set proper protections and ownership. */
* is suitable for SYSV < 4 because /bin/login does not change
* protections. SunOS 4 login will change the protections to 0620
* (write access for group tty) after the login has succeeded.
*/
fchown(0, 0, 0); /* 0:0 */ fchown(0, 0, 0); /* 0:0 */
fchmod(0, 0622); /* crw--w--w- */ fchmod(0, 0620); /* crw--w---- */
} else { } else {
/* /*
* Standard input should already be connected to an open port. Make * Standard input should already be connected to an open port. Make
@ -286,9 +287,8 @@ static void termios_init(struct termios *tp, int speed, struct options *op)
#endif #endif
tp->c_cflag = CS8 | HUPCL | CREAD | speed; tp->c_cflag = CS8 | HUPCL | CREAD | speed;
if (op->flags & F_LOCAL) { if (op->flags & F_LOCAL)
tp->c_cflag |= CLOCAL; tp->c_cflag |= CLOCAL;
}
tp->c_iflag = tp->c_lflag = tp->c_line = 0; tp->c_iflag = tp->c_lflag = tp->c_line = 0;
tp->c_oflag = OPOST | ONLCR; tp->c_oflag = OPOST | ONLCR;
@ -397,11 +397,11 @@ static char *get_logname(char *logname, unsigned size_logname,
char ascval; /* low 7 bits of input character */ char ascval; /* low 7 bits of input character */
int bits; /* # of "1" bits per character */ int bits; /* # of "1" bits per character */
int mask; /* mask with 1 bit up */ int mask; /* mask with 1 bit up */
static const char erase[][3] = { /* backspace-space-backspace */ static const char erase[][3] = {/* backspace-space-backspace */
"\010\040\010", /* space parity */ "\010\040\010", /* space parity */
"\010\040\010", /* odd parity */ "\010\040\010", /* odd parity */
"\210\240\210", /* even parity */ "\210\240\210", /* even parity */
"\210\240\210", /* no parity */ "\010\040\010", /* 8 bit no parity */
}; };
/* NB: *cp is pre-initialized with init_chardata */ /* NB: *cp is pre-initialized with init_chardata */
@ -434,12 +434,11 @@ static char *get_logname(char *logname, unsigned size_logname,
return NULL; return NULL;
/* Do parity bit handling. */ /* Do parity bit handling. */
ascval = c & 0177; if (!(op->flags & F_LOCAL) && (c & 0x80)) { /* "parity" bit on? */
if (!(op->flags & F_LOCAL) && (c != ascval)) { /* "parity" bit on ? */
bits = 1; bits = 1;
mask = 1; mask = 1;
while (mask & 0177) { while (mask & 0x7f) {
if (mask & ascval) if (mask & c)
bits++; /* count "1" bits */ bits++; /* count "1" bits */
mask <<= 1; mask <<= 1;
} }
@ -448,6 +447,7 @@ static char *get_logname(char *logname, unsigned size_logname,
} }
/* Do erase, kill and end-of-line processing. */ /* Do erase, kill and end-of-line processing. */
ascval = c & 0x7f;
switch (ascval) { switch (ascval) {
case CR: case CR:
case NL: case NL:
@ -507,7 +507,6 @@ static char *get_logname(char *logname, unsigned size_logname,
static void termios_final(struct options *op, struct termios *tp, struct chardata *cp) static void termios_final(struct options *op, struct termios *tp, struct chardata *cp)
{ {
/* General terminal-independent stuff. */ /* General terminal-independent stuff. */
tp->c_iflag |= IXON | IXOFF; /* 2-way flow control */ tp->c_iflag |= IXON | IXOFF; /* 2-way flow control */
tp->c_lflag |= ICANON | ISIG | ECHO | ECHOE | ECHOK | ECHOKE; tp->c_lflag |= ICANON | ISIG | ECHO | ECHOE | ECHOK | ECHOKE;
/* no longer| ECHOCTL | ECHOPRT */ /* no longer| ECHOCTL | ECHOPRT */
@ -520,7 +519,6 @@ static void termios_final(struct options *op, struct termios *tp, struct chardat
tp->c_cc[VSWTC] = DEF_SWITCH; /* default switch character */ tp->c_cc[VSWTC] = DEF_SWITCH; /* default switch character */
/* Account for special characters seen in input. */ /* Account for special characters seen in input. */
if (cp->eol == CR) { if (cp->eol == CR) {
tp->c_iflag |= ICRNL; /* map CR in input to NL */ tp->c_iflag |= ICRNL; /* map CR in input to NL */
tp->c_oflag |= ONLCR; /* map NL in output to CR-NL */ tp->c_oflag |= ONLCR; /* map NL in output to CR-NL */
@ -529,9 +527,9 @@ static void termios_final(struct options *op, struct termios *tp, struct chardat
tp->c_cc[VKILL] = cp->kill; /* set kill character */ tp->c_cc[VKILL] = cp->kill; /* set kill character */
/* Account for the presence or absence of parity bits in input. */ /* Account for the presence or absence of parity bits in input. */
switch (cp->parity) { switch (cp->parity) {
case 0: /* space (always 0) parity */ case 0: /* space (always 0) parity */
// I bet most people go here - they use only 7-bit chars in usernames....
break; break;
case 1: /* odd parity */ case 1: /* odd parity */
tp->c_cflag |= PARODD; tp->c_cflag |= PARODD;
@ -543,6 +541,9 @@ static void termios_final(struct options *op, struct termios *tp, struct chardat
case (1 | 2): /* no parity bit */ case (1 | 2): /* no parity bit */
tp->c_cflag &= ~CSIZE; tp->c_cflag &= ~CSIZE;
tp->c_cflag |= CS7; tp->c_cflag |= CS7;
// FIXME: wtf? case 3: we saw both even and odd 8-bit bytes -
// it's probably some umlauts etc, but definitely NOT 7-bit!!!
// Entire parity detection madness here just begs for deletion...
break; break;
} }
@ -555,14 +556,12 @@ static void termios_final(struct options *op, struct termios *tp, struct chardat
} }
#endif #endif
/* Optionally enable hardware flow control */ /* Optionally enable hardware flow control */
#ifdef CRTSCTS #ifdef CRTSCTS
if (op->flags & F_RTSCTS) if (op->flags & F_RTSCTS)
tp->c_cflag |= CRTSCTS; tp->c_cflag |= CRTSCTS;
#endif #endif
/* Finally, make the new settings effective */ /* Finally, make the new settings effective */
ioctl_or_perror_and_die(0, TCSETS, tp, "%s: TCSETS", op->tty); ioctl_or_perror_and_die(0, TCSETS, tp, "%s: TCSETS", op->tty);
} }
@ -634,6 +633,8 @@ int getty_main(int argc, char **argv)
struct termios termios; /* terminal mode bits */ struct termios termios; /* terminal mode bits */
struct options options; struct options options;
chardata = init_chardata;
memset(&options, 0, sizeof(options)); memset(&options, 0, sizeof(options));
options.login = _PATH_LOGIN; /* default login program */ options.login = _PATH_LOGIN; /* default login program */
options.tty = "tty1"; /* default tty line */ options.tty = "tty1"; /* default tty line */
@ -642,9 +643,9 @@ int getty_main(int argc, char **argv)
options.issue = ISSUE; /* default issue file */ options.issue = ISSUE; /* default issue file */
#endif #endif
/* Already too late because of theoretical /* Parse command-line arguments. */
* possibility of getty --help somehow triggered parse_args(argv, &options, &fakehost);
* inadvertently before we reach this. Oh well. */
logmode = LOGMODE_NONE; logmode = LOGMODE_NONE;
/* Create new session, lose controlling tty, if any */ /* Create new session, lose controlling tty, if any */
@ -652,16 +653,18 @@ int getty_main(int argc, char **argv)
* "This is allowed only when the current process * "This is allowed only when the current process
* is not a process group leader" - is this a problem? */ * is not a process group leader" - is this a problem? */
setsid(); setsid();
/* close stdio, and stray descriptors, just in case */
n = xopen(bb_dev_null, O_RDWR); n = xopen(bb_dev_null, O_RDWR);
/* dup2(n, 0); - no, because of possible "getty - 9600" */ /* dup2(n, 0); - no, we need to handle "getty - 9600" too */
dup2(n, 1); xdup2(n, 1);
dup2(n, 2); xdup2(n, 2);
while (n > 2) while (n > 2)
close(n--); close(n--);
/* We want special flavor of error_msg_and_die */
/* Logging. We want special flavor of error_msg_and_die */
die_sleep = 10; die_sleep = 10;
msg_eol = "\r\n"; msg_eol = "\r\n";
/* most likely will internally use fd #3 in CLOEXEC mode: */
openlog(applet_name, LOG_PID, LOG_AUTH); openlog(applet_name, LOG_PID, LOG_AUTH);
logmode = LOGMODE_BOTH; logmode = LOGMODE_BOTH;
@ -673,15 +676,12 @@ int getty_main(int argc, char **argv)
} }
#endif #endif
/* Parse command-line arguments. */
parse_args(argv, &options, &fakehost);
debug("calling open_tty\n");
/* Open the tty as standard input, if it is not "-" */ /* Open the tty as standard input, if it is not "-" */
/* If it's not "-" and not taken yet, it will become our ctty */
debug("calling open_tty\n");
open_tty(options.tty); open_tty(options.tty);
debug("duping\n");
ndelay_off(0); ndelay_off(0);
debug("duping\n");
xdup2(0, 1); xdup2(0, 1);
xdup2(0, 2); xdup2(0, 2);
@ -695,17 +695,18 @@ int getty_main(int argc, char **argv)
*/ */
ioctl_or_perror_and_die(0, TCGETS, &termios, "%s: TCGETS", options.tty); ioctl_or_perror_and_die(0, TCGETS, &termios, "%s: TCGETS", options.tty);
#if ENABLE_FEATURE_UTMP
/* Update the utmp file */
update_utmp(options.tty, fakehost);
#endif
#ifdef __linux__ #ifdef __linux__
/* Make ourself a foreground process group within our session */ // FIXME: do we need this? Otherwise "-" case seems to be broken...
tcsetpgrp(0, getpid());
// /* Forcibly make fd 0 our controlling tty, even if another session // /* Forcibly make fd 0 our controlling tty, even if another session
// * has it as a ctty. (Another session loses ctty). */ // * has it as a ctty. (Another session loses ctty). */
// ioctl(0, TIOCSCTTY, (void*)1); // ioctl(0, TIOCSCTTY, (void*)1);
/* Make ourself a foreground process group within our session */
tcsetpgrp(0, getpid());
#endif
#if ENABLE_FEATURE_UTMP
/* Update the utmp file. This tty is ours now! */
update_utmp(options.tty, fakehost);
#endif #endif
/* Initialize the termios settings (raw mode, eight-bit, blocking i/o). */ /* Initialize the termios settings (raw mode, eight-bit, blocking i/o). */
@ -724,8 +725,7 @@ int getty_main(int argc, char **argv)
auto_baud(line_buf, sizeof(line_buf), &termios); auto_baud(line_buf, sizeof(line_buf), &termios);
/* Set the optional timer */ /* Set the optional timer */
if (options.timeout) alarm(options.timeout); /* if 0, alarm is not set */
alarm(options.timeout);
/* Optionally wait for CR or LF before writing /etc/issue */ /* Optionally wait for CR or LF before writing /etc/issue */
if (options.flags & F_WAITCRLF) { if (options.flags & F_WAITCRLF) {
@ -733,17 +733,14 @@ int getty_main(int argc, char **argv)
debug("waiting for cr-lf\n"); debug("waiting for cr-lf\n");
while (safe_read(0, &ch, 1) == 1) { while (safe_read(0, &ch, 1) == 1) {
debug("read %x\n", (unsigned char)ch);
ch &= 0x7f; /* strip "parity bit" */ ch &= 0x7f; /* strip "parity bit" */
#ifdef DEBUGGING
fprintf(dbf, "read %c\n", ch);
#endif
if (ch == '\n' || ch == '\r') if (ch == '\n' || ch == '\r')
break; break;
} }
} }
logname = NULL; logname = NULL;
chardata = init_chardata;
if (!(options.flags & F_NOPROMPT)) { if (!(options.flags & F_NOPROMPT)) {
/* NB:termios_init already set line speed /* NB:termios_init already set line speed
* to options.speeds[0] */ * to options.speeds[0] */
@ -753,7 +750,7 @@ int getty_main(int argc, char **argv)
/* Read the login name. */ /* Read the login name. */
debug("reading login name\n"); debug("reading login name\n");
logname = get_logname(line_buf, sizeof(line_buf), logname = get_logname(line_buf, sizeof(line_buf),
&options, &chardata, &termios); &options, &chardata, &termios);
if (logname) if (logname)
break; break;
/* we are here only if options.numspeed > 1 */ /* we are here only if options.numspeed > 1 */
@ -765,8 +762,7 @@ int getty_main(int argc, char **argv)
} }
/* Disable timer. */ /* Disable timer. */
if (options.timeout) alarm(0);
alarm(0);
/* Finalize the termios settings. */ /* Finalize the termios settings. */
termios_final(&options, &termios, &chardata); termios_final(&options, &termios, &chardata);
@ -777,7 +773,7 @@ int getty_main(int argc, char **argv)
/* Let the login program take care of password validation. */ /* Let the login program take care of password validation. */
/* We use PATH because we trust that root doesn't set "bad" PATH, /* We use PATH because we trust that root doesn't set "bad" PATH,
* and getty is not suid-root applet. */ * and getty is not suid-root applet. */
/* Hmm... with -n, logname == NULL! Is it ok? */ /* With -n, logname == NULL, and login will ask for username instead */
BB_EXECLP(options.login, options.login, "--", logname, NULL); BB_EXECLP(options.login, options.login, "--", logname, NULL);
bb_error_msg_and_die("%s: can't exec %s", options.tty, options.login); bb_error_msg_and_die("%s: can't exec %s", options.tty, options.login);
} }

4
util-linux/mount.c
View File

@ -1725,8 +1725,6 @@ static const char must_be_root[] ALIGN1 = "you must be root";
int mount_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int mount_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int mount_main(int argc, char **argv) int mount_main(int argc, char **argv)
{ {
enum { OPT_ALL = 0x10 };
char *cmdopts = xstrdup(""); char *cmdopts = xstrdup("");
char *fstype = NULL; char *fstype = NULL;
char *storage_path = NULL; char *storage_path = NULL;
@ -1771,7 +1769,7 @@ int mount_main(int argc, char **argv)
// If we have no arguments, show currently mounted filesystems // If we have no arguments, show currently mounted filesystems
if (!argc) { if (!argc) {
if (!(opt & OPT_ALL)) { if (!(opt & OPT_a)) {
FILE *mountTable = setmntent(bb_path_mtab_file, "r"); FILE *mountTable = setmntent(bb_path_mtab_file, "r");
if (!mountTable) bb_error_msg_and_die("no %s", bb_path_mtab_file); if (!mountTable) bb_error_msg_and_die("no %s", bb_path_mtab_file);