diff options
author | Elliott Hughes <enh@google.com> | 2021-04-28 23:20:00 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-28 23:20:00 +0000 |
commit | 4b4659e8a0b28bd8da35c17df1c06eab0ab40711 (patch) | |
tree | 7364a1e882fc28e681b4463f3e0a87f1897acd82 /main.c | |
parent | ebc44a21f1944cce6817ae7943ff358f3c0dfa0a (diff) | |
parent | dcacb9b215f353b03bbb0606d0ee786533c73684 (diff) | |
download | toybox-4b4659e8a0b28bd8da35c17df1c06eab0ab40711.tar.gz |
Merge remote-tracking branch 'toybox/master' into HEAD am: 48ecd3a575 am: 1ee3b5cac0 am: de1cff1a5c am: dcacb9b215
Original change: https://android-review.googlesource.com/c/platform/external/toybox/+/1690088
Change-Id: I0b4a5c534f9870f85a65a997fdc06634311f47c8
Diffstat (limited to 'main.c')
-rw-r--r-- | main.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -95,7 +95,7 @@ void toy_singleinit(struct toy_list *which, char *argv[]) for (toys.optc = 0; toys.optargs[toys.optc]; toys.optc++); } - if (!(which->flags & TOYFLAG_NOFORK)) { + if (!(CFG_TOYBOX && which == toy_list) && !(which->flags & TOYFLAG_NOFORK)) { toys.old_umask = umask(0); if (!(which->flags & TOYFLAG_UMASK)) umask(toys.old_umask); |