diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-07-26 23:08:31 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-07-26 23:08:31 +0000 |
commit | 084266ed520805bbc4ec3f9b4d14e644ecd75880 (patch) | |
tree | fe2c8531dc039c81c12a39f39fcfdf6c1b8ec996 /loginutils/login.c | |
parent | 8895c2073e9341d8e0348365e75ba6aa4b9b8d05 (diff) | |
download | busybox-w32-084266ed520805bbc4ec3f9b4d14e644ecd75880.tar.gz busybox-w32-084266ed520805bbc4ec3f9b4d14e644ecd75880.tar.bz2 busybox-w32-084266ed520805bbc4ec3f9b4d14e644ecd75880.zip |
fix several problems with config parser:
a bug where it underflows the string
a bug where it never frees parser_t struct
make read_config() return 0 if parser is NULL,
make config_close() accept and ignore NULL parser -
eliminates many if() blocks
reverse the sense of parser bit flags - negative flags
are harder to grok.
hexdump: revert the change to use config parser, it is BIGGER
and also requires additional quirks in parser
*: explicitly use PARSER_NORMAL instead of 0
function old new delta
login_main 1575 1596 +21
config_close 18 29 +11
bbunpack 383 391 +8
qgravechar 106 109 +3
rtnl_tab_initialize 121 117 -4
expand 1697 1693 -4
man_main 717 712 -5
nameif_main 674 668 -6
hexdump_main 597 591 -6
read_config 217 209 -8
dnsd_main 1478 1470 -8
sysctl_main 203 189 -14
config_open2 44 25 -19
make_device 1177 1141 -36
config_read 597 549 -48
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 4/11 up/down: 43/-158) Total: -115 bytes
Diffstat (limited to 'loginutils/login.c')
-rw-r--r-- | loginutils/login.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/loginutils/login.c b/loginutils/login.c index 5a75ed218..8732b99f1 100644 --- a/loginutils/login.c +++ b/loginutils/login.c | |||
@@ -139,20 +139,17 @@ static ALWAYS_INLINE void die_if_nologin(void) {} | |||
139 | #if ENABLE_FEATURE_SECURETTY && !ENABLE_PAM | 139 | #if ENABLE_FEATURE_SECURETTY && !ENABLE_PAM |
140 | static int check_securetty(void) | 140 | static int check_securetty(void) |
141 | { | 141 | { |
142 | char *buf; | 142 | char *buf = (char*)"/etc/securetty"; /* any non-NULL is ok */ |
143 | int ret = 1; | ||
144 | parser_t *parser = config_open2("/etc/securetty", fopen_for_read); | 143 | parser_t *parser = config_open2("/etc/securetty", fopen_for_read); |
145 | /* N.B. A missing securetty file is not an error. */ | 144 | while (config_read(parser, &buf, 1, 1, "# \t", PARSE_NORMAL)) { |
146 | if (parser) { | 145 | if (strcmp(buf, short_tty) == 0) |
147 | while (config_read(parser, &buf, 1, 1, "# \t", 0)) { | 146 | break; |
148 | if (strcmp(buf, short_tty) == 0) | 147 | buf = NULL; |
149 | break; | ||
150 | } | ||
151 | config_close(parser); | ||
152 | // buf != NULL here iff config file was empty (OK) or buf equals short_tty (OK) | ||
153 | ret = buf != NULL; | ||
154 | } | 148 | } |
155 | return ret; | 149 | config_close(parser); |
150 | /* buf != NULL here if config file was not found, empty | ||
151 | * or line was found which equals short_tty */ | ||
152 | return buf != NULL; | ||
156 | } | 153 | } |
157 | #else | 154 | #else |
158 | static ALWAYS_INLINE int check_securetty(void) { return 1; } | 155 | static ALWAYS_INLINE int check_securetty(void) { return 1; } |