From e8a564897cfd3945a097bd07c553d7a5d29355b8 Mon Sep 17 00:00:00 2001
From: JF Bastien <jfb@chromium.org>
Date: Tue, 29 Dec 2015 17:19:32 -0800
Subject: Start moving command-line processing to libsupport.a

This only moves things, no functional change yet.
---
 src/support/command-line.cpp | 62 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 src/support/command-line.cpp

(limited to 'src/support/command-line.cpp')

diff --git a/src/support/command-line.cpp b/src/support/command-line.cpp
new file mode 100644
index 000000000..b023fcb66
--- /dev/null
+++ b/src/support/command-line.cpp
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2015 WebAssembly Community Group participants
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "support/command-line.h"
+
+namespace {
+bool optionIs(const char *arg, const char *LongOpt, const char *ShortOpt) {
+  return strcmp(arg, LongOpt) == 0 || strcmp(arg, ShortOpt) == 0;
+}
+}  // anonymous namespace
+
+void wasm::processCommandLine(int argc, const char *argv[], Options *options,
+                              const char *help) {
+  assert(argc > 0 && "expect at least program name as an argument");
+  for (size_t i = 1, e = argc; i != e; ++i) {
+    if (optionIs(argv[i], "--help", "-h")) {
+      std::cerr << help;
+      exit(EXIT_SUCCESS);
+    } else if (optionIs(argv[i], "--debug", "-d")) {
+      options->debug = true;
+    } else if (optionIs(argv[i], "--output", "-o")) {
+      if (i + 1 == e) {
+        std::cerr << "No output file" << std::endl;
+        exit(EXIT_FAILURE);
+      }
+      if (options->outfile.size()) {
+        std::cerr << "Expected only one output file, got '" << options->outfile
+                  << "' and '" << argv[i] << "'" << std::endl;
+        exit(EXIT_FAILURE);
+      }
+      options->outfile = argv[++i];
+    } else if (argv[i][0] == '-' && argv[i][1] == '-') {
+      size_t j = 2;
+      std::string name;
+      while (argv[i][j] && argv[i][j] != '=') {
+        name += argv[i][j];
+        j++;
+      }
+      options->extra[name] = argv[i][j] == '=' ? &argv[i][j + 1] : "(no value)";
+    } else {
+      if (options->infile.size()) {
+        std::cerr << "Expected only one input file, got '" << options->infile
+                  << "' and '" << argv[i] << "'" << std::endl;
+        exit(EXIT_FAILURE);
+      }
+      options->infile = argv[i];
+    }
+  }
+}
-- 
cgit v1.2.3


From 3bf113b601de6d1a55f54ed1b788037cd5514419 Mon Sep 17 00:00:00 2001
From: JF Bastien <jfb@chromium.org>
Date: Tue, 29 Dec 2015 17:29:13 -0800
Subject: Add a help to avoid out-of-bounds.

---
 src/support/command-line.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/support/command-line.cpp')

diff --git a/src/support/command-line.cpp b/src/support/command-line.cpp
index b023fcb66..3c03d48f4 100644
--- a/src/support/command-line.cpp
+++ b/src/support/command-line.cpp
@@ -20,6 +20,9 @@ namespace {
 bool optionIs(const char *arg, const char *LongOpt, const char *ShortOpt) {
   return strcmp(arg, LongOpt) == 0 || strcmp(arg, ShortOpt) == 0;
 }
+bool startsWith(const char *str, const char *prefix) {
+  return strncmp(str, prefix, strlen(prefix)) == 0;
+}
 }  // anonymous namespace
 
 void wasm::processCommandLine(int argc, const char *argv[], Options *options,
@@ -42,7 +45,7 @@ void wasm::processCommandLine(int argc, const char *argv[], Options *options,
         exit(EXIT_FAILURE);
       }
       options->outfile = argv[++i];
-    } else if (argv[i][0] == '-' && argv[i][1] == '-') {
+    } else if (startsWith(argv[i], "--")) {
       size_t j = 2;
       std::string name;
       while (argv[i][j] && argv[i][j] != '=') {
-- 
cgit v1.2.3