From 10836361b425af2fd602d4fe6adb12c8037f99d9 Mon Sep 17 00:00:00 2001
From: Francois Fleuret <francois@fleuret.org>
Date: Tue, 17 Mar 2009 08:02:53 +0100
Subject: [PATCH] Changed the handling of the argument errors and short help
 printing.

---
 selector.cc | 57 +++++++++++++++++++++++++++++++----------------------
 1 file changed, 33 insertions(+), 24 deletions(-)

diff --git a/selector.cc b/selector.cc
index e9b4f64..d36c836 100644
--- a/selector.cc
+++ b/selector.cc
@@ -401,7 +401,9 @@ int main(int argc, char **argv) {
   strcpy(output_filename, "");
 
   int i = 1;
-  while(i < argc) {
+  int error = 0, show_help = 0;
+
+  while(!error && !show_help && i < argc) {
 
     if(strcmp(argv[i], "-o") == 0) {
       check_opt(argc, argv, i, 1, "<output filename>");
@@ -471,33 +473,40 @@ int main(int argc, char **argv) {
       i += 5;
     }
 
+    else if(strcmp(argv[i], "-h") == 0) {
+      show_help = 1;
+      i++;
+    }
+
     else {
-      cerr << "Selector version " << VERSION << "-R" << REVISION_NUMBER
-           << endl
-           << "Written by Francois Fleuret <francois@fleuret.org>"
-           << endl
-           << argv[0]
-           << " [-h]"
-           << " [-v]"
-           << " [-m]"
-           << " [-d]"
-           << " [-e]"
-           << " [-z]"
-           << " [-i]"
-           << " [-c <fg modeline> <bg modeline> <fg highlight> <bg highlight>]"
-           << " [-o <output filename>]"
-           << " [-s <pattern separator>]"
-           << " [-l <max number of lines>]"
-           << " -f <input filename>"
-           << endl;
-      if(strcmp(argv[i], "-h") == 0) {
-        exit(0);
-      } else {
-        exit(1);
-      }
+      cerr << "Unknown argument " << argv[i] << "." << endl;
+      error = 1;
     }
   }
 
+  if(show_help || error) {
+    cerr << "Selector version " << VERSION << "-R" << REVISION_NUMBER
+         << endl
+         << "Written by Francois Fleuret <francois@fleuret.org>"
+         << endl
+         << argv[0]
+         << " [-h]"
+         << " [-v]"
+         << " [-m]"
+         << " [-d]"
+         << " [-e]"
+         << " [-z]"
+         << " [-i]"
+         << " [-c <fg modeline> <bg modeline> <fg highlight> <bg highlight>]"
+         << " [-o <output filename>]"
+         << " [-s <pattern separator>]"
+         << " [-l <max number of lines>]"
+         << " -f <input filename>"
+         << endl;
+
+    exit(error);
+  }
+
   char **lines = new char *[nb_lines_max];
 
   if(!input_filename[0]) {
-- 
2.20.1