From: Yehuda Sadeh <yehuda@inktank.com>
Date: Sat, 10 May 2014 00:01:44 +0000 (-0700)
Subject: utime: extend utime parsing
X-Git-Tag: v0.93~165^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6b0151c4875fc20556fffead333b1685ae484331;p=ceph.git

utime: extend utime parsing

Since we sometimes encode it as <sec>.<usec>, also try to parse it using
this format.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
---

diff --git a/src/include/utime.h b/src/include/utime.h
index 032c7d04ab19..9ec0c48f70d4 100644
--- a/src/include/utime.h
+++ b/src/include/utime.h
@@ -278,7 +278,18 @@ public:
         }
       }
     } else {
-      return -EINVAL;
+      int sec, usec;
+      int r = sscanf(date.c_str(), "%d.%d", &sec, &usec);
+      if (r != 2) {
+        return -EINVAL;
+      }
+
+      time_t tt = sec;
+      gmtime_r(&tt, &tm);
+
+      if (nsec) {
+        *nsec = usec * 1000;
+      }
     }
     time_t t = timegm(&tm);
     if (epoch)