diff options
| author | Denys Vlasenko | 2017-08-03 19:00:01 +0200 |
|---|---|---|
| committer | Denys Vlasenko | 2017-08-03 19:03:32 +0200 |
| commit | 39194f030918b87eeb3e11e94cfa05f575fb47b4 (patch) | |
| tree | 97ea35e2c5984c5c6757ff9a540630ada4b234d5 /coreutils/date.c | |
| parent | 663ae52676eae3b0fdc6bb968ff6497279a034a4 (diff) | |
| download | busybox-39194f030918b87eeb3e11e94cfa05f575fb47b4.zip busybox-39194f030918b87eeb3e11e94cfa05f575fb47b4.tar.gz | |
new NOFORKs: pwdx,kill[all5],ttysize,realpath,readlink NOEXECs: date,resize
function old new delta
run_nofork_applet 258 280 +22
readlink_main 112 123 +11
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 2/0 up/down: 33/0) Total: 33 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'coreutils/date.c')
| -rw-r--r-- | coreutils/date.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/coreutils/date.c b/coreutils/date.c index 2c6e1d4..89b2816 100644 --- a/coreutils/date.c +++ b/coreutils/date.c @@ -58,7 +58,7 @@ //config: the same format. With it on, 'date DATE' additionally supports //config: MMDDhhmm[[YY]YY][.ss] format. -//applet:IF_DATE(APPLET(date, BB_DIR_BIN, BB_SUID_DROP)) +//applet:IF_DATE(APPLET_NOEXEC(date, date, BB_DIR_BIN, BB_SUID_DROP, date)) //kbuild:lib-$(CONFIG_DATE) += date.o @@ -152,12 +152,6 @@ enum { OPT_HINT = (1 << 6) * ENABLE_FEATURE_DATE_ISOFMT, /* D */ }; -static void maybe_set_utc(int opt) -{ - if (opt & OPT_UTC) - putenv((char*)"TZ=UTC0"); -} - #if ENABLE_LONG_OPTS static const char date_longopts[] ALIGN1 = "rfc-822\0" No_argument "R" @@ -170,6 +164,19 @@ static const char date_longopts[] ALIGN1 = ; #endif +/* We are a NOEXEC applet. + * Obstacles to NOFORK: + * - we change env + * - xasprintf result not freed + * - after xasprintf we use other xfuncs + */ + +static void maybe_set_utc(int opt) +{ + if (opt & OPT_UTC) + putenv((char*)"TZ=UTC0"); +} + int date_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int date_main(int argc UNUSED_PARAM, char **argv) { |