Author: marcusb-guest Date: 2006-11-29 20:01:52 +0100 (Wed, 29 Nov 2006) New Revision: 2820
Added: trunk/commons-daemon/ trunk/commons-daemon/debian/ trunk/commons-daemon/src/native/unix/native/arguments.c trunk/commons-daemon/src/native/unix/support/apsupport.m4 Removed: trunk/commons-daemon/debian/ trunk/commons-daemon/src/native/unix/native/arguments.c trunk/commons-daemon/src/native/unix/support/apsupport.m4 Log: Clone debian branch (r2818). Copied: trunk/commons-daemon (from rev 2799, branches/commons-daemon/feature/debian) Copied: trunk/commons-daemon/debian (from rev 2817, branches/commons-daemon/feature/debian/debian) Deleted: trunk/commons-daemon/src/native/unix/native/arguments.c =================================================================== --- branches/commons-daemon/feature/debian/src/native/unix/native/arguments.c 2006-11-28 09:17:57 UTC (rev 2799) +++ trunk/commons-daemon/src/native/unix/native/arguments.c 2006-11-29 19:01:52 UTC (rev 2820) @@ -1,310 +0,0 @@ -/* - Copyright 2001-2004 The Apache Software Foundation. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ -/* @version $Id: arguments.c 396993 2006-04-25 21:50:36Z jfclere $ */ -#include "jsvc.h" - -/* Return the argument of a command line option */ -static char *optional(int argc, char *argv[], int argi) { - - argi++; - if (argi>=argc) return(NULL); - if (argv[argi]==NULL) return(NULL); - if (argv[argi][0]=='-') return(NULL); - return(strdup(argv[argi])); -} - -/* Parse command line arguments */ -static arg_data *parse(int argc, char *argv[]) { - arg_data *args=NULL; - char *temp=NULL; - char *cmnd=NULL; - int tlen=0; - int x=0; - - /* Create the default command line arguments */ - args=(arg_data *)malloc(sizeof(arg_data)); - args->pidf="/var/run/jsvc.pid"; /* The default PID file */ - args->user=NULL; /* No user switching by default */ - args->dtch=true; /* Do detach from parent */ - args->vers=false; /* Don't display version */ - args->help=false; /* Don't display help */ - args->chck=false; /* Don't do a check-only startup */ - args->stop=false; /* Stop a running jsvc */ - args->wait=0; /* Wait until jsvc has started the JVM */ - args->install=false; /* Don't install as a service */ - args->remove=false; /* Don't remove the installed service */ - args->service=false; /* Don't run as a service */ - args->name=NULL; /* No VM version name */ - args->home=NULL; /* No default JAVA_HOME */ - args->onum=0; /* Zero arguments, but let's have some room */ - args->opts=(char **)malloc(argc*sizeof(char *)); - args->clas=NULL; /* No class predefined */ - args->anum=0; /* Zero class specific arguments but make room*/ - args->outfile="/dev/null"; /* Swallow by default */ - args->errfile="/dev/null"; /* Swallow by default */ - args->args=(char **)malloc(argc*sizeof(char *)); - args->procname = "jsvc.exec"; - /* Set up the command name */ - cmnd=strrchr(argv[0],'/'); - if (cmnd==NULL) cmnd=argv[0]; - else cmnd++; - log_prog=strdup(cmnd); - - /* Iterate thru command line arguments */ - for (x=1; x<argc; x++) { - - if ((strcmp(argv[x],"-cp")==0)||(strcmp(argv[x],"-classpath")==0)) { - temp=optional(argc,argv,x++); - if (temp==NULL) { - log_error("Invalid classpath specified"); - return(NULL); - } - tlen=strlen(temp)+20; - args->opts[args->onum]=(char *)malloc(tlen*sizeof(char)); - sprintf(args->opts[args->onum],"-Djava.class.path=%s",temp); - args->onum++; - - } else if (strcmp(argv[x],"-jvm")==0) { - args->name=optional(argc,argv,x++); - if (args->name==NULL) { - log_error("Invalid Java VM name specified"); - return(NULL); - } - - } else if (strcmp(argv[x],"-home")==0) { - args->home=optional(argc,argv,x++); - if (args->home==NULL) { - log_error("Invalid Java Home specified"); - return(NULL); - } - - } else if (strcmp(argv[x],"-user")==0) { - args->user=optional(argc,argv,x++); - if (args->user==NULL) { - log_error("Invalid user name specified"); - return(NULL); - } - - } else if (strcmp(argv[x],"-version")==0) { - args->vers=true; - args->dtch=false; - - } else if ((strcmp(argv[x],"-?")==0)||(strcmp(argv[x],"-help")==0) - ||(strcmp(argv[x],"--help")==0)) { - args->help=true; - args->dtch=false; - return(args); - - } else if (strcmp(argv[x],"-X")==0) { - log_error("Option -X currently unsupported"); - log_error("Please use \"java -X\" to see your extra VM options"); - - } else if (strcmp(argv[x],"-debug")==0) { - log_debug_flag=true; - - } else if (strcmp(argv[x],"-wait")==0) { - temp=optional(argc,argv,x++); - if (temp!=NULL) - args->wait=atoi(temp); - if (args->wait<10) { - log_error("Invalid wait time specified (min=10)"); - return(NULL); - } - - } else if (strcmp(argv[x],"-stop")==0) { - args->stop=true; - - } else if (strcmp(argv[x],"-check")==0) { - args->chck=true; - args->dtch=false; - - } else if (strcmp(argv[x],"-nodetach")==0) { - args->dtch=false; - - } else if (strcmp(argv[x],"-service")==0) { - args->service=true; - - } else if (strcmp(argv[x],"-install")==0) { - args->install=true; - - } else if (strcmp(argv[x],"-remove")==0) { - args->remove=true; - - } else if (strcmp(argv[x],"-pidfile")==0) { - args->pidf=optional(argc,argv,x++); - if (args->pidf==NULL) { - log_error("Invalid PID file specified"); - return(NULL); - } - - } else if(strcmp(argv[x],"-outfile") == 0) { - args->outfile=optional(argc, argv, x++); - if(args->outfile == NULL) { - log_error("Invalid Output File specified"); - return(NULL); - } - } else if(strcmp(argv[x],"-errfile") == 0) { - args->errfile=optional(argc, argv, x++); - if(args->errfile == NULL) { - log_error("Invalid Error File specified"); - return(NULL); - } - } else if (strstr(argv[x],"-verbose")==argv[x]) { - args->opts[args->onum++]=strdup(argv[x]); - -#ifdef HAVE_KAFFEVM - } else if (strstr(argv[x],"-vmdebug")==argv[x]) { - args->opts[args->onum++]=strdup(argv[x]); - temp=optional(argc,argv,x++); - if (temp==NULL) { - log_error("vmdebug option requires a debug flag."); - return(NULL); - } - args->opts[args->onum++]=strdup(temp); -#endif - } else if (strcmp(argv[x],"-D")==0) { - log_error("Parameter -D must be followed by <name>=<value>"); - return(NULL); - - } else if (strstr(argv[x],"-D")==argv[x]) { - temp=strchr(argv[x],'='); - if (temp==NULL) { - log_debug("Parameter -D must contain one '=' character"); - } - if (temp==argv[x]+2) { - log_error("A property name must be specified before '='"); - return(NULL); - } - args->opts[args->onum++]=strdup(argv[x]); - - } else if (strstr(argv[x],"-X")==argv[x]) { - args->opts[args->onum++]=strdup(argv[x]); - - } else if (strstr(argv[x],"-ea")==argv[x]) { - args->opts[args->onum++]=strdup(argv[x]); - - } else if (strcmp(argv[x],"-procname") == 0) { - args->procname = optional(argc, argv, x++); - if( args->procname == NULL) { - log_error("Invalid process name specified"); - return (NULL); - } - - /* -agentlib: -agentpath: -javaagent: 1.5.x JVM */ - } else if (strstr(argv[x],"-agentlib:")==argv[x]) { - args->opts[args->onum++]=strdup(argv[x]); - - } else if (strstr(argv[x],"-agentpath:")==argv[x]) { - args->opts[args->onum++]=strdup(argv[x]); - - } else if (strstr(argv[x],"-javaagent:")==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 { - args->clas=strdup(argv[x]); - break; - } - } - - if (args->clas==NULL && args->remove==false) { - log_error("No class specified"); - return(NULL); - } - - x++; - while (x<argc) args->args[args->anum++]=strdup(argv[x++]); - - return(args); -} -static char *IsYesNo(bool par) -{ - switch (par) { - case false: return("No"); - case true: return("Yes"); - } - return ("[Error]"); -} -static char *IsTrueFalse(bool par) -{ - switch (par) { - case false: return("False"); - case true: return("True"); - } - return ("[Error]"); -} -static char *IsEnabledDisabled(bool par) -{ - switch (par) { - case true: return("Enabled"); - case false: return("Disabled"); - } - return ("[Error]"); -} - -/* Main entry point: parse command line arguments and dump them */ -arg_data *arguments(int argc, char *argv[]) { - arg_data *args=parse(argc,argv); - int x=0; - - if (args==NULL) { - log_error("Cannot parse command line arguments"); - return(NULL); - } - - if (log_debug_flag==true) { - char *temp; - - log_debug("+-- DUMPING PARSED COMMAND LINE ARGUMENTS --------------"); - - log_debug("| Detach: %s",IsTrueFalse(args->dtch)); - - log_debug("| Show Version: %s",IsYesNo(args->vers)); - - log_debug("| Show Help: %s",IsYesNo(args->help)); - - log_debug("| Check Only: %s",IsEnabledDisabled(args->chck)); - - log_debug("| Stop: %s",IsTrueFalse(args->stop)); - - log_debug("| Wait: %d",args->wait); - - log_debug("| Run as service: %s",IsYesNo(args->service)); - - log_debug("| Install service: %s",IsYesNo(args->install)); - - log_debug("| Remove service: %s",IsYesNo(args->remove)); - - log_debug("| JVM Name: \"%s\"",PRINT_NULL(args->name)); - log_debug("| Java Home: \"%s\"",PRINT_NULL(args->home)); - log_debug("| PID File: \"%s\"",PRINT_NULL(args->pidf)); - log_debug("| User Name: \"%s\"",PRINT_NULL(args->user)); - - log_debug("| Extra Options: %d",args->onum); - for (x=0; x<args->onum; x++) log_debug("| \"%s\"",args->opts[x]); - - log_debug("| Class Invoked: \"%s\"",PRINT_NULL(args->clas)); - - log_debug("| Class Arguments: %d",args->anum); - for (x=0; x<args->anum; x++)log_debug("| \"%s\"",args->args[x]); - log_debug("+-------------------------------------------------------"); - } - - return(args); -} Copied: trunk/commons-daemon/src/native/unix/native/arguments.c (from rev 2811, branches/commons-daemon/feature/debian/src/native/unix/native/arguments.c) Deleted: trunk/commons-daemon/src/native/unix/support/apsupport.m4 =================================================================== --- branches/commons-daemon/feature/debian/src/native/unix/support/apsupport.m4 2006-11-28 09:17:57 UTC (rev 2799) +++ trunk/commons-daemon/src/native/unix/support/apsupport.m4 2006-11-29 19:01:52 UTC (rev 2820) @@ -1,128 +0,0 @@ -dnl -dnl Copyright 1999-2004 The Apache Software Foundation -dnl -dnl Licensed under the Apache License, Version 2.0 (the "License"); -dnl you may not use this file except in compliance with the License. -dnl You may obtain a copy of the License at -dnl -dnl http://www.apache.org/licenses/LICENSE-2.0 -dnl -dnl Unless required by applicable law or agreed to in writing, software -dnl distributed under the License is distributed on an "AS IS" BASIS, -dnl WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -dnl See the License for the specific language governing permissions and -dnl limitations under the License. -dnl - -dnl ------------------------------------------------------------------------- -dnl Author Pier Fumagalli <mailto:[EMAIL PROTECTED]> -dnl Version $Id: apsupport.m4 410153 2006-05-29 21:05:17Z jfclere $ -dnl ------------------------------------------------------------------------- - -AC_DEFUN(AP_SUPPORTED_HOST,[ - AC_MSG_CHECKING([C flags dependant on host system type]) - - case $host_os in - darwin*) - CFLAGS="$CFLAGS -DOS_DARWIN -DDSO_DYLD" - supported_os="darwin" - ;; - solaris*) - CFLAGS="$CFLAGS -DOS_SOLARIS -DDSO_DLFCN" - supported_os="solaris" - LIBS="$LIBS -ldl -lthread" - ;; - linux*) - CFLAGS="$CFLAGS -DOS_LINUX -DDSO_DLFCN" - supported_os="linux" - LIBS="$LIBS -ldl -lpthread" - ;; - cygwin) - CFLAGS="$CFLAGS -DOS_CYGWIN -DDSO_DLFCN -DNO_SETSID" - supported_os="win32" - ;; - sysv) - CFLAGS="$CFLAGS -DOS_SYSV -DDSO_DLFCN" - LIBS="$LIBS -ldl" - ;; - sysv4) - CFLAGS="$CFLAGS -DOS_SYSV -DDSO_DLFCN -Kthread" - LDFLAGS="-Kthread $LDFLAGS" - LIBS="$LIBS -ldl" - ;; - freebsd*) - CFLAGS="$CFLAGS -DOS_FREEBSD -DDSO_DLFCN -D_THREAD_SAFE -pthread" - LDFLAGS="-pthread $LDFLAGS" - supported_os="freebsd" - ;; - osf5*) - CFLAGS="$CFLAGS -pthread -DOS_TRU64 -DDSO_DLFCN -D_XOPEN_SOURCE_EXTENDED" - LDFLAGS="$LDFLAGS -pthread" - ;; - hpux11*) - CFLAGS="$CFLAGS -pthread -DOS_HPUX -DDSO_DLFCN" - LDFLAGS="$LDFLAGS -pthread" - LIBS="$LIBS -lpthread" - ;; - *) - AC_MSG_RESULT([failed]) - AC_MSG_ERROR([Unsupported operating system "$host_os"]) - ;; - esac - case $host_cpu in - powerpc) - CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\"" - HOST_CPU=$host_cpu;; - sparc*) - CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\"" - HOST_CPU=$host_cpu;; - i?86) - CFLAGS="$CFLAGS -DCPU=\\\"i386\\\"" - HOST_CPU=i386;; - x86_64) - CFLAGS="$CFLAGS -DCPU=\\\"amd64\\\"" - HOST_CPU=amd64;; - bs2000) - CFLAGS="$CFLAGS -DCPU=\\\"osd\\\" -DCHARSET_EBCDIC -DOSD_POSIX" - supported_os="osd" - LDFLAGS="-Kno_link_stdlibs -B llm4" - LIBS="$LIBS -lBLSLIB" - LDCMD="/opt/C/bin/cc" - HOST_CPU=osd;; - mips) - CFLAGS="$CFLAGS -DCPU=\\\"mips\\\"" - supported_os="mips" - HOST_CPU=mips;; - alpha*) - CFLAGS="$CFLAGS -DCPU=\\\"alpha\\\"" - supported_os="alpha" - HOST_CPU=alpha;; - hppa2.0w) - CFLAGS="$CFLAGS -DCPU=\\\"PA_RISC2.0W\\\"" - supported_os="hp-ux" - HOST_CPU=PA_RISC2.0W;; - hppa2.0) - CFLAGS="$CFLAGS -DCPU=\\\"PA_RISC2.0\\\"" - supported_os="hp-ux" - HOST_CPU=PA_RISC2.0;; - mipsel) - CFLAGS="$CFLAGS -DCPU=\\\"mipsel\\\"" - supported_os="mipsel" - HOST_CPU=mipsel;; - ia64) - CFLAGS="$CFLAGS -DCPU=\\\"ia64\\\"" - supported_os="ia64" - HOST_CPU=ia64;; - s390) - CFLAGS="$CFLAGS -DCPU=\\\"s390\\\"" - supported_os="s390" - HOST_CPU=s390;; - *) - AC_MSG_RESULT([failed]) - AC_MSG_ERROR([Unsupported CPU architecture "$host_cpu"]);; - esac - - AC_MSG_RESULT([ok]) - AC_SUBST(CFLAGS) - AC_SUBST(LDFLAGS) -]) Copied: trunk/commons-daemon/src/native/unix/support/apsupport.m4 (from rev 2800, branches/commons-daemon/feature/debian/src/native/unix/support/apsupport.m4) _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
