Return-Path: Delivered-To: apmail-jakarta-commons-dev-archive@www.apache.org Received: (qmail 60679 invoked from network); 15 Aug 2005 08:50:34 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 15 Aug 2005 08:50:34 -0000 Received: (qmail 25322 invoked by uid 500); 15 Aug 2005 08:50:30 -0000 Delivered-To: apmail-jakarta-commons-dev-archive@jakarta.apache.org Received: (qmail 25262 invoked by uid 500); 15 Aug 2005 08:50:30 -0000 Mailing-List: contact commons-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "Jakarta Commons Developers List" Reply-To: "Jakarta Commons Developers List" Delivered-To: mailing list commons-dev@jakarta.apache.org Received: (qmail 25194 invoked by uid 500); 15 Aug 2005 08:50:28 -0000 Received: (qmail 24715 invoked by uid 99); 15 Aug 2005 08:50:22 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 15 Aug 2005 01:50:22 -0700 Received: (qmail 59470 invoked by uid 65534); 15 Aug 2005 08:50:22 -0000 Message-ID: <20050815085022.59469.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r232775 - in /jakarta/commons/proper/daemon/trunk/src/native/unix/native: arguments.c help.c Date: Mon, 15 Aug 2005 08:50:21 -0000 To: commons-cvs@jakarta.apache.org From: jfclere@apache.org X-Mailer: svnmailer-1.0.3 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: jfclere Date: Mon Aug 15 01:50:17 2005 New Revision: 232775 URL: http://svn.apache.org/viewcvs?rev=232775&view=rev Log: Fix PR 36051. Modified: jakarta/commons/proper/daemon/trunk/src/native/unix/native/arguments.c jakarta/commons/proper/daemon/trunk/src/native/unix/native/help.c Modified: jakarta/commons/proper/daemon/trunk/src/native/unix/native/arguments.c URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/daemon/trunk/src/native/unix/native/arguments.c?rev=232775&r1=232774&r2=232775&view=diff ============================================================================== --- jakarta/commons/proper/daemon/trunk/src/native/unix/native/arguments.c (original) +++ jakarta/commons/proper/daemon/trunk/src/native/unix/native/arguments.c Mon Aug 15 01:50:17 2005 @@ -162,7 +162,7 @@ log_error("Invalid Error File specified"); return(NULL); } - }else if (strstr(argv[x],"-verbose")==argv[x]) { + } else if (strstr(argv[x],"-verbose")==argv[x]) { args->opts[args->onum++]=strdup(argv[x]); } else if (strcmp(argv[x],"-D")==0) { @@ -186,16 +186,17 @@ } else if (strstr(argv[x],"-ea")==argv[x]) { args->opts[args->onum++]=strdup(argv[x]); - } else if (strstr(argv[x],"-")==argv[x]) { - log_error("Invalid option %s",argv[x]); - return(NULL); - } else if (strcmp(argv[x],"-procname") == 0) { args->procname = optional(argc, argv, x++); - if(args->procname == NULL) { + if( args->procname == NULL) { log_error("Invalid process name specified"); return (NULL); } + + } else if (strstr(argv[x],"-")==argv[x]) { + log_error("Invalid option %s",argv[x]); + return(NULL); + } else { args->clas=strdup(argv[x]); break; Modified: jakarta/commons/proper/daemon/trunk/src/native/unix/native/help.c URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/daemon/trunk/src/native/unix/native/help.c?rev=232775&r1=232774&r2=232775&view=diff ============================================================================== --- jakarta/commons/proper/daemon/trunk/src/native/unix/native/help.c (original) +++ jakarta/commons/proper/daemon/trunk/src/native/unix/native/help.c Mon Aug 15 01:50:17 2005 @@ -79,6 +79,9 @@ printf(" -X