[Pvfs2-cvs] commit by mtmoore in pvfs2/src/server: pvfs2-server.c

[CVS commit program]

Update of /projects/cvsroot/pvfs2/src/server
In directory parlweb1:/tmp/cvs-serv18081/pvfs2/src/server

Modified Files:
      Tag: Orange-Branch
	pvfs2-server.c 
Log Message:
don't try to shutdown the server if the help argument is passed to pvfs2-server


Index: pvfs2-server.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/pvfs2-server.c,v
diff -p -u -r1.269.4.14 -r1.269.4.15
--- pvfs2-server.c	7 Jun 2011 23:50:41 -0000	1.269.4.14
+++ pvfs2-server.c	8 Jun 2011 00:16:39 -0000	1.269.4.15
@@ -61,6 +61,7 @@
 #endif
 
 #define PVFS2_VERSION_REQUEST 0xFF
+#define PVFS2_HELP            0xFE
 
 /* this controls how many jobs we will test for per job_testcontext()
  * call. NOTE: this is currently independent of the config file
@@ -213,6 +214,10 @@ int main(int argc, char **argv)
     {
         return 0;
     }
+    else if (ret == PVFS2_HELP)
+    {
+        return 0;
+    }
     else if (ret != 0)
     {
         goto server_shutdown;
@@ -1771,6 +1776,12 @@ static int server_parse_cmd_line_args(in
             case '?':
             case 'h':
           do_help:
+                usage(argc, argv);
+                if(s_server_options.server_alias)
+                {
+                    free(s_server_options.server_alias);
+                }
+                return PVFS2_HELP; 
             default:
           parse_cmd_line_args_failure:
                 usage(argc, argv);