From: Ben Pfaff <blp@nicira.com>
Date: Tue, 25 May 2010 22:49:26 +0000 (-0700)
Subject: unixctl: Sort list of commands output by "help".
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c442619836797b78bbb3472385a4982582cb907;p=openvswitch

unixctl: Sort list of commands output by "help".

Feature #2873.
---

diff --git a/lib/unixctl.c b/lib/unixctl.c
index b52d3d1e..70785682 100644
--- a/lib/unixctl.c
+++ b/lib/unixctl.c
@@ -34,6 +34,7 @@
 #include "poll-loop.h"
 #include "shash.h"
 #include "socket-util.h"
+#include "svec.h"
 #include "util.h"
 
 #ifndef SCM_CREDENTIALS
@@ -82,11 +83,23 @@ unixctl_help(struct unixctl_conn *conn, const char *args OVS_UNUSED,
 {
     struct ds ds = DS_EMPTY_INITIALIZER;
     struct shash_node *node;
+    struct svec names;
+    const char *name;
+    size_t i;
 
     ds_put_cstr(&ds, "The available commands are:\n");
+
+    svec_init(&names);
     SHASH_FOR_EACH (node, &commands) {
-        ds_put_format(&ds, "\t%s\n", node->name);
+        svec_add(&names, node->name);
+    }
+    svec_sort(&names);
+
+    SVEC_FOR_EACH (i, name, &names) {
+        ds_put_format(&ds, "\t%s\n", name);
     }
+    svec_destroy(&names);
+
     unixctl_command_reply(conn, 214, ds_cstr(&ds));
     ds_destroy(&ds);
 }