From: Kay Sievers <kay@vrfy.org>
Date: Fri, 2 Nov 2012 15:45:02 +0000 (-1000)
Subject: timedatectl: show "DST active: n/a" if no DST data is available
X-Git-Tag: v196~149
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=e2fd5e5ba281a22886fa3797dc6265cca670448b

timedatectl: show "DST active: n/a" if no DST data is available
---

diff --git a/src/shared/time-dst.c b/src/shared/time-dst.c
index 8f3cafd5e..df5f15151 100644
--- a/src/shared/time-dst.c
+++ b/src/shared/time-dst.c
@@ -102,7 +102,7 @@ int time_get_dst(time_t date, const char *tzfile,
         size_t tzspec_len;
         size_t num_leaps;
         size_t lo, hi;
-        int err = 0;
+        int err = -EINVAL;
 
         f = fopen(tzfile, "re");
         if (f == NULL)
diff --git a/src/timedate/timedatectl.c b/src/timedate/timedatectl.c
index b7f2422a1..564f9e5f7 100644
--- a/src/timedate/timedatectl.c
+++ b/src/timedate/timedatectl.c
@@ -136,7 +136,9 @@ static void print_status_info(StatusInfo *i) {
         r = time_get_dst(sec, "/etc/localtime",
                          &tc, &zc, &is_dstc,
                          &tn, &zn, &is_dstn);
-        if (r >= 0) {
+        if (r < 0)
+                printf("      DST active: n/a\n");
+        else {
                 printf("      DST active: %s\n", yes_no(is_dstc));
 
                 t = tc - 1;