tar: support -T - and -X -

[oweals/busybox.git] / libbb / rtc.c

diff --git a/libbb/rtc.c b/libbb/rtc.c
index 9807e1cf9e0bf24f9bb2f0932b74da2d3ae5b2f1..97455e86ae187a359e7dbc4e94f846406bb19cfd 100644 (file)
--- a/libbb/rtc.c
+++ b/libbb/rtc.c
@@ -1,7 +1,7 @@
 /*
  * Common RTC functions
  *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 
 #include "libbb.h"
@@ -22,13 +22,6 @@ int FAST_FUNC rtc_adjtime_is_utc(void)
                char buffer[128];
 
                while (fgets(buffer, sizeof(buffer), f)) {
-                       int len = strlen(buffer);
-
-                       while (len && isspace(buffer[len - 1]))
-                               len--;
-
-                       buffer[len] = 0;
-
                        if (strncmp(buffer, "UTC", 3) == 0) {
                                utc = 1;
                                break;
@@ -59,14 +52,14 @@ int FAST_FUNC rtc_xopen(const char **default_rtc, int flags)
        return xopen(*default_rtc, flags);
 }
 
-void FAST_FUNC rtc_read_tm(struct tm *tm, int fd)
+void FAST_FUNC rtc_read_tm(struct tm *ptm, int fd)
 {
-       memset(tm, 0, sizeof(*tm));
-       xioctl(fd, RTC_RD_TIME, tm);
-       tm->tm_isdst = -1; /* "not known" */
+       memset(ptm, 0, sizeof(*ptm));
+       xioctl(fd, RTC_RD_TIME, ptm);
+       ptm->tm_isdst = -1; /* "not known" */
 }
 
-time_t FAST_FUNC rtc_tm2time(struct tm *tm, int utc)
+time_t FAST_FUNC rtc_tm2time(struct tm *ptm, int utc)
 {
        char *oldtz = oldtz; /* for compiler */
        time_t t;
@@ -77,7 +70,7 @@ time_t FAST_FUNC rtc_tm2time(struct tm *tm, int utc)
                tzset();
        }
 
-       t = mktime(tm);
+       t = mktime(ptm);
 
        if (utc) {
                unsetenv("TZ");