Changeset 93287 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

Jan 17, 2022 10:08:11 PM (3 years ago)

Author:

vboxsync

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

149355

Message:

VBoxManage/NATNetwork: Implement "list --sort natnetworks".
bugref:8124.

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageNATNetwork.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageNATNetwork.cpp ¶

@@ -50 +50 @@
 #include <VBox/log.h>
 
+#include <algorithm>
 #include <vector>
 #include <iprt/sanitized/string>
@@ -635 +636 @@
     HRESULT rc;
 
-    RT_NOREF(fSorted);
-
-    com::SafeIfaceArray<INATNetwork> nets;
-    CHECK_ERROR(pVirtualBox, COMGETTER(NATNetworks)(ComSafeArrayAsOutParam(nets)));
-    for (size_t i = 0; i < nets.size(); ++i)
-    {
-        printNATNetwork(nets[i], fLong);
+    com::SafeIfaceArray<INATNetwork> aNets;
+    CHECK_ERROR_RET(pVirtualBox,
+        COMGETTER(NATNetworks)(ComSafeArrayAsOutParam(aNets)),
+            RTEXITCODE_FAILURE);
+
+    const size_t cNets = aNets.size();
+    if (cNets == 0)
+        return RTEXITCODE_SUCCESS;
+
+    /*
+     * Sort the list if necessary.  The sort is indirect via an
+     * intermediate array of indexes.
+     */
+    std::vector<size_t> vIndexes(cNets);
+    for (size_t i = 0; i < cNets; ++i)
+        vIndexes[i] = i;
+
+    if (fSorted)
+    {
+        std::vector<com::Bstr> vBstrNames(cNets);
+        for (size_t i = 0; i < cNets; ++i)
+        {
+            CHECK_ERROR_RET(aNets[i],
+                COMGETTER(NetworkName)(vBstrNames[i].asOutParam()),
+                    RTEXITCODE_FAILURE);
+        }
+
+        struct SortBy {
+            const std::vector<com::Bstr> &ks;
+            SortBy(const std::vector<com::Bstr> &aKeys) : ks(aKeys) {}
+            bool operator() (size_t l, size_t r) { return ks[l] < ks[r]; }
+        };
+
+        std::sort(vIndexes.begin(), vIndexes.end(),
+                  SortBy(vBstrNames));
+    }
+
+    for (size_t i = 0; i < cNets; ++i)
+    {
+        printNATNetwork(aNets[vIndexes[i]], fLong);
     }