X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fsend.c;h=d7691db99a332a57c9ddc6322303cc6371b7bd91;hp=41ef92a5823ef89769ba5654f6ab9ca38f404243;hb=6e9577f324bef90765a5edc02044eb111ec48072;hpb=2abb9a7cfb0930e27062088734d306e7d78e4cc2

diff --git a/uip/send.c b/uip/send.c
index 41ef92a..d7691db 100644
--- a/uip/send.c
+++ b/uip/send.c
@@ -73,6 +73,7 @@ static struct swit switches[] = {
 	{ NULL, 0 }
 };
 
+char *version=VERSION;
 
 int
 main(int argc, char **argv)
@@ -81,7 +82,7 @@ main(int argc, char **argv)
 	int msgnum, status;
 	int in, out;
 	int n;
-	char *cp, *maildir = NULL;
+	char *cp, *maildir = NULL, *folder = NULL;
 	char buf[BUFSIZ], **argp, **arguments;
 	char *msgs[MAXARGS], *vec[MAXARGS];
 	char *files[MAXARGS];
@@ -103,19 +104,19 @@ main(int argc, char **argv)
 			switch (smatch(++cp, switches)) {
 			case AMBIGSW:
 				ambigsw(cp, switches);
-				exit(1);
+				exit(EX_USAGE);
 			case UNKWNSW:
-				adios(NULL, "-%s unknown\n", cp);
+				adios(EX_USAGE, NULL, "-%s unknown\n", cp);
 
 			case HELPSW:
 				snprintf(buf, sizeof(buf),
 						"%s [file] [switches]",
 						invo_name);
 				print_help(buf, switches, 1);
-				exit(0);
+				exit(argc == 2 ? EX_OK : EX_USAGE);
 			case VERSIONSW:
 				print_version(invo_name);
-				exit(0);
+				exit(argc == 2 ? EX_OK : EX_USAGE);
 
 			case DEBUGSW:
 				debugsw++;
@@ -125,6 +126,12 @@ main(int argc, char **argv)
 				vec[vecp++] = --cp;
 				continue;
 			}
+		} else if (*cp == '+' || *cp == '@') {
+			if (folder) {
+				adios(EX_USAGE, NULL, "only one folder at a time!");
+			} else {
+				folder = mh_xstrdup(expandfol(cp));
+			}
 		} else {
 			if (*cp == '/') {
 				files[nfiles++] = cp;
@@ -139,22 +146,23 @@ main(int argc, char **argv)
 	}
 
 	if (nmsgs) {
-		maildir = toabsdir(draftfolder);
+		folder = folder ? folder : draftfolder;
+		maildir = toabsdir(folder);
 		if (chdir(maildir) == NOTOK) {
-			adios(maildir, "unable to change directory to");
+			adios(EX_OSERR, maildir, "unable to change directory to");
 		}
-		if (!(mp = folder_read(draftfolder))) {
-			adios(NULL, "unable to read draft folder %s",
-					draftfolder);
+		if (!(mp = folder_read(folder))) {
+			adios(EX_IOERR, NULL, "unable to read folder %s",
+					folder);
 		}
 		if (mp->nummsg == 0) {
-			adios(NULL, "no messages in draft folder %s",
-					draftfolder);
+			adios(EX_DATAERR, NULL, "no messages in folder %s",
+					folder);
 		}
 		/* parse all the msgranges/sequences and set SELECTED */
 		for (msgnum = 0; msgnum < nmsgs; msgnum++) {
 			if (!m_convert(mp, msgs[msgnum])) {
-				exit(1);
+				exit(EX_USAGE);
 			}
 		}
 		seq_setprev(mp);
@@ -162,7 +170,7 @@ main(int argc, char **argv)
 		for (nmsgs = 0, msgnum = mp->lowsel;
 				msgnum <= mp->hghsel; msgnum++) {
 			if (is_selected(mp, msgnum)) {
-				files[nfiles++] = getcpy(m_name(msgnum));
+				files[nfiles++] = mh_xstrdup(m_name(msgnum));
 				unset_exists(mp, msgnum);
 			}
 		}
@@ -179,7 +187,7 @@ main(int argc, char **argv)
 
 	for (n = 0; n < nfiles; n++) {
 		if (stat(files[n], &st) == NOTOK) {
-			adios(files[n], "unable to stat draft file");
+			adios(EX_IOERR, files[n], "unable to stat draft file");
 		}
 	}
 
@@ -193,12 +201,12 @@ main(int argc, char **argv)
 	if ((cp = getenv("mhdist")) && *cp && (distsw = atoi(cp)) && altmsg) {
 		vec[vecp++] = "-dist";
 		if ((in = open(altmsg, O_RDONLY)) == NOTOK) {
-			adios(altmsg, "unable to open for reading");
+			adios(EX_IOERR, altmsg, "unable to open for reading");
 		}
 		fstat(in, &st2);
-		distfile = getcpy(m_mktemp2(NULL, invo_name, NULL, NULL));
+		distfile = mh_xstrdup(m_mktemp2(NULL, invo_name, NULL, NULL));
 		if ((out = creat(distfile, (int)st2.st_mode & 0777))==NOTOK) {
-			adios(distfile, "unable to open for writing");
+			adios(EX_IOERR, distfile, "unable to open for writing");
 		}
 		cpydata(in, out, altmsg, distfile);
 		close(in);
@@ -261,6 +269,7 @@ sendsbr(char **vec, int vecp, char *drft, struct stat *st)
 	*/
 	switch (attach(drft)) {
 	case OK:
+		/* successfully MIMEified: use generate draft */
 		drft = composition_file_name;
 		break;
 
@@ -268,6 +277,7 @@ sendsbr(char **vec, int vecp, char *drft, struct stat *st)
 		return (NOTOK);
 
 	case DONE:
+		/* already in MIME format: keep original draft */
 		break;
 	}
 
@@ -324,60 +334,22 @@ attach(char *draft_file_name)
 {
 	char buf[MAXPATHLEN + 6];
 	int c;
-	int has_attachment;
-	int has_body;
-	int non_ascii; /* msg body contains non-ASCII chars */
-	int length;  /* length of attachment header field name */
+	int length = strlen(attach_hdr);
 	char *p;
 
-	if (!(draft_file = fopen(draft_file_name, "r"))) {
-		adios(NULL, "can't open draft file `%s'.", draft_file_name);
-	}
-
-	/* We'll grow the buffer as needed. */
-	field = (char *)mh_xmalloc(field_size = 256);
-
-	/*
-	** Scan the draft file for an attachment header field name.
-	*/
-	length = strlen(attach_hdr);
-	has_attachment = 0;
-	while (get_line() != EOF && *field != '\0' && *field != '-') {
-		if (strncasecmp(field, attach_hdr, length)==0 &&
-				field[length] == ':') {
-			has_attachment = 1;
-		}
+	if(distfile) {
+		return DONE;
 	}
 
-	/*
-	** Look for at least one non-blank line in the body of the
-	** message which indicates content in the body.
-	** Check if body contains at least one non-blank (= not empty)
-	** and if it contains any non-ASCII chars (= need MIME).
-	*/
-	has_body = 0;
-	non_ascii = 0;
-	while (get_line() != EOF) {
-		for (p = field; *p != '\0'; p++) {
-			if (*p != ' ' && *p != '\t') {
-				has_body = 1;
-			}
-			if (*p > 127 || *p < 0) {
-				non_ascii = 1;
-			}
-		}
-		if (has_body && non_ascii) {
-			break;  /* that's been already enough information */
-		}
+	if (!(draft_file = fopen(draft_file_name, "r"))) {
+		adios(EX_IOERR, NULL, "can't open draft file `%s'.", draft_file_name);
 	}
 
-	if (!has_attachment && non_ascii==0) {
-		/* We don't need to convert it to MIME. */
-		return DONE;
-	}
+	/* We'll grow the buffer as needed. */
+	field = mh_xcalloc(field_size = 256, sizeof(char));
 
 	/*
-	** Else: mimify
+	** MIMEify
 	*/
 
 	/* Make names for the temporary files.  */
@@ -388,19 +360,27 @@ attach(char *draft_file_name)
 			m_mktemp(toabsdir(invo_name), NULL, NULL),
 			sizeof (composition_file_name));
 
-	if (has_body) {
-		body_file = fopen(body_file_name, "w");
-	}
+	body_file = fopen(body_file_name, "w");
 	composition_file = fopen(composition_file_name, "w");
 
-	if ((has_body && !body_file) || !composition_file) {
+	if (!body_file || !composition_file) {
 		clean_up_temporary_files();
-		adios(NULL, "unable to open all of the temporary files.");
+		adios(EX_IOERR, NULL, "unable to open all of the temporary files.");
 	}
 
 	/* Copy non-attachment header fields to the temp composition file. */
 	rewind(draft_file);
 	while (get_line() != EOF && *field && *field != '-') {
+		if (strncasecmp(field, VRSN_FIELD, strlen(VRSN_FIELD))==0 &&
+				field[strlen(VRSN_FIELD)] == ':') {
+			/*
+			** The draft is already in MIME format, thus
+			** back out and use the original draft file.
+			*/
+			clean_up_temporary_files();
+			return DONE;
+		}
+
 		if (strncasecmp(field, attach_hdr, length) != 0 ||
 				field[length] != ':') {
 			fprintf(composition_file, "%s\n", field);
@@ -408,17 +388,15 @@ attach(char *draft_file_name)
 	}
 	fputs("--------\n", composition_file);
 
-	if (has_body) {
-		/* Copy the message body to the temporary file. */
-		while ((c = getc(draft_file)) != EOF) {
-			putc(c, body_file);
-		}
-		fclose(body_file);
-
-		/* Add a mhbuild MIME composition file line for the body */
-		/* charset will be discovered/guessed by mhbuild */
-		fprintf(composition_file, "#text/plain %s\n", body_file_name);
+	/* Copy the message body to the temporary file. */
+	while ((c = getc(draft_file)) != EOF) {
+		putc(c, body_file);
 	}
+	fclose(body_file);
+
+	/* Add a mhbuild MIME composition file line for the body */
+	/* charset will be discovered/guessed by mhbuild */
+	fprintf(composition_file, "#text/plain %s\n", body_file_name);
 
 	/*
 	** Now, go back to the beginning of the draft file and look for
@@ -465,12 +443,16 @@ signandenc(char *draft_file_name)
 	int doenc = 0;
 	int ret;
 
+	if(distfile) {
+		return DONE;
+	}
+
 	if (!(draft_file = fopen(draft_file_name, "r"))) {
-		adios(NULL, "can't open draft file `%s'.", draft_file_name);
+		adios(EX_IOERR, NULL, "can't open draft file `%s'.", draft_file_name);
 	}
 
 	/* We'll grow the buffer as needed. */
-	field = (char *)mh_xmalloc(field_size = 256);
+	field = mh_xcalloc(field_size = 256, sizeof(char));
 
 	/* Scan the draft file for an attachment header field name. */
 	while (get_line() != EOF && *field != '\0' && *field != '-') {
@@ -539,7 +521,7 @@ get_line(void)
 			break;
 		}
 		if (++n >= field_size - 1) {
-			field = (char *)mh_xrealloc(field, field_size += 256);
+			field = mh_xrealloc(field, field_size += 256);
 			p = field + n - 1;
 		}
 	}
@@ -569,7 +551,7 @@ make_mime_composition_file_entry(char *file_name)
 
 	if (!(fp = popen(cmdbuf, "r"))) {
 		clean_up_temporary_files();
-		adios(NULL, "unable to determine content type with `%s'",
+		adios(EX_IOERR, NULL, "unable to determine content type with `%s'",
 				cmdbuf);
 	}
 	if (fgets(content_type, sizeof content_type, fp) &&
@@ -585,14 +567,14 @@ make_mime_composition_file_entry(char *file_name)
 	/* TODO: don't use access(2) because it checks for ruid, not euid */
 	if (access(file_name, R_OK) != 0) {
 		clean_up_temporary_files();
-		adios(NULL, "unable to access file `%s'", file_name);
+		adios(EX_IOERR, NULL, "unable to access file `%s'", file_name);
 	}
 
 	/* Check for broken file(1). See man page mh-profile(5). */
 	for (cp=content_type; *cp; cp++) {
 		if (isspace(*cp)) {
 			if (!semicolon) {
-				adios(NULL, "Sorry, your Mime-Type-Query command (%s) is broken.\n\tThe output misses a semicolon before the whitespace.\n\tOutput was: %s", cmd, content_type);
+				adios(EX_SOFTWARE, NULL, "Sorry, your Mime-Type-Query command (%s) is broken.\n\tThe output misses a semicolon before the whitespace.\n\tOutput was: %s", cmd, content_type);
 			}
 		} else if (*cp == ';') {
 			semicolon = 1;
@@ -637,7 +619,7 @@ sendaux(char **vec, int vecp, char *drft, struct stat *st)
 		execvp(*vec, vec);
 		fprintf(stderr, "unable to exec ");
 		perror(*vec);
-		_exit(-1);
+		_exit(EX_OSERR);
 		break;  /* NOT REACHED */
 
 	default:
@@ -660,7 +642,6 @@ sendaux(char **vec, int vecp, char *drft, struct stat *st)
 		}
 	}
 
-
 	return status ? NOTOK : status;
 }