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<option>\n");
printf(" set Virtual Machine specific option\n");
+ printf(" -procname <procname>\n");
+ printf(" use the specified process name (works only for Linux)\n");
+
printf(" -wait <waittime>\n");
printf(" wait waittime seconds for the service to start\n");
printf(" waittime should multiple of 10 (min=10)\n");
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
