--- lmtp2nntp_option.c 2002/05/29 12:24:49 1.19
+++ lmtp2nntp_option.c 2002/07/02 07:49:01 1.20
@@ -478,9 +478,9 @@
if (!eline) { /* process logical line unless it's empty */
*(cpO-1) = NUL;
if (lline == (pline-1))
- ;//printf("DEBUG: line[%3d] = ***%s***\n", lline, cpL);
+ ;/*printf("DEBUG: line[%3d] = ***%s***\n", lline, cpL);*/
else
- ;//printf("DEBUG: [%3d-%3d] = ***%s***\n", lline, pline-1, cpL);
+ ;/*printf("DEBUG: [%3d-%3d] = ***%s***\n", lline, pline-1, cpL);*/
{
char *cp = cpL;
char *option;
@@ -491,10 +491,10 @@
Newarg.as = 0;
Newarg.az = NULL;
if ((option = str_token(&cp, " \t", "\"'", "#", STR_STRIPQUOTES|STR_BACKSLASHESC)) == NULL)
- //printf("DEBUG: no command - comment only\n")
+ /*printf("DEBUG: no command - comment only\n")*/
;/* don't care about comments */
else {
- //printf("DEBUG: option = ***%s***\n", option);
+ /*printf("DEBUG: option = ***%s***\n", option);*/
if (argv == NULL) {
if ((argv = (char **)malloc( ( 1 + 1) * sizeof(char **))) == NULL)
return OPTION_ERR_MEM;
@@ -514,10 +514,10 @@
argv[argc] = NULL;
if ((value = str_token(&cp, " \t", "\"'", "#", STR_STRIPQUOTES|STR_BACKSLASHESC)) == NULL)
- ;//printf("DEBUG: no value - section\n");
+ ;/*printf("DEBUG: no value - section\n");*/
else {
while(isspace((int)*value)) value++;
- //printf("DEBUG: value = ***%s***\n", value);
+ /*printf("DEBUG: value = ***%s***\n", value);*/
if ((cpNew = strdup(value)) == NULL)
return OPTION_ERR_MEM;
if ((argv = (char **)realloc(argv, (argc + 1 + 1) * sizeof(char **))) == NULL)
@@ -548,7 +548,7 @@
return OPTION_ERR_ARG;
try {
- option_register(o, "childsmax", 'C', OPT_SINGLE, "10", "Childs the daemon spawns at max.", "childsmax", &stdsyntax, "m/\\d+/" ); //"m/[0-9]+/" );
+ option_register(o, "childsmax", 'C', OPT_SINGLE, "10", "Childs the daemon spawns at max.", "childsmax", &stdsyntax, "m/\\d+/" ); /*"m/[0-9]+/"*/
option_register(o, "daemonize", 'D', OPT_FLAG, NULL, "Daemonize and detach from terminal", NULL, &stdsyntax, NULL );
option_register(o, "kill", 'K', OPT_FLAG, NULL, "Kill a previously run daemon", NULL, &stdsyntax, NULL );
option_register(o, "pidfile", 'P', OPT_SINGLE, NULL, "Pidfile holding the process ID", "filename", &stdsyntax, "m/.*/" );
@@ -556,15 +556,15 @@
option_register(o, "bind", 'b', OPT_SINGLE, NULL, "LMTP daemon bind", "addr[:port]|-|path[:perms]", &stdsyntax, "m/.*/" );
option_register(o, "client", 'c', OPT_SINGLE, NULL, "NNTP client bind", "addr[:port]", &stdsyntax, "m/.*/" );
option_register(o, "destination", 'd', OPT_MULTI, NULL, "NNTP client destination", "addr[:port]", &stdsyntax, "m/.*/" );
- option_register(o, "groupmode", 'g', OPT_SINGLE, "arg", "Groupmode configures news group(s)", "arg|envelope|header", &stdsyntax, "m/.*/" ); //"m/(arg|envelope|header)/" );
+ option_register(o, "groupmode", 'g', OPT_SINGLE, "arg", "Groupmode configures news group(s)", "arg|envelope|header", &stdsyntax, "m/.*/" ); /*"m/(arg|envelope|header)/"*/
option_register(o, "headerrule", 'h', OPT_MULTI, NULL, "Header rewriting rule", "[pri]:[regex]:header:[val]", &stdsyntax, "m/^[0-9]*:.*:.+:.*$/" );
option_register(o, "include", 'i', OPT_MULTI, NULL, "Include a configuration file", "configfile", &includeit, "m/.*/" );
option_register(o, "l2spec", 'l', OPT_SINGLE, NULL, "L2 channel tree specification", "l2spec", &stdsyntax, "m/.*/" );
option_register(o, "mailfrom", 'm', OPT_SINGLE, NULL, "Mail from envelope restriction", "regex", &stdsyntax, "m/.*/" );
option_register(o, "nodename", 'n', OPT_SINGLE, NULL, "System nodename", "name", &stdsyntax, "m/.*/" );
- option_register(o, "operationmode", 'o', OPT_SINGLE, "553/5.7.1", "Set fake status or operationmode", "abc/a.d.e|post|feed", &stdsyntax, "m/.*/" ); //"m/([0-9]{3}\\/[0-9]\\.[0-9]\\.[0-9]|post|feed)/" ); /* 553 = Requested action not taken: mailbox name not allowed, 5.7.1 = Delivery not authorized, message refused */
+ option_register(o, "operationmode", 'o', OPT_SINGLE, "553/5.7.1", "Set fake status or operationmode", "abc/a.d.e|post|feed", &stdsyntax, "m/.*/" ); /*"m/([0-9]{3}\\/[0-9]\\.[0-9]\\.[0-9]|post|feed)/" ); 553 = Requested action not taken: mailbox name not allowed, 5.7.1 = Delivery not authorized, message refused */
option_register(o, "restrictheader", 'r', OPT_SINGLE, NULL, "Restrict messages by header", "regex", &stdsyntax, "m/.*/" );
- option_register(o, "size", 's', OPT_SINGLE, "8388608", "Size limitation on message", "bytes", &stdsyntax, "m/.*/" ); //"m/[0-9]+/" );
+ option_register(o, "size", 's', OPT_SINGLE, "8388608", "Size limitation on message", "bytes", &stdsyntax, "m/.*/" ); /*"m/[0-9]+/"*/
option_register(o, "testfile", 't', OPT_MULTI, NULL, "Testfile for headerrule", "filename", &stdsyntax, "m/.*/" );
option_register(o, "timeoutlmtp", NUL, OPT_SINGLE, NULL, "LMTP server default timeout", "sec", &stdsyntax, "m/.*/" );
option_register(o, "timeoutlmtpaccept", NUL, OPT_SINGLE, "0", "LMTP server accept timeout", "sec", &stdsyntax, "m/.*/" );
@@ -579,7 +579,7 @@
option_register(o, "newsgroup", NUL, OPT_MULTI, NULL, "Newsgroup name or match", "newsgroup|wildmat", &stdsyntax, "m/.*/" );
}
catch(ex) {
- if (ex.ex_class == option_create)
+ if (ex.ex_class == (void *)option_create)
return (lmtp2nntp_option_rc_t)ex.ex_value;
return OPTION_ERR_TRY;
}
|
