Started arg parser implementation

include/conf.h

@@ -19,6 +19,9 @@
 #ifndef __CONF_H___
 #define __CONF_H___
 
+#include <unistd.h>
+#include <getopt.h>
+
 #include "config.h"
 /**@defgroup conf_internal PYFCGI configuration handling
  */
@@ -38,6 +41,55 @@
 /**@ingroup ret_status */
 #define PYFCGI_FATAL 128
 
+#define PYFCGI_NAME "spawn-fcgi [OPTIONS] -- pyfcgi"
+
+#define PYFCGI_SHORT_OPT "Ce:E:w:W:m:l:Svh"
+
+#define PYFCGI_LONG_OPT { \
+	{"config", required_argument, 0, 'C'},\
+	{"pymodule", required_argument, 0, 'e'},\
+	{"pyapp", required_argument, 0, 'E'},\
+	{"min-worker", required_argument, 0, 'w'},\
+	{"max-worker", required_argument, 0, 'W'},\
+	{"max-request", required_argument, 0, 'm'},\
+	{"log", required_argument, 0, 'L'},\
+	{"syslog", no_argument, 0, 'S'},\
+	{"pid-file", required_argument, 0, 'P'},\
+	{"version", no_argument, 0, 'v'},\
+	{"help", no_argument, 0, 'h' },\
+	{0, 0, 0, 0}\
+}
+
+#define PYFCGI_OPT_HELP {\
+	{"Load options from configuration file", "CONFIG"},\
+	{"Search application function in given python module", "MODULE_NAME"},\
+	{"Python application entrypoint function name", "FUNC_NAME"},\
+	{"Minimum worker in the pool", "INT"},\
+	{"Maximum worker in the pool", "INT"},\
+	{"Request count after wich the worker is restarted (if 0 never restart)", "INT"},\
+	{"Add a logfile using syntax : 'LOGFILE[;FILT][;FMT]'", "LOGGER_SPEC"},\
+	{"Use syslog for logging", NULL},\
+	{"Create a PID file", "FILENAME"},\
+	{"Print PyFCGI and Python version and exit", NULL},\
+	{"Display this help and exit", NULL},\
+}
+
+#define PYFCGI_HELP_TEXT "Logger specification format 'LOGFILE[;FILT][;FMT]' with :\n\
+\t- LOGFILE the log file name\n\
+\t- FILT a number (in decimal or hexadicimal 0xXX) indicating wich\n\
+\t  facility/level to log\n\
+\t- FMT the logline format in a special markup format using fields between { }\n\
+\t  supported fields are :\n\
+\t\t- {datetime} {datetime:SIZE} {datetime:SIZE:FMT} defines a format and a \n\
+\t\t  constant length for a datetime field. Default : {datetime:25:%F %T%z}\n\
+\t\t- {level} the loglevel \n\
+\t\t- {facility} the log facility\n\
+\t\t- {pid} the process PID\n\
+\t\t- {ident} the defined ident (set by process)\n\
+\t\t- {msg} the log message (can only appear once)\n\
+You can escape { and } by using {{ and }} and all field names can by\n\
+abbreviated to one character.\n"
+
 /**@brief Friendly name for @ref struct pyfcgi_conf_s
  * @see struct pyfcgi_conf_s */
 typedef struct pyfcgi_conf_s pyfcgi_conf_t;
@@ -47,6 +99,7 @@ typedef struct pyfcgi_context_s pyfcgi_context_t;
 struct pyfcgi_context_s {
 	pid_t pid;
 	pid_t ppid;
+	char *pidfile;
 };
 
 /**@brief Structure containing configuration
@@ -84,4 +137,16 @@ struct pyfcgi_conf_s
 /**@brief Configuration globals, inherited from parent to childs */
 pyfcgi_conf_t PyFCGI_conf;
 
+/**@brief Print usage on FD 2 (stdout) */
+void usage();
+
+/**@brief Print pyfcgi & python version on given fd */
+void print_version(int);
+
+/**@brief Parse arguments and store them in conf
+ * @return 0 if no error */
+int parse_args(int argc, char *argv[]);
+
+int parse_optlog(const char*);
+
 #endif

src/Makefile.am

@@ -1,7 +1,7 @@
 bin_PROGRAMS = pyfcgi
 noinst_LIBRARIES = libpyfcgi.a
 
-libpyfcgi_a_SOURCES = logger.c pyworker.c responder.c
+libpyfcgi_a_SOURCES = logger.c pyworker.c responder.c conf.c
 libpyfcgi_a_CFLAGS = $(PYTHON_CFLAGS)
 
 

src/conf.c

@@ -0,0 +1,110 @@
+#include "conf.h"
+
+void usage()
+{
+	static const struct option opts[] = PYFCGI_LONG_OPT;
+	static const char *help[][2] = PYFCGI_OPT_HELP;
+	size_t i;
+	dprintf(2, "Usage : %s -e PYMODULE -E PYFUN [OPTIONS]\n", PYFCGI_NAME);
+	dprintf(2, "\nOptions list :\n");
+	i=0;
+	while(opts[i].name)
+	{
+		dprintf(2, "\t-%c, --%s", opts[i].val, opts[i].name);
+		switch(opts[i].has_arg)
+		{
+			case required_argument:
+				dprintf(2, "=%s\n",
+					help[i][1]?help[i][1]:"ARG");
+				break;
+			case optional_argument:
+				dprintf(2, "[=%s]\n",
+					help[i][1]?help[i][1]:"ARG");
+				break;
+			default: //no_argument
+				dprintf(2, "\n");
+		}
+		printf("\t\t%s\n\n", help[i][0]);
+		i++;
+	}
+	dprintf(2, "%s", PYFCGI_HELP_TEXT);
+}
+
+void print_version(int fd)
+{
+
+}
+
+int parse_args(int argc, char *argv[])
+{
+	static const struct option long_options[] = PYFCGI_LONG_OPT;
+	int c, opt_i;
+	while(1)
+	{
+		c = getopt_long(argc, argv, PYFCGI_SHORT_OPT, long_options,
+			&opt_i);
+		if(c == -1) { break; }
+		switch(c)
+		{
+			case 'v':
+				print_version(1);
+				exit(0);
+			case 'C':
+				dprintf(2, "Config parser not yet implemented :'(\n");
+				exit(1);
+			case 'e':
+				PyFCGI_conf.py_entrymod = strdup(optarg);
+				break;
+			case 'E':
+				PyFCGI_conf.py_entryfun = strdup(optarg);
+				break;
+			case 'w':
+				PyFCGI_conf.min_wrk = atoi(optarg);
+				break;
+			case 'W':
+				PyFCGI_conf.max_wrk = atoi(optarg);
+				break;
+			case 'm':
+				PyFCGI_conf.max_reqs = atoi(optarg);
+				if(PyFCGI_conf.max_reqs < 0)
+				{
+					PyFCGI_conf.max_reqs = 0;
+				}
+				break;
+			case 'L':
+				if(parse_optlog(optarg))
+				{
+					exit(1);
+				}
+				break;
+			case 'S':
+				PyFCGI_conf.logs.flags |= PYFCGI_LOG_FSYSLOG;
+				break;
+			case 'P':
+				PyFCGI_conf.context.pidfile = strdup(optarg);
+				break;
+			case 'h':
+				usage();
+				exit(0);
+			default:
+				usage();
+				exit(1);
+		}
+	}
+	if(optind < argc)
+	{
+		for(opt_i=optind; opt_i<argc; opt_i++)
+		{
+			dprintf(2, "Unkown argument '%s'\n", argv[opt_i]);
+		}
+		usage();
+		exit(1);
+	}
+	return 0;
+}
+
+int parse_optlog(const char* logspec)
+{
+	return 0;
+}
+

src/main.c

@@ -59,13 +59,21 @@ int main(int argc, char **argv)
 	unsigned int emerg_sleep = 3;
 
 	py_entrypoint = getenv("PY_ENTRYPOINT");
+	/*
 	if(argc > 1 || !py_entrypoint)
 	{
+		usage();
+		return 1;
 		EARLY_ERR("Usage : PY_ENTRYPOINT='PATH.py' spawn-fcgi [OPTIONS] ");
 		EARLY_ERR(argv[0]);
 		EARLY_ERR("\n");
 		return 1;
 	}
+	*/
+	if(parse_args(argc, argv))
+	{
+		return 1;
+	}
 
 PyFCGI_conf.context.pid = getpid();