7f9593753
Denis Vlasenko
2009-04-14
Subject
randomconfig fixes
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
libbb/update_passwd.c+3 -1
| @@ -224,8 +224,10 @@ int FAST_FUNC update_passwd(const char *filename, | |
| } | |
| if (changed_lines == 0) { | |
| - | if (ENABLE_FEATURE_DEL_USER_FROM_GROUP && member) |
| + | #if ENABLE_FEATURE_DEL_USER_FROM_GROUP |
| + | if (member) |
| bb_error_msg("can't find %s in %s", member, filename); | |
| + | #endif |
| if ((ENABLE_ADDUSER || ENABLE_ADDGROUP) | |
| && applet_name[0] == 'a' && !member | |
| ) { | |
shell/hush.c+5 -1
| @@ -4069,11 +4069,15 @@ static void done_pipe(struct parse_context *ctx, pipe_style type) | |
| * RES_NONE case is for "for a in; do ..." (empty IN set) | |
| * and other cases to work. */ | |
| if (not_null | |
| - | #if HAS_KEYWORDS |
| + | #if ENABLE_HUSH_IF |
| || ctx->ctx_res_w == RES_FI | |
| + | #endif |
| + | #if ENABLE_HUSH_LOOPS |
| || ctx->ctx_res_w == RES_DONE | |
| || ctx->ctx_res_w == RES_FOR | |
| || ctx->ctx_res_w == RES_IN | |
| + | #endif |
| + | #if ENABLE_HUSH_CASE |
| || ctx->ctx_res_w == RES_ESAC | |
| #endif | |
| ) { | |
util-linux/mdev.c+4 -3
| @@ -98,10 +98,11 @@ static void make_device(char *path, int delete) | |
| if (strstr(path, "/block/")) | |
| type = S_IFBLK; | |
| - | #if ENABLE_FEATURE_MDEV_CONF |
| - | parser = config_open2("/etc/mdev.conf", fopen_for_read); |
| - | |
| + | #if !ENABLE_FEATURE_MDEV_CONF |
| + | mode = 0660; |
| + | #else |
| /* If we have config file, look up user settings */ | |
| + | parser = config_open2("/etc/mdev.conf", fopen_for_read); |
| while (1) { | |
| regmatch_t off[1 + 9*ENABLE_FEATURE_MDEV_RENAME_REGEXP]; | |
| int keep_matching; | |