2007-07-13 David Kilzer <ddkilzer@apple.com>

        Reviewed by Darin.

        Added support for -h|--help argument and verify that all command line arguments parse
        correctly.

        * Scripts/run-webkit-httpd:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@24265 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 6bf34a8ebd67d00396d68258094926bf58cb2d5d..fcae398d93f5705405ef019d418531f0de4b0be0 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2007-07-13  David Kilzer  <ddkilzer@apple.com>
+
+        Reviewed by Darin.
+
+        Added support for -h|--help argument and verify that all command line arguments parse
+        correctly.
+
+        * Scripts/run-webkit-httpd:
+
 2007-07-12  Mark Rowe  <mrowe@apple.com>
 
         Reviewed by Ada.

diff --git a/WebKitTools/Scripts/run-webkit-httpd b/WebKitTools/Scripts/run-webkit-httpd
index b122d6d2abf8d5313d010bc4cf821dfa497896ab..06558581972ca02bcc0ec914b713742d25db8f3a 100755 (executable)
--- a/WebKitTools/Scripts/run-webkit-httpd
+++ b/WebKitTools/Scripts/run-webkit-httpd
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Copyright (C) 2005, 2006 Apple Computer, Inc.  All rights reserved.
+# Copyright (C) 2005, 2006, 2007 Apple Inc.  All rights reserved.
 # Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com)
 #
 # Redistribution and use in source and binary forms, with or without
@@ -12,7 +12,7 @@
 # 2.  Redistributions in binary form must reproduce the above copyright
 #     notice, this list of conditions and the following disclaimer in the
 #     documentation and/or other materials provided with the distribution. 
-# 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+# 3.  Neither the name of Apple Inc. ("Apple") nor the names of
 #     its contributors may be used to endorse or promote products derived
 #     from this software without specific prior written permission. 
 #
@@ -33,6 +33,7 @@ use strict;
 use warnings;
 
 use Cwd;
+use File::Basename;
 use Getopt::Long;
 use FindBin;
 
@@ -42,12 +43,22 @@ use webkitdirs;
 # Argument handling
 my $httpdPort = 8000;
 my $allInterfaces = 0;
+my $showHelp;
 
-GetOptions(
-    'port=i' => \$httpdPort,
+my $result = GetOptions(
     'all-interfaces|a' => \$allInterfaces,
+    'help|h' => \$showHelp,
+    'port=i' => \$httpdPort,
 );
 
+if (!$result || @ARGV || $showHelp) {
+    print "Usage: " . basename($0) . " [options]\n";
+    print "  -a|--all-interfaces  Bind to all interfaces\n";
+    print "  -h|--help            Show this help message\n";
+    print "  -p|--port NNNN       Bind to port NNNN\n";
+    exit 1;
+}
+
 setConfiguration();
 my $productDir = productDir();
 chdirWebKit();