[Audit-test-developer] [PATCH 30/46] utils/bin/do_settimeofday: make timezone optional

[Jiri J. <jja...@re...>]

Signed-off-by: Jiri Jaburek <jja...@re...>
---
 audit-test/utils/bin/do_settimeofday.c | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/audit-test/utils/bin/do_settimeofday.c b/audit-test/utils/bin/do_settimeofday.c
index 7dba2d0..e45ce50 100644
--- a/audit-test/utils/bin/do_settimeofday.c
+++ b/audit-test/utils/bin/do_settimeofday.c
@@ -20,24 +20,28 @@ int main(int argc, char **argv)
 {
     int exitval, result;
     struct timeval tv;
-    struct timezone tz;
+    struct timezone tz_data, *tz = NULL;
 
-    if (argc < 3) {
-	fprintf(stderr, "Usage:\n%s <seconds> <timezone> [DST correction]\n",
+    if (argc < 2) {
+	fprintf(stderr, "Usage:\n%s <seconds> [timezone] [DST correction]\n",
 		argv[0]);
 	return TEST_ERROR;
     }
 
-    memset(&tv, 0, sizeof(tv));
-    memset(&tz, 0, sizeof(tz));
-
+    memset(&tv, 0, sizeof(struct timeval));
     tv.tv_sec = atol(argv[1]);
-    tz.tz_minuteswest = atoi(argv[2]);
+
+    if (argc >= 3) {
+        tz = &tz_data;
+        memset(tz, 0, sizeof(struct timezone));
+        tz->tz_minuteswest = atoi(argv[2]);
+    }
+
     if (argc >= 4)
-	tz.tz_dsttime = atoi(argv[3]);
+	tz->tz_dsttime = atoi(argv[3]);
 
     errno = 0;
-    exitval = settimeofday(&tv, &tz);
+    exitval = settimeofday(&tv, tz);
     result = exitval < 0;
 
     printf("%d %d %d\n", result, result ? errno : exitval, getpid());
-- 
1.8.3.1