Index: ossp-pkg/lmtp2nntp/lmtp2nntp_config.c RCS File: /v/ossp/cvs/ossp-pkg/lmtp2nntp/lmtp2nntp_config.c,v rcsdiff -q -kk '-r1.77' '-r1.78' -u '/v/ossp/cvs/ossp-pkg/lmtp2nntp/lmtp2nntp_config.c,v' 2>/dev/null --- lmtp2nntp_config.c 2002/05/28 14:14:44 1.77 +++ lmtp2nntp_config.c 2002/07/02 07:49:01 1.78 @@ -166,7 +166,7 @@ fprintf(stderr, "%s:Error: logging failed to configure \"%s\" channel\n", ctx->progname, l2_handler_var.name); CU(ERR_EXECUTION); } - //FIXME this is cut off on command line!? fprintf(stderr, "DEBUG: ov->data.s = \"%s\"\n", ov->data.s); + /* FIXME this is cut off on command line!? fprintf(stderr, "DEBUG: ov->data.s = \"%s\"\n", ov->data.s); */ if ((rc = l2_spec(&ch, ctx->l2_env, ov->data.s)) != L2_OK) { fprintf(stderr, "%s:Error: logging failed to create stream\n", ctx->progname); CU(ERR_EXECUTION); @@ -184,7 +184,7 @@ * should not be used in the remainder of the program flow. */ logbook(ctx->l2, L2_LEVEL_NOTICE, "startup, version %s", lmtp2nntp_version.v_gnu); - //logbook(ctx->l2, L2_LEVEL_NOTICE, "FIXME>>>${option.destination[0]}<<>>${option.destination[1]}<<<"); + /* logbook(ctx->l2, L2_LEVEL_NOTICE, "FIXME>>>${option.destination[0]}<<>>${option.destination[1]}<<<"); */ /* --version FLAG */ try { @@ -198,7 +198,7 @@ if (ov->data.f == 1) { fprintf(stdout, "%s\n", lmtp2nntp_version.v_gnu); - exit(0); //FIXME + exit(0); /* FIXME */ } } catch (ex) @@ -507,7 +507,7 @@ cp = (ov->data.m)[i]; logbook(ctx->l2, L2_LEVEL_DEBUG, "cp = (data.m)[%d] = \"%s\"", i, cp); if (strrchr(cp, ':') == NULL) - cp = str_concat(cp, ":nntp", NULL); //FIXME is this a config var/val? + cp = str_concat(cp, ":nntp", NULL); /* FIXME is this a config var/val? */ else cp = str_concat(cp, NULL); /* prepare for free() */ if ((rc = sa_addr_create(&ctx->pns[i].saa)) != SA_OK) { @@ -515,11 +515,11 @@ throw(0,0,0); } if ((rc = sa_addr_u2a(ctx->pns[i].saa, "inet://%s", cp)) != SA_OK) { - logbook(ctx->l2, L2_LEVEL_ERROR, "option --destination, parsing host address (%s) failed with \"%s\"", cp /*FIXME again, option vs. config */, sa_error(rc)); + logbook(ctx->l2, L2_LEVEL_ERROR, "option --destination, parsing host address (%s) failed with \"%s\"", cp /* FIXME again, option vs. config */, sa_error(rc)); throw(0,0,0); } if ((rc = sa_create(&ctx->pns[i].sa)) != SA_OK) { - logbook(ctx->l2, L2_LEVEL_ERROR, "option --destination, creating TCP socket (%s) failed with \"%s\"", cp /*FIXME again, option vs. config */, sa_error(rc)); + logbook(ctx->l2, L2_LEVEL_ERROR, "option --destination, creating TCP socket (%s) failed with \"%s\"", cp /* FIXME again, option vs. config */, sa_error(rc)); throw(0,0,0); } ctx->pns[i].nntp = NULL; @@ -560,7 +560,7 @@ /* --headerrule MULTI */ { - volatile headerrule_t *hrNew = NULL; // declare and initialize variables which might have resources allocated that need to be cleaned up when an exception is caught + volatile headerrule_t *hrNew = NULL; /* declare and initialize variables which might have resources allocated that need to be cleaned up when an exception is caught */ try { char *cp, *cpP; int n; @@ -661,14 +661,14 @@ } /* establish variable expansion context */ { - var_rc_t rc; + var_rc_t rc2; - if ((rc = var_create(&ctx->config_varregex)) != VAR_OK) { - logbook(ctx->l2, L2_LEVEL_ERROR, "option --headerrule, create regex context failed with %s (%d)", var_strerror(ctx->config_varregex, rc, &cp) == VAR_OK ? cp : "Unknown Error", rc); + if ((rc2 = var_create(&ctx->config_varregex)) != VAR_OK) { + logbook(ctx->l2, L2_LEVEL_ERROR, "option --headerrule, create regex context failed with %s (%d)", var_strerror(ctx->config_varregex, rc2, &cp) == VAR_OK ? cp : "Unknown Error", rc2); throw(0,0,0); } - if ((rc = var_config(ctx->config_varregex, VAR_CONFIG_SYNTAX, &syntax_regex)) != VAR_OK) { - logbook(ctx->l2, L2_LEVEL_ERROR, "option --headerrule, config regex context failed with %s (%d)", var_strerror(ctx->config_varregex, rc, &cp) == VAR_OK ? cp : "Unknown Error", rc); + if ((rc2 = var_config(ctx->config_varregex, VAR_CONFIG_SYNTAX, &syntax_regex)) != VAR_OK) { + logbook(ctx->l2, L2_LEVEL_ERROR, "option --headerrule, config regex context failed with %s (%d)", var_strerror(ctx->config_varregex, rc2, &cp) == VAR_OK ? cp : "Unknown Error", rc2); throw(0,0,0); } } @@ -1089,7 +1089,7 @@ const char *filename = cp; struct stat sb; volatile int fd = -1; - //ex_t ex; + /* ex_t ex; */ try { if (stat(filename, &sb) == -1) throw(0, 0, "stat"); @@ -1108,15 +1108,15 @@ } { volatile msg_t *msg = NULL; - msg_rc_t rc; + msg_rc_t rc2; try { ctx->msgcount++; if ((msg = msg_create(ctx->prival)) == NULL) throw(0, 0, "msg_create"); msg->l2 = ctx->l2; msg->cpMsg = cpBuf; - if ((rc = msg_split((msg_t *)msg)) != MSG_OK) { - logbook(ctx->l2, L2_LEVEL_ERROR, "Error splitting message: %s", msg_error(rc)); + if ((rc2 = msg_split((msg_t *)msg)) != MSG_OK) { + logbook(ctx->l2, L2_LEVEL_ERROR, "Error splitting message: %s", msg_error(rc2)); throw(0, 0, "msg_split"); } msg_headermatrixbuildup((msg_t *)msg); @@ -1124,8 +1124,8 @@ headerrewrite(ctx); msg_headermatrixteardwn((msg_t *)msg); argz_add(&((msg_t *)msg)->azNewsgroups, &((msg_t *)msg)->asNewsgroups, "invalid.test"); - if ((rc = msg_join((msg_t *)msg)) != MSG_OK) { - logbook(ctx->l2, L2_LEVEL_ERROR, "Error joining message: %s", msg_error(rc)); + if ((rc2 = msg_join((msg_t *)msg)) != MSG_OK) { + logbook(ctx->l2, L2_LEVEL_ERROR, "Error joining message: %s", msg_error(rc2)); throw(0, 0, "msg_join"); } printf("%s", msg->cpMsg); @@ -1140,7 +1140,7 @@ } } } - exit(0); //FIXME + exit(0); /* FIXME */ } } catch (ex) Index: ossp-pkg/lmtp2nntp/lmtp2nntp_main.c RCS File: /v/ossp/cvs/ossp-pkg/lmtp2nntp/lmtp2nntp_main.c,v rcsdiff -q -kk '-r1.55' '-r1.56' -u '/v/ossp/cvs/ossp-pkg/lmtp2nntp/lmtp2nntp_main.c,v' 2>/dev/null --- lmtp2nntp_main.c 2002/05/27 15:09:50 1.55 +++ lmtp2nntp_main.c 2002/07/02 07:49:01 1.56 @@ -445,7 +445,6 @@ /* establish variable expansion context */ { - var_rc_t rc; char *cp; if ((rc = var_create(&ctx->config_varctx)) != VAR_OK) { @@ -470,7 +469,7 @@ if (option_create(&o, ctx->val) != OPTION_OK) CU(ERR_EXECUTION); rv = option_parse(o, argc, argv); - config_context(ctx); //FIXME rc + config_context(ctx); /*FIXME rc */ if (rv != OPTION_OK) CU(ERR_EXECUTION); } @@ -704,7 +703,7 @@ /* graceful shutdown */ CUS: logbook(ctx->l2, L2_LEVEL_NOTICE, "graceful shutdown shortly before exit - no more logging"); - //l2_channel_destroy(ctx->l2); + /* l2_channel_destroy(ctx->l2); */ l2_env_destroy(ctx->l2_env); if (ctx->saServerbind) sa_destroy(ctx->saServerbind); @@ -712,7 +711,7 @@ sa_addr_destroy(ctx->saaServerbind); if (ctx->option_restrictheader != NULL) free(ctx->option_restrictheader); - //FIXME if (ctx->azHeaderValuePairs != NULL) free(ctx->azHeaderValuePairs); what about headerrules + /* FIXME if (ctx->azHeaderValuePairs != NULL) free(ctx->azHeaderValuePairs); what about headerrules */ if (ctx->option_pidfile != NULL) free(ctx->option_pidfile); if (ctx->option_nodename != NULL) @@ -730,7 +729,7 @@ str_parse(NULL, NULL); if (o != NULL) (void)option_destroy(o); - //FIXME check if anything initialized in the lmtp2nntp_t structure is destroyed here (val, prival ...) + /* FIXME check if anything initialized in the lmtp2nntp_t structure is destroyed here (val, prival ...) */ return rc; } @@ -886,7 +885,7 @@ memcpy(&ctx->pns[i], &ctx->pns[i+1], (ctx->nns - i ) * sizeof(struct ns)); } */ - i++; //FIXME this is just to avoid infinite loop + i++; /* FIXME this is just to avoid infinite loop */ } } while (i < ctx->nns); @@ -1647,7 +1646,7 @@ if (ctx->pns[i].rc != NNTP_OK) { var_rc_t var_rc; char *res_ptr; - int res_len; + size_t res_len; str_format(errorstring, sizeof(errorstring), "${option.destination[%d]} returned %s\n" "${option.destination[%d]} lastresp \"%s\"", Index: ossp-pkg/lmtp2nntp/lmtp2nntp_msg.c RCS File: /v/ossp/cvs/ossp-pkg/lmtp2nntp/lmtp2nntp_msg.c,v rcsdiff -q -kk '-r1.28' '-r1.29' -u '/v/ossp/cvs/ossp-pkg/lmtp2nntp/lmtp2nntp_msg.c,v' 2>/dev/null --- lmtp2nntp_msg.c 2002/05/29 21:35:52 1.28 +++ lmtp2nntp_msg.c 2002/07/02 07:49:01 1.29 @@ -29,7 +29,7 @@ #include "lmtp2nntp_msg.h" #include "lmtp2nntp_argz.h" -#include "fixme.h" //FIMXE logbook only +#include "fixme.h" /* FIMXE logbook only */ #include "tai.h" #include "str.h" @@ -452,7 +452,7 @@ return str; } - //FIXME below is the header rewriting engine which must be cleaned up and integrated + /* FIXME below is the header rewriting engine which must be cleaned up and integrated */ static void headerdatadestroy(headerdata_t *hdC) { @@ -605,7 +605,7 @@ tai_t *futurerange; tai_t *value; - tai_create(&now); //FIXME ex + tai_create(&now); /* FIXME ex */ (void /*FIXME*/)tai_import(now, TAI_TYPE_UNIX); /* parse argument ([past][,[future]]) @@ -627,17 +627,17 @@ else *cpF++ = NUL; if (strlen(cpP) != 0) { - tai_create(&pastrange); //FIXME ex + tai_create(&pastrange); /* FIXME ex */ (void /*FIXME*/)tai_import(pastrange , TAI_TYPE_SECONDS, 24*60*60*atoi(cpP)); } if (strlen(cpF) != 0) { - tai_create(&futurerange); //FIXME ex + tai_create(&futurerange); /* FIXME ex */ (void /*FIXME*/)tai_import(futurerange, TAI_TYPE_SECONDS, 24*60*60*atoi(cpF)); } free(cpP); } - //FIXME printf("DEBUG: cpVal=\"%41s\", cpArg=\"%s\"\n", cpVal, cpArg); + /* FIXME printf("DEBUG: cpVal=\"%41s\", cpArg=\"%s\"\n", cpVal, cpArg); */ if ((cpVal == NULL) || (strlen(cpVal) == 0)) { *cppOut = (char *)mallocex(DATELENMAX); *pnOutsize = DATELENMAX; @@ -645,12 +645,12 @@ *pnOut = strlen(*cppOut); } else { - tai_create(&value); //FIXME ex + tai_create(&value); /* FIXME ex */ bOk = FALSE; for (i = 0; !bOk && (fmt[i] != NULL); i++) { if ((rv = tai_parse(value, cpVal, strlen(cpVal), fmt[i])) == TAI_OK) bOk = TRUE; - //FIXME printf("DEBUG: checked against \"%41s\" returned %d\n", fmt[i], rv); + /* FIXME printf("DEBUG: checked against \"%41s\" returned %d\n", fmt[i], rv); */ } if ( bOk #if 0 @@ -888,7 +888,7 @@ return; #if 0 - { //TODO debug only - wait for l2 to support code block bypassing + { /* TODO debug only - wait for l2 to support code block bypassing */ int i; headerrule_t *hrD; headerdata_t *hdD; @@ -923,7 +923,7 @@ } for (hrI = ctx->option_firstheaderrule; hrI != NULL; hrI = hrI->next) { /* for each rule */ #if 0 - { //TODO debug only - wait for l2 to support code block bypassing + { /* TODO debug only - wait for l2 to support code block bypassing */ int i; headerrule_t *hrD; headerdata_t *hdD; @@ -932,7 +932,7 @@ for (hrD = ctx->option_firstheaderrule; hrD != NULL; hrD = hrD->next) logbook(ctx->l2, L2_LEVEL_DEBUG, "hrD->header=%s", hrD->header); for (hdD = ctx->msg->hdFirst; hdD != NULL; hdD = hdD->next) { - //logbook(ctx->l2, L2_LEVEL_DEBUG, "hdD=%.8lx, hdD->name=%.8lx, hdD->data.s=%.8lx", (long)hdD, (long)&hdD->name, (long)&hdD->data.s); + /* logbook(ctx->l2, L2_LEVEL_DEBUG, "hdD=%.8lx, hdD->name=%.8lx, hdD->data.s=%.8lx", (long)hdD, (long)&hdD->name, (long)&hdD->data.s); */ if (hdD->ndata == 0) logbook(ctx->l2, L2_LEVEL_DEBUG, "hdD->name=%s: (NO DATA)", hdD->name); if (hdD->ndata == 1) @@ -951,7 +951,6 @@ regex_ctx->nMatch = pcre_exec(hrI->pcreRegex, hrI->pcreExtra, hdI->name, strlen(hdI->name), 0, 0, ovec, OVECSIZE); if (regex_ctx->nMatch >= 1) { int i; - char *cp; logbook(ctx->l2, L2_LEVEL_DEBUG, "regex matches, %d references", regex_ctx->nMatch); pcre_get_substring_list(hdI->name, ovec, regex_ctx->nMatch, ®ex_ctx->acpMatch); if (regex_ctx->acpMatch != NULL) @@ -1068,7 +1067,7 @@ } #if 0 - { //TODO debug only - wait for l2 to support code block bypassing + { /* TODO debug only - wait for l2 to support code block bypassing */ int i; headerrule_t *hrD; headerdata_t *hdD; Index: ossp-pkg/lmtp2nntp/lmtp2nntp_option.c RCS File: /v/ossp/cvs/ossp-pkg/lmtp2nntp/lmtp2nntp_option.c,v rcsdiff -q -kk '-r1.19' '-r1.20' -u '/v/ossp/cvs/ossp-pkg/lmtp2nntp/lmtp2nntp_option.c,v' 2>/dev/null --- 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; }