Changeset 37404 in vbox

Timestamp:

Jun 10, 2011 10:33:10 AM (14 years ago)

Author:

vboxsync

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

72201

Message:

VBoxService/Toolbox: Update for ls.

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceToolBox.cpp (modified) (13 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceToolBox.cpp

@@ -47 +47 @@
 
 #define LS_OPT_MACHINE_READABLE                 1000
+
+typedef enum VBOXSERVICETOOLBOXLSFLAG
+{
+    VBOXSERVICETOOLBOXLSFLAG_NONE =             0,
+    VBOXSERVICETOOLBOXLSFLAG_RECURSIVE =        0x00000001,
+    VBOXSERVICETOOLBOXLSFLAG_LONG =             0x00000002,
+    VBOXSERVICETOOLBOXLSFLAG_PARSEABLE =        0x00000004,
+    VBOXSERVICETOOLBOXLSFLAG_SYMLINKS =         0x00000008
+} VBOXSERVICETOOLBOXLSFLAG;
 
 /* Enable the following define to be able to debug/invoke the toolbox
@@ -397 +406 @@
  * @return  IPRT status code.
  * @param   pszDir                  Directory (path) to ouptut.
- * @param   fRecursive              Flag indicating whether recursive directory handling
- *                                  is wanted or not.
- * @param   fLong                   Flag indicating whether long output is required or not.
- * @param   fParseable              Flag indicating whether machine parseable output
- *                                  is required or not
- */
-static int VBoxServiceToolboxLsOutput(const char *pszDir,
-                                      bool fRecursive, bool fLong, bool fParseable)
+ * @param   uFlags                  Flags of type VBOXSERVICETOOLBOXLSFLAG.
+ */
+static int VBoxServiceToolboxLsOutput(const char *pszDir, uint32_t uFlags)
 {
     AssertPtrReturn(pszDir, VERR_INVALID_PARAMETER);
 
-    if (fParseable)
+    if (uFlags & VBOXSERVICETOOLBOXLSFLAG_PARSEABLE)
         RTPrintf("dname=%s%c", pszDir, 0);
+    else if (uFlags & VBOXSERVICETOOLBOXLSFLAG_RECURSIVE)
+        RTPrintf("%s:\n", pszDir);
 
     char szPathAbs[RTPATH_MAX + 1];
@@ -423 +429 @@
     if (RT_FAILURE(rc))
     {
-        RTMsgError("ls: Failed to open '%s', rc=%Rrc\n", szPathAbs, rc);
+        RTMsgError("ls: Failed to open directory '%s', rc=%Rrc\n", szPathAbs, rc);
         return rc;
     }
@@ -486 +492 @@
             /** @todo sticy bits++ */
 
-            if (!fLong)
-            {
-                if (fParseable)
+            if (!(uFlags & VBOXSERVICETOOLBOXLSFLAG_LONG))
+            {
+                if (uFlags & VBOXSERVICETOOLBOXLSFLAG_PARSEABLE)
                 {
                     /** @todo Skip node_id if not present/available! */
@@ -499 +505 @@
                              cFileType, pNodeIt->dirEntry.cbName, pNodeIt->dirEntry.szName);
 
-                if (fParseable) /* End of data block. */
+                if (uFlags & VBOXSERVICETOOLBOXLSFLAG_PARSEABLE) /* End of data block. */
                     RTPrintf("%c%c", 0, 0);
             }
             else
             {
-                if (fParseable)
+                if (uFlags & VBOXSERVICETOOLBOXLSFLAG_PARSEABLE)
                 {
                     RTPrintf("ftype=%c%c", cFileType, 0);
@@ -609 +615 @@
 
         /* If everything went fine we do the second run (if needed) ... */
-        if (RT_SUCCESS(rc) && fRecursive)
+        if (   RT_SUCCESS(rc)
+            && (uFlags & VBOXSERVICETOOLBOXLSFLAG_RECURSIVE))
         {
             /* Process all sub-directories. */
@@ -618 +625 @@
                 switch (fMode & RTFS_TYPE_MASK)
                 {
-                    //case RTFS_TYPE_SYMLINK:
+                    case RTFS_TYPE_SYMLINK:
+                        if (!(uFlags & VBOXSERVICETOOLBOXLSFLAG_SYMLINKS))
+                            break;
+                        /* Fall through is intentional. */
                     case RTFS_TYPE_DIRECTORY:
                         {
@@ -628 +638 @@
                                 continue;
                             }
-                            rc = VBoxServiceToolboxLsOutput(pNodeIt->dirEntry.szName, fRecursive,
-                                                            fLong, fParseable);
+
+                            char szPath[RTPATH_MAX];
+                            rc = RTPathJoin(szPath, sizeof(szPath),
+                                            pszDir, pNodeIt->dirEntry.szName);
+                            if (RT_SUCCESS(rc))
+                                rc = VBoxServiceToolboxLsOutput(szPath, uFlags);
                         }
                         break;
@@ -685 +699 @@
     int rc = VINF_SUCCESS;
     bool fVerbose = false;
-    bool fLong = false;
-    bool fMachineReadable = false;
-    bool fRecursive = false;
+    uint32_t fFlags = 0;
 
     /* Init file list. */
@@ -704 +716 @@
 
             case 'l': /* Print long format. */
-                fLong = true;
+                fFlags |= VBOXSERVICETOOLBOXLSFLAG_LONG;
                 break;
 
             case LS_OPT_MACHINE_READABLE:
-                fMachineReadable = true;
+                fFlags |= VBOXSERVICETOOLBOXLSFLAG_PARSEABLE;
                 break;
 
             case 'R': /* Recursive processing. */
-                fRecursive = true;
+                fFlags |= VBOXSERVICETOOLBOXLSFLAG_RECURSIVE;
                 break;
 
@@ -758 +770 @@
 
         /* Print magic/version. */
-        if (fMachineReadable)
+        if (fFlags & VBOXSERVICETOOLBOXLSFLAG_PARSEABLE)
             RTPrintf("hdr_id=vbt_ls%chdr_ver=%u%c", 0, 1 /* Version 1 */, 0);
 
@@ -764 +776 @@
         RTListForEach(&fileList, pNodeIt, VBOXSERVICETOOLBOXPATHENTRY, Node)
         {
-            rc = VBoxServiceToolboxLsOutput(pNodeIt->pszName,
-                                            fRecursive, fLong, fMachineReadable);
+            rc = VBoxServiceToolboxLsOutput(pNodeIt->pszName, fFlags);
             if (RT_FAILURE(rc))
                 RTMsgError("ls: Failed while enumerating directory '%s', rc=%Rrc\n",
@@ -771 +782 @@
         }
 
-        if (fMachineReadable) /* Output termination. */
+        if (fFlags & VBOXSERVICETOOLBOXLSFLAG_PARSEABLE) /* Output termination. */
             RTPrintf("%c%c%c%c", 0, 0, 0, 0);
     }