Changeset 71264 in vbox for trunk/src

Timestamp:

Mar 7, 2018 6:20:22 PM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

121190

Message:

Guest Control: Implemented support for IGuestFsObjInfo::[accessTime,birthTime,changeTime,modificationTime] (for vbox_ls).

Location:

trunk/src/VBox/Main

Files:

• include/GuestCtrlImplPrivate.h (modified) (1 diff)
• src-client/GuestCtrlPrivate.cpp (modified) (3 diffs)
• src-client/GuestDirectoryImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/include/GuestCtrlImplPrivate.h ¶

@@ -637 +637 @@
     /** @name Helper functions to extract the data from a certin VBoxService tool's guest stream block.
      * @{ */
-    int FromLs(const GuestProcessStreamBlock &strmBlk);
+    int FromLs(const GuestProcessStreamBlock &strmBlk, bool fLong);
     int FromMkTemp(const GuestProcessStreamBlock &strmBlk);
     int FromStat(const GuestProcessStreamBlock &strmBlk);

trunk/src/VBox/Main/src-client/GuestCtrlPrivate.cpp ¶

@@ -39 +39 @@
 
 
-int GuestFsObjData::FromLs(const GuestProcessStreamBlock &strmBlk)
+/**
+ * Extracts the timespec from a given stream block key.
+ *
+ * @return Pointer to handed-in timespec, or NULL if invalid / not found.
+ * @param  strmBlk              Stream block to extract timespec from.
+ * @param  strKey               Key to get timespec for.
+ * @param  pTimeSpec            Where to store the extracted timespec.
+ */
+/* static */
+PRTTIMESPEC GuestFsObjData::TimeSpecFromKey(const GuestProcessStreamBlock &strmBlk, const Utf8Str &strKey, PRTTIMESPEC pTimeSpec)
+{
+    AssertPtrReturn(pTimeSpec, NULL);
+
+    Utf8Str strTime = strmBlk.GetString(strKey.c_str());
+    if (strTime.isEmpty())
+        return NULL;
+
+    if (!RTTimeSpecFromString(pTimeSpec, strTime.c_str()))
+        return NULL;
+
+    return pTimeSpec;
+}
+
+/**
+ * Extracts the in nanoseconds relative from Unix epoch for a given stream block key.
+ *
+ * @return Nanoseconds relative from Unix epoch, or 0 if invalid / not found.
+ * @param  strmBlk              Stream block to extract nanoseconds from.
+ * @param  strKey               Key to get nanoseconds for.
+ */
+/* static */
+int64_t GuestFsObjData::UnixEpochNsFromKey(const GuestProcessStreamBlock &strmBlk, const Utf8Str &strKey)
+{
+    RTTIMESPEC TimeSpec;
+    if (!GuestFsObjData::TimeSpecFromKey(strmBlk, strKey, &TimeSpec))
+        return 0;
+
+    return TimeSpec.i64NanosecondsRelativeToUnixEpoch;
+}
+
+/**
+ * Initializes this object data with a stream block from VBOXSERVICE_TOOL_LS.
+ *
+ * @return VBox status code.
+ * @param  strmBlk              Stream block to use for initialization.
+ * @param  fLong                Whether the stream block contains long (detailed) information or not.
+ */
+int GuestFsObjData::FromLs(const GuestProcessStreamBlock &strmBlk, bool fLong)
 {
     LogFlowFunc(("\n"));
@@ -62 +109 @@
         else
             mType = FsObjType_Unknown;
+        if (fLong)
+        {
+            /* Dates. */
+            mAccessTime       = GuestFsObjData::UnixEpochNsFromKey(strmBlk, "st_atime");
+            mBirthTime        = GuestFsObjData::UnixEpochNsFromKey(strmBlk, "st_birthtime");
+            mChangeTime       = GuestFsObjData::UnixEpochNsFromKey(strmBlk, "st_ctime");
+            mModificationTime = GuestFsObjData::UnixEpochNsFromKey(strmBlk, "st_mtime");
+        }
         /* Object size. */
         rc = strmBlk.GetInt64Ex("st_size", &mObjectSize);
@@ -100 +155 @@
     LogFlowFuncLeaveRC(rc);
     return rc;
-}
-
-/**
- * Extracts the timespec from a given stream block key.
- *
- * @return Pointer to handed-in timespec, or NULL if invalid / not found.
- * @param  strmBlk              Stream block to extract timespec from.
- * @param  strKey               Key to get timespec for.
- * @param  pTimeSpec            Where to store the extracted timespec.
- */
-/* static */
-PRTTIMESPEC GuestFsObjData::TimeSpecFromKey(const GuestProcessStreamBlock &strmBlk, const Utf8Str &strKey, PRTTIMESPEC pTimeSpec)
-{
-    AssertPtrReturn(pTimeSpec, NULL);
-
-    Utf8Str strTime = strmBlk.GetString(strKey.c_str());
-    if (strTime.isEmpty())
-        return NULL;
-
-    if (!RTTimeSpecFromString(pTimeSpec, strTime.c_str()))
-        return NULL;
-
-    return pTimeSpec;
-}
-
-/**
- * Extracts the in nanoseconds relative from Unix epoch for a given stream block key.
- *
- * @return Nanoseconds relative from Unix epoch, or 0 if invalid / not found.
- * @param  strmBlk              Stream block to extract nanoseconds from.
- * @param  strKey               Key to get nanoseconds for.
- */
-/* static */
-int64_t GuestFsObjData::UnixEpochNsFromKey(const GuestProcessStreamBlock &strmBlk, const Utf8Str &strKey)
-{
-    RTTIMESPEC TimeSpec;
-    if (!GuestFsObjData::TimeSpecFromKey(strmBlk, strKey, &TimeSpec))
-        return 0;
-
-    return TimeSpec.i64NanosecondsRelativeToUnixEpoch;
 }
 

trunk/src/VBox/Main/src-client/GuestDirectoryImpl.cpp ¶

@@ -299 +299 @@
             {
                 GuestFsObjData objData;
-                rc = objData.FromLs(curBlock);
+                rc = objData.FromLs(curBlock, true /* fLong */);
                 if (RT_SUCCESS(rc))
                 {