X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=utilities%2Fovs-appctl.c;h=e528af344b9a6623456158f889d5b282fed6f813;hb=059e5f4fce60028986087304c2a4d43c2c5f3676;hp=699ff7bd14846d801fde82d9f5012d498319714b;hpb=55d5bb44cbca6993494b05a374d4f09ec03c9102;p=sliver-openvswitch.git

diff --git a/utilities/ovs-appctl.c b/utilities/ovs-appctl.c
index 699ff7bd1..e528af344 100644
--- a/utilities/ovs-appctl.c
+++ b/utilities/ovs-appctl.c
@@ -26,6 +26,7 @@
 #include "daemon.h"
 #include "dirs.h"
 #include "dynamic-string.h"
+#include "process.h"
 #include "timeval.h"
 #include "unixctl.h"
 #include "util.h"
@@ -39,10 +40,9 @@ main(int argc, char *argv[])
 {
     struct unixctl_client *client;
     const char *target;
-    struct ds request;
     int code, error;
+    char *request;
     char *reply;
-    int i;
 
     set_program_name(argv[0]);
 
@@ -50,17 +50,10 @@ main(int argc, char *argv[])
     target = parse_command_line(argc, argv);
     client = connect_to_target(target);
 
-    /* Compose request. */
-    ds_init(&request);
-    for (i = optind; i < argc; i++) {
-        if (i != optind) {
-            ds_put_char(&request, ' ');
-        }
-        ds_put_cstr(&request, argv[i]);
-    }
-
     /* Transact request and process reply. */
-    error = unixctl_client_transact(client, ds_cstr(&request), &code, &reply);
+    request = process_escape_args(argv + optind);
+    error = unixctl_client_transact(client, request, &code, &reply);
+    free(request);
     if (error) {
         ovs_fatal(error, "%s: transaction error", target);
     }
@@ -73,7 +66,6 @@ main(int argc, char *argv[])
 
     unixctl_client_destroy(client);
     free(reply);
-    ds_destroy(&request);
 
     return 0;
 }
@@ -88,6 +80,7 @@ Targets:\n\
   -t, --target=TARGET  pidfile or socket to contact\n\
 Common commands:\n\
   help               List commands supported by the target\n\
+  version            Print version of the target\n\
   vlog/list          List current logging levels\n\
   vlog/set MODULE[:FACILITY[:LEVEL]]\n\
       Set MODULE and FACILITY log level to LEVEL\n\
@@ -97,7 +90,7 @@ Common commands:\n\
   vlog/reopen        Make the program reopen its log file\n\
 Other options:\n\
   -h, --help         Print this helpful information\n\
-  -V, --version      Display version information\n",
+  -V, --version      Display ovs-appctl version information\n",
            program_name, program_name);
     exit(EXIT_SUCCESS);
 }