diff options
| author | Sami Kerola | 2016-08-07 08:27:21 +0200 |
|---|---|---|
| committer | Sami Kerola | 2016-08-12 22:25:36 +0200 |
| commit | 984a60965a0e3cd3253a74c77af916b05381c03d (patch) | |
| tree | 8aafe4e47b256298b2ed294dbdcdc50c59c730bf /sys-utils | |
| parent | tests: mark build-in paths test as optional (diff) | |
| download | kernel-qcow2-util-linux-984a60965a0e3cd3253a74c77af916b05381c03d.tar.gz kernel-qcow2-util-linux-984a60965a0e3cd3253a74c77af916b05381c03d.tar.xz kernel-qcow2-util-linux-984a60965a0e3cd3253a74c77af916b05381c03d.zip | |
misc: always check setenv(3) return value
At least glibc setenv(3) can fail when system runs out of memory.
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
Diffstat (limited to 'sys-utils')
| -rw-r--r-- | sys-utils/hwclock.c | 5 | ||||
| -rw-r--r-- | sys-utils/rtcwake.c | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c index e98c2c00f..21caeb21b 100644 --- a/sys-utils/hwclock.c +++ b/sys-utils/hwclock.c @@ -81,6 +81,7 @@ #include "strutils.h" #include "hwclock.h" #include "timeutils.h" +#include "env.h" #ifdef HAVE_LIBAUDIT #include <libaudit.h> @@ -399,7 +400,7 @@ mktime_tz(struct tm tm, const bool universal, zone = getenv("TZ"); /* remember original time zone */ if (universal) { /* Set timezone to UTC */ - setenv("TZ", "", TRUE); + xsetenv("TZ", "", TRUE); /* * Note: tzset() gets called implicitly by the time code, * but only the first time. When changing the environment @@ -434,7 +435,7 @@ mktime_tz(struct tm tm, const bool universal, } /* now put back the original zone. */ if (zone) - setenv("TZ", zone, TRUE); + xsetenv("TZ", zone, TRUE); else unsetenv("TZ"); tzset(); diff --git a/sys-utils/rtcwake.c b/sys-utils/rtcwake.c index 536c5bf5c..f4e630a33 100644 --- a/sys-utils/rtcwake.c +++ b/sys-utils/rtcwake.c @@ -34,6 +34,7 @@ #include "c.h" #include "closestream.h" +#include "env.h" #include "nls.h" #include "optutils.h" #include "pathnames.h" @@ -157,7 +158,7 @@ static int get_basetimes(struct rtcwake_control *ctl, int fd) * with the system clock (which always uses UTC). */ if (ctl->clock_mode == CM_UTC) - setenv("TZ", "UTC", 1); + xsetenv("TZ", "UTC", 1); tzset(); /* Read rtc and system clocks "at the same time", or as * precisely (+/- a second) as we can read them. |