Mercurial > masqmail

changeset 110:c678d0342451

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changed name ACC_NODOT_TERM to ACC_DOT_IGNORE for better understanding this is only a cosmetic change
author meillo@marmaro.de
date Tue, 29 Jun 2010 11:40:37 +0200 (2010-06-29)
parents db52c64acaa2
children 43798acdfbc9
files src/accept.c src/masqmail.c src/masqmail.h src/smtpsend.c
diffstat 4 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/accept.c	Tue Jun 29 11:34:53 2010 +0200
+++ b/src/accept.c	Tue Jun 29 11:40:37 2010 +0200
@@ -83,7 +83,7 @@
 
 		line1 = line;
 
-		if ((line[0] == '.') && (!(flags & ACC_NODOT_TERM))) {
+		if ((line[0] == '.') && (!(flags & ACC_DOT_IGNORE))) {
 			if (line[1] == '\n') {
 				g_free(line);
 				break;
@@ -92,7 +92,7 @@
 		}
 
 		if (len <= 0) {
-			if ((len == -1) && ((flags & ACC_NODOT_TERM) || (flags & ACC_NODOT_RELAX))) {
+			if ((len == -1) && ((flags & ACC_DOT_IGNORE) || (flags & ACC_NODOT_RELAX))) {
 				/* we got an EOF, and the last line was not terminated by a CR */
 				gint len1 = strlen(line1);
 				if (len1 > 0) {  /* == 0 is 'normal' (EOF after a CR) */
--- a/src/masqmail.c	Tue Jun 29 11:34:53 2010 +0200
+++ b/src/masqmail.c	Tue Jun 29 11:40:37 2010 +0200
@@ -814,7 +814,7 @@
 	case MODE_ACCEPT:
 		{
 			guint accept_flags = (opt_t ? ACC_DEL_RCPTS | ACC_RCPT_FROM_HEAD : 0)
-			                     | (opt_i ? ACC_NODOT_TERM : ACC_NODOT_RELAX);
+			                     | (opt_i ? ACC_DOT_IGNORE : ACC_NODOT_RELAX);
 			mode_accept(return_path, full_sender_name, accept_flags, &(argv[arg]), argc - arg);
 			exit(exit_failure ? EXIT_FAILURE : EXIT_SUCCESS);
 		}
--- a/src/masqmail.h	Tue Jun 29 11:34:53 2010 +0200
+++ b/src/masqmail.h	Tue Jun 29 11:40:37 2010 +0200
@@ -310,7 +310,7 @@
 /* flags for accept() */
 #define ACC_DEL_RCPTS      0x02  /* -t option, delete rcpts that were given as cmd args */
 #define ACC_RCPT_FROM_HEAD 0x08  /* -t option, get rcpts from headers */
-#define ACC_NODOT_TERM     0x10  /* a dot on a line itself does not end the message (-oi option) */
+#define ACC_DOT_IGNORE     0x10  /* a dot on a line itself does not end the message (-oi option) */
 #define ACC_MAIL_FROM_HEAD 0x40  /* get return path from header */
 #define ACC_NODOT_RELAX    0x80  /* do not be picky if message ist not terminated by a dot on a line */
 #define ACC_SAVE_ENVELOPE_TO 0x0100  /* save an existent Envelope-to header as X-Orig-Envelope-to */
--- a/src/smtpsend.c	Tue Jun 29 11:34:53 2010 +0200
+++ b/src/smtpsend.c	Tue Jun 29 11:40:37 2010 +0200
@@ -99,7 +99,7 @@
 			msg->rcpt_list = g_list_append(msg->rcpt_list, create_address_qualified(argv[optind++], TRUE, conf.host_name));
 		}
 
-		if ((ret = accept_message(stdin, msg, ACC_NODOT_TERM)) == AERR_OK) {
+		if ((ret = accept_message(stdin, msg, ACC_DOT_IGNORE)) == AERR_OK) {
 			if ((ret = smtp_deliver(server_name, server_port, resolve_list, msg, NULL, NULL)) == smtp_ok) {
 				exit(EXIT_SUCCESS);
 			}