Changeset 99266 in vbox

Timestamp:

Apr 3, 2023 3:56:00 PM (22 months ago)

Author:

vboxsync

Message:

Guest Control/VBoxManage: Added a "--total" option to the "fsinfo|df" command, to show a grand total of all disk sizes (like df does). bugref:10414

Location:

trunk

Files:

• doc/manual/en_US/man_VBoxManage-guestcontrol.xml (modified) (2 diffs)
• src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp (modified) (6 diffs)

trunk/doc/manual/en_US/man_VBoxManage-guestcontrol.xml

@@ -270 +270 @@
       <arg>--human-readable</arg>
       <arg>--quiet</arg>
+      <arg>--total</arg>
       <arg>--username=<replaceable>username</replaceable></arg>
       <arg>--verbose</arg>
@@ -813 +814 @@
           <listitem><para>
               Shows the disk sizes in a human readable form.
+            </para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>--total</option></term>
+          <listitem><para>
+              Produces a grand total of all disk sizes.
             </para>
           </listitem>

trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp

@@ -2389 +2389 @@
     AssertPtrReturn(pCtx, RTEXITCODE_FAILURE);
 
+    /*
+     * Parse arguments.
+     */
+    enum GCTLCMD_FSINFO_OPT
+    {
+        GCTLCMD_FSINFO_OPT_TOTAL = 1000
+    };
+
     static const RTGETOPTDEF s_aOptions[] =
     {
         GCTLCMD_COMMON_OPTION_DEFS()
-        { "--human-readable",           'h',                RTGETOPT_REQ_NOTHING }
+        { "--human-readable",           'h',                            RTGETOPT_REQ_NOTHING },
+        { "--total",                    GCTLCMD_FSINFO_OPT_TOTAL,       RTGETOPT_REQ_NOTHING }
     };
 
@@ -2401 +2410 @@
 
     bool fHumanReadable = false;
+    bool fShowTotal = false;
 
     while (  (ch = RTGetOpt(&GetState, &ValueUnion)) != 0
@@ -2412 +2422 @@
             case 'h':
                 fHumanReadable = true;
+                break;
+
+            case GCTLCMD_FSINFO_OPT_TOTAL:
+                fShowTotal = true;
                 break;
 
@@ -2439 +2453 @@
              cwPathSpacing, "",
              GuestCtrl::tr("Path"));
+
+    uint64_t cbTotalSize = 0;
+    uint64_t cbTotalFree = 0;
 
     while (ch == VINF_GETOPT_NOT_OPTION)
@@ -2477 +2494 @@
                          ValueUnion.psz);                     /* Path */
             }
+
+            if (fShowTotal)
+            {
+                cbTotalSize += u64;
+                cbTotalFree += u64_2;
+            }
+
             RTPrintf("\n");
         }
@@ -2482 +2506 @@
         /* Next path. */
         ch = RTGetOpt(&GetState, &ValueUnion);
+    }
+
+    if (fShowTotal)
+    {
+        if (fHumanReadable)
+        {
+            RTPrintf("%-*s%*Rhcb%*Rhcb%*Rhcb%*s%s",
+                     cwFileSys, "total",
+                     cwSizeTotal, cbTotalSize,                /* Total */
+                     cwSizeUsed,  cbTotalSize - cbTotalFree,  /* Used */
+                     cwSizeAvail, cbTotalFree,                /* Available */
+                     cwPathSpacing, "",
+                     "-");                                    /* Path */
+        }
+        else
+        {
+            RTPrintf("%-*s%*RU64%*RU64%*RU64%*s%s",
+                     cwFileSys, "total",                      /* Filesystem */
+                     cwSizeTotal, cbTotalSize,                /* Total */
+                     cwSizeUsed,  cbTotalSize - cbTotalFree,  /* Used */
+                     cwSizeAvail, cbTotalFree,                /* Available */
+                     cwPathSpacing, "",
+                     "-");                                    /* Path */
+        }
+        RTPrintf("\n");
     }