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

randomconfig fixes

Browse Source
This commit is contained in:
Denis Vlasenko 2009-04-14 08:06:59 +00:00
parent b024f8da8f
commit 7f9593753a
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libbb/update_passwd.c
View File

@ -224,8 +224,10 @@ int FAST_FUNC update_passwd(const char *filename,
} }
if (changed_lines == 0) { 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); bb_error_msg("can't find %s in %s", member, filename);
#endif
if ((ENABLE_ADDUSER || ENABLE_ADDGROUP) if ((ENABLE_ADDUSER || ENABLE_ADDGROUP)
&& applet_name[0] == 'a' && !member && applet_name[0] == 'a' && !member
) { ) {

6
shell/hush.c
View File

@ -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) * RES_NONE case is for "for a in; do ..." (empty IN set)
* and other cases to work. */ * and other cases to work. */
if (not_null if (not_null
#if HAS_KEYWORDS #if ENABLE_HUSH_IF
|| ctx->ctx_res_w == RES_FI || ctx->ctx_res_w == RES_FI
#endif
#if ENABLE_HUSH_LOOPS
|| ctx->ctx_res_w == RES_DONE || ctx->ctx_res_w == RES_DONE
|| ctx->ctx_res_w == RES_FOR || ctx->ctx_res_w == RES_FOR
|| ctx->ctx_res_w == RES_IN || ctx->ctx_res_w == RES_IN
#endif
#if ENABLE_HUSH_CASE
|| ctx->ctx_res_w == RES_ESAC || ctx->ctx_res_w == RES_ESAC
#endif #endif
) { ) {

7
util-linux/mdev.c
View File

@ -98,10 +98,11 @@ static void make_device(char *path, int delete)
if (strstr(path, "/block/")) if (strstr(path, "/block/"))
type = S_IFBLK; type = S_IFBLK;
#if ENABLE_FEATURE_MDEV_CONF #if !ENABLE_FEATURE_MDEV_CONF
parser = config_open2("/etc/mdev.conf", fopen_for_read); mode = 0660;
#else
/* If we have config file, look up user settings */ /* If we have config file, look up user settings */
parser = config_open2("/etc/mdev.conf", fopen_for_read);
while (1) { while (1) {
regmatch_t off[1 + 9*ENABLE_FEATURE_MDEV_RENAME_REGEXP]; regmatch_t off[1 + 9*ENABLE_FEATURE_MDEV_RENAME_REGEXP];
int keep_matching; int keep_matching;