diff options
| author | Ernst de Haan <znerd@FreeBSD.org> | 2002-04-03 19:49:27 +0000 |
|---|---|---|
| committer | Ernst de Haan <znerd@FreeBSD.org> | 2002-04-03 19:49:27 +0000 |
| commit | 144c6b62cab091d6b9d52b220896b1dd94da63c4 (patch) | |
| tree | a9ffbfbeff31501e8c77156341c60b5fddbc1c94 /www/tomcat41/files/daemonctl.c | |
| parent | Change this to something that actually tells me enough about the port that (diff) | |
Little generalization and cleanup. Nothing
spectacular. Not bumped PORTREVISION.
Diffstat (limited to '')
| -rw-r--r-- | www/tomcat41/files/daemonctl.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/www/tomcat41/files/daemonctl.c b/www/tomcat41/files/daemonctl.c index 39d3f4457355..49a45728ac74 100644 --- a/www/tomcat41/files/daemonctl.c +++ b/www/tomcat41/files/daemonctl.c @@ -4,7 +4,7 @@ * * Daemon control program. * - * $FreeBSD: /tmp/pcvs/ports/www/tomcat41/files/Attic/daemonctl.c,v 1.1 2002-03-30 14:51:12 znerd Exp $ + * $FreeBSD: /tmp/pcvs/ports/www/tomcat41/files/Attic/daemonctl.c,v 1.2 2002-04-03 19:49:27 znerd Exp $ */ #include <assert.h> @@ -34,20 +34,6 @@ #define ERR_STDERR_LOGFILE_OPEN 10 #define ERR_FORK_FAILED 11 -#if defined JAVA_ARGS -#define JAVA_ARGS_COMMA , -#else -#define JAVA_ARGS -#define JAVA_ARGS_COMMA -#endif - -#if defined JAR_ARGS -#define JAR_ARGS_COMMA , -#else -#define JAR_ARGS -#define JAR_ARGS_COMMA -#endif - #define private static private void printUsage(void); @@ -323,7 +309,7 @@ void start(void) { file using pipe(2) */ /* Execute the command */ - execl("%%JAVA_HOME%%/%%JAVA_CMD%%", "%%JAVA_HOME%%/%%JAVA_CMD%%", "-jar", JAVA_ARGS JAVA_ARGS_COMMA "%%JAR_FILE%%", JAR_ARGS JAR_ARGS_COMMA NULL); + execl("%%JAVA_HOME%%/%%JAVA_CMD%%", "%%JAVA_HOME%%/%%JAVA_CMD%%", "-jar", %%JAVA_ARGS%% "%%JAR_FILE%%", %%JAR_ARGS%% NULL); fprintf(stderr, "%%CONTROL_SCRIPT_NAME%%: Unable to start %%APP_TITLE%% as '%%JAVA_HOME%%/%%JAVA_CMD%% -jar %%JAR_FILE%%' in %%APP_HOME%%: "); perror(NULL); |