--- lmtp2nntp.c 2001/08/20 14:11:30 1.20
+++ lmtp2nntp.c 2001/08/21 07:40:41 1.21
@@ -263,19 +263,19 @@
exit(ERR_EXECUTION);
}
ctx->ns[ctx->nsc].sa = sa;
- //FIXME sa_destroy(sa);
+ /*FIXME sa_destroy(sa); */
ctx->ns[ctx->nsc].nntp = NULL;
ctx->nsc++;
break;
- case 't': // -t (tracing)
+ case 't': /* -t (tracing) */
ctx->option_tracing = TRUE;
trace_read (-1, optarg, 0);
trace_write(-1, optarg, 0);
break;
- case 'v': // -v (verbose)
+ case 'v': /* -v (verbose) */
ctx->option_verbose = TRUE;
break;
- case 'V': // -V (version)
+ case 'V': /* -V (version) */
fprintf(stdout, "%s\n", lmtp2nntp_version.v_gnu);
exit(0);
break;
@@ -287,7 +287,7 @@
}
/* remaining arguments are Groupargs */
for (i = optind; i < argc; i++) {
- //fprintf(stderr, "DEBUG: argv[i] = ***%s***\n", argv[i]);
+ /*fprintf(stderr, "DEBUG: argv[i] = ***%s***\n", argv[i]); */
argz_add(&ctx->azGroupargs, &ctx->asGroupargs, argv[i]);
}
@@ -315,7 +315,7 @@
static void resetsession(struct session *session)
{
- //FIXME what about non-graceful aborts?
+ /*FIXME what about non-graceful aborts? */
if (session->lhlo_domain != NULL)
free(session->lhlo_domain);
initsession(session);
@@ -393,16 +393,16 @@
do {
bOk = TRUE;
if (connect(ctx->ns[i].s, ctx->ns[i].sa->sa_buf, ctx->ns[i].sa->sa_len) < 0) {
- //fprintf(stderr, "DEBUG: connect failed: %s\n", strerror(errno));
+ /*fprintf(stderr, "DEBUG: connect failed: %s\n", strerror(errno)); */
bOk = FALSE;
}
if (bOk && ((ctx->ns[i].nntp = nntp_create(ctx->ns[i].s, ctx->ns[i].s,
ctx->option_tracing != TRUE ? NULL : &nntp_io)) == NULL)) {
- //fprintf(stderr, "DEBUG: nntp_create failed: %s\n", strerror(errno));
+ /*fprintf(stderr, "DEBUG: nntp_create failed: %s\n", strerror(errno)); */
bOk = FALSE;
}
if (bOk && ((rc = nntp_init(ctx->ns[i].nntp)) != NNTP_OK)) {
- //fprintf(stderr, "DEBUG: nntp_init failed: %s\n", nntp_error(rc));
+ /*fprintf(stderr, "DEBUG: nntp_init failed: %s\n", nntp_error(rc)); */
bOk = FALSE;
}
if (bOk)
@@ -425,7 +425,7 @@
if (ctx->nsc == 0) {
res.statuscode = "421";
res.dsncode = "4.4.1";
- res.statusmsg = "No connection to any NNTP Service."; //FIXME add error strings from above DEBUGs
+ res.statusmsg = "No connection to any NNTP Service."; /*FIXME add error strings from above DEBUGs */
lmtp_response(lmtp, &res);
return LMTP_OK;
}
@@ -584,7 +584,7 @@
}
if ((ctx->msg = msg_create()) == NULL) {
- res.statuscode = "503"; // FIXME
+ res.statuscode = "503"; /* FIXME */
res.dsncode = "5.5.0";
res.statusmsg = "Internal error - memory.";
lmtp_response(lmtp, &res);
@@ -592,7 +592,7 @@
}
if (!str_parse(req->msg, "m/^MAIL From:\\s*<(.+@.+)>$/i", &ctx->msg->mail_from)) {
- //FIXME ^^^^ is this space required/ valid? Sendmail skips them!
+ /*FIXME ^^^^ is this space required/ valid? Sendmail skips them! */
res.statuscode = "553";
res.dsncode = "5.5.4";
res.statusmsg = "Domain name required for sender address.";
@@ -623,7 +623,7 @@
}
if (!str_parse(req->msg, "m/^RCPT To:\\s*(.+)$/i", &cp)) {
- //FIXME ^^^^ is this space required/ valid? Sendmail skips them!
+ /*FIXME ^^^^ is this space required/ valid? Sendmail skips them! */
res.statuscode = "501";
res.dsncode = "5.5.2";
res.statusmsg = "Syntax error in parameters.";
@@ -647,7 +647,7 @@
*/
if (ctx->option_groupmode == GROUPMODE_ENVELOPE) {
- //fprintf(stderr, "DEBUG: before transform cp=***%s***\n", cp);
+ /*fprintf(stderr, "DEBUG: before transform cp=***%s***\n", cp); */
if (!str_parse(cp, "m/^<(.+)?@[^@]+>$/i", &group)) {
res.statuscode = "550";
res.dsncode = "5.1.1";
@@ -655,8 +655,8 @@
lmtp_response(lmtp, &res);
return LMTP_OK;
}
- //fprintf(stderr, "DEBUG: after transform group=***%s***\n", group);
- //FIXME do additional transform and checking
+ /*fprintf(stderr, "DEBUG: after transform group=***%s***\n", group); */
+ /*FIXME do additional transform and checking */
if (0) {
res.statuscode = "550";
res.dsncode = "5.1.1";
@@ -667,7 +667,7 @@
argz_add(&ctx->msg->azEnvgroups, &ctx->msg->asEnvgroups, group);
}
- //fprintf(stderr, "DEBUG: cp=***%s***\n", cp);
+ /*fprintf(stderr, "DEBUG: cp=***%s***\n", cp); */
argz_add(&ctx->msg->azRcpt, &ctx->msg->asRcpt, cp);
res.statuscode = "250";
res.dsncode = "2.1.5";
@@ -705,7 +705,7 @@
str_format(errorstring, sizeof(errorstring), "Overflow reading message: %s", lmtp_error(rc));
res.statuscode = "500";
res.dsncode = "5.0.0";
- res.statusmsg = errorstring; //FIXME temp or perm error?
+ res.statusmsg = errorstring; /*FIXME temp or perm error? */
rcpt = NULL;
while ((rcpt = argz_next(ctx->msg->azRcpt, ctx->msg->asRcpt, rcpt)) != NULL) {
lmtp_response(lmtp, &res);
@@ -737,7 +737,7 @@
return LMTP_OK;
}
- //fprintf(stderr, "DEBUG: before msg_split\n");
+ /*fprintf(stderr, "DEBUG: before msg_split\n"); */
if ((rc = msg_split(ctx->msg)) != MSG_OK) {
str_format(errorstring, sizeof(errorstring), "Error splitting message: %s", msg_error(rc));
res.statuscode = "500";
@@ -749,26 +749,26 @@
}
return LMTP_OK;
}
- //fprintf(stderr, "DEBUG: after msg_split\n");
+ /*fprintf(stderr, "DEBUG: after msg_split\n"); */
if (ctx->option_groupmode == GROUPMODE_ENVELOPE) {
- ctx->msg->azNewsgroups = memcpy(malloc(ctx->msg->asEnvgroups + 1), ctx->msg->azEnvgroups, ctx->msg->asEnvgroups); //FIXME strdup == NULL
+ ctx->msg->azNewsgroups = memcpy(malloc(ctx->msg->asEnvgroups + 1), ctx->msg->azEnvgroups, ctx->msg->asEnvgroups); /*FIXME strdup == NULL */
ctx->msg->asNewsgroups = ctx->msg->asEnvgroups;
}
else if (ctx->option_groupmode == GROUPMODE_ARG) {
- ctx->msg->azNewsgroups = memcpy(malloc(ctx->asGroupargs + 1), ctx->azGroupargs, ctx->asGroupargs); //FIXME strdup == NULL
+ ctx->msg->azNewsgroups = memcpy(malloc(ctx->asGroupargs + 1), ctx->azGroupargs, ctx->asGroupargs); /*FIXME strdup == NULL */
ctx->msg->asNewsgroups = ctx->asGroupargs;
}
/* else keep == GROUPMODE_HEADERS */
-#if 0 //FIXME debug paragraph
+#if 0 /*FIXME debug paragraph */
rcpt = NULL;
while ((rcpt = argz_next(ctx->msg->azNewsgroups, ctx->msg->asNewsgroups, rcpt)) != NULL) {
fprintf(stderr, "DEBUG: commited group ***%s***\n", rcpt);
}
#endif
- //fprintf(stderr, "DEBUG: before msg_join\n");
+ /*fprintf(stderr, "DEBUG: before msg_join\n"); */
if ((rc = msg_join(ctx->msg)) != MSG_OK) {
str_format(errorstring, sizeof(errorstring), "Error joining message: %s", msg_error(rc));
res.statuscode = "500";
@@ -780,11 +780,11 @@
}
return LMTP_OK;
}
- //fprintf(stderr, "DEBUG: after msg_join\n");
+ /*fprintf(stderr, "DEBUG: after msg_join\n"); */
bSuccess = NNTP_EOF; /* assume a hard error for the worst case */
for (i = 0; i < ctx->nsc; i++) {
- //fprintf(stderr, "DEBUG: trying service %s\n", ctx->ns[i].h);
+ /*fprintf(stderr, "DEBUG: trying service %s\n", ctx->ns[i].h); */
switch (ctx->option_deliverymode) {
case DELIVERYMODE_FAKE:
break;
@@ -806,7 +806,7 @@
)
bSuccess = NNTP_DEFER;
}
- //FIXME rc has only last error
+ /*FIXME rc has only last error */
/* RFC0821 4.2.1. REPLY CODES BY FUNCTION GROUPS
* "250 Requested mail action okay, completed"
|
