Convert trim option parsing to getopt.

[apitrace] / cli / cli_pickle.cpp

diff --git a/cli/cli_pickle.cpp b/cli/cli_pickle.cpp
index 460a3c3c516dac018bbac8893cd41ed7060e4048..c37c0f8bf8c85d00d4a83484bb9eab294c903c6d 100644 (file)
--- a/cli/cli_pickle.cpp
+++ b/cli/cli_pickle.cpp
@@ -28,6 +28,8 @@
 
 #include "pickle.hpp"
 
+#include "os_binary.hpp"
+
 #include "cli.hpp"
 #include "cli_pager.hpp"
 
@@ -122,8 +124,8 @@ public:
 
         writer.beginList();
         for (unsigned i = 0; i < call->args.size(); ++i) {
-            if (call->args[i]) {
-                _visit(call->args[i]);
+            if (call->args[i].value) {
+                _visit(call->args[i].value);
             } else {
                 writer.writeNone();
             }
@@ -161,7 +163,7 @@ command(int argc, char *argv[])
 {
     int i;
 
-    for (i = 0; i < argc;) {
+    for (i = 1; i < argc;) {
         const char *arg = argv[i];
 
         if (arg[0] != '-') {
@@ -183,7 +185,8 @@ command(int argc, char *argv[])
             return 1;
         }
     }
-        
+
+    os::setBinaryMode(stdout);
 
     for (; i < argc; ++i) {
         trace::Parser parser;