X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=scripts%2Fcommandline.inc;h=9029bb19db4e7df9879d73fccbb4b792124c8599;hb=6a6d88f0f4641f294a5c513c6aacba604e37222f;hp=8c5c56d5ea0961991f28d420743efe81e89db773;hpb=2f8c656e1df10984527fe445bd57783f5fdcafdc;p=quix0rs-gnu-social.git

diff --git a/scripts/commandline.inc b/scripts/commandline.inc
index 8c5c56d5ea..9029bb19db 100644
--- a/scripts/commandline.inc
+++ b/scripts/commandline.inc
@@ -1,7 +1,7 @@
 <?php
 /*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, Control Yourself, Inc.
+ * StatusNet - a distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -26,7 +26,8 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
     exit();
 }
 
-define('LACONICA', true);
+define('STATUSNET', true);
+define('LACONICA', true); // compatibility
 
 // Set various flags so we don't time out on long-running processes
 
@@ -63,14 +64,21 @@ if (isset($longoptions)) {
 
 $parser = new Console_Getopt();
 
-list($options, $args) = $parser->getopt($argv, $shortoptions, $longoptions);
+$result = $parser->getopt($argv, $shortoptions, $longoptions);
+
+if (PEAR::isError($result)) {
+    print $result->getMessage()."\n";
+    exit(1);
+} else {
+    list($options, $args) = $result;
+}
 
 function show_help()
 {
     global $helptext;
 
     $_default_help_text = <<<END_OF_DEFAULT
-General options:
+      General options:
 
     -q --quiet           Quiet (little output)
     -v --verbose         Verbose (lots of output)
@@ -80,11 +88,11 @@ General options:
     -h --help            Show this message and quit.
 
 END_OF_DEFAULT;
-        if (isset($helptext)) {
-            print $helptext;
-        }
-        print $_default_help_text;
-        exit(0);
+    if (isset($helptext)) {
+        print $helptext;
+    }
+    print $_default_help_text;
+    exit(0);
 }
 
 foreach ($options as $option) {
@@ -115,60 +123,53 @@ require_once INSTALLDIR . '/lib/common.php';
 
 set_error_handler('common_error_handler');
 
+function _make_matches($opt, $alt)
+{
+    $matches = array();
+
+    if (strlen($opt) > 1 && 0 != strncmp($opt, '--', 2)) {
+        $matches[] = '--'.$opt;
+    } else {
+        $matches[] = $opt;
+    }
+
+    if (!empty($alt)) {
+        if (strlen($alt) > 1 && 0 != strncmp($alt, '--', 2)) {
+            $matches[] = '--'.$alt;
+        } else {
+            $matches[] = $alt;
+        }
+    }
+
+    return $matches;
+}
+
 function have_option($opt, $alt=null)
 {
-   global $options;
-
-   $matches = array($opt);
-
-   if (strlen($opt) > 1 && 0 != strncmp($opt, '--', 2)) {
-      $matches[] = '--'.$opt;
-   } else {
-      $matches[] = $opt;
-   }
-
-   if (!empty($alt)) {
-       if (strlen($alt) > 1 && 0 != strncmp($alt, '--', 2)) {
-           $matches[] = '--'.$alt;
-       } else {
-           $matches[] = $alt;
-       }
-   }
-
-   foreach ($options as $option) {
-       if (in_array($option[0], $matches)) {
-          return true;
-       }
-   }
-
-   return false;
+    global $options;
+
+    $matches = _make_matches($opt, $alt);
+
+    foreach ($options as $option) {
+        if (in_array($option[0], $matches)) {
+            return true;
+        }
+    }
+
+    return false;
 }
 
-function get_option_value($str, $alt=null)
+function get_option_value($opt, $alt=null)
 {
-   global $options;
-
-   $matches = array();
-
-   if (strlen($opt) > 1 && 0 != strncmp($opt, '--', 2)) {
-      $matches[] = '--'.$opt;
-   } else {
-      $matches[] = $opt;
-   }
-
-   if (!empty($alt)) {
-       if (strlen($alt) > 1 && 0 != strncmp($alt, '--', 2)) {
-           $matches[] = '--'.$alt;
-       } else {
-           $matches[] = $alt;
-       }
-   }
-
-   foreach ($options as $option) {
-       if (in_array($option[0], $matches)) {
-          return $option[1];
-       }
-   }
-
-   return null;
-}
\ No newline at end of file
+    global $options;
+
+    $matches = _make_matches($opt, $alt);
+
+    foreach ($options as $option) {
+        if (in_array($option[0], $matches)) {
+            return $option[1];
+        }
+    }
+
+    return null;
+}