X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fnew.c;h=9774729ae5af15086712aadfb0a5389a1f6a6517;hp=de3c0be40c8e92c8ab00f53024df2d91af1adb6f;hb=10eff860a28b96582526eb739fd0a55441669938;hpb=32b2354dbaf4bf934936eb5b102a4a3d2fdd209a

diff --git a/uip/new.c b/uip/new.c
index de3c0be..9774729 100644
--- a/uip/new.c
+++ b/uip/new.c
@@ -10,25 +10,26 @@
 ** Inspired by Luke Mewburn's new: http://www.mewburn.net/luke/src/new
 */
 
+#include <h/mh.h>
+#include <h/crawl_folders.h>
+#include <h/utils.h>
 #include <sys/types.h>
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-
-#include <h/mh.h>
-#include <h/crawl_folders.h>
-#include <h/utils.h>
+#include <unistd.h>
+#include <locale.h>
+#include <sysexits.h>
 
 static struct swit switches[] = {
 #define MODESW 0
-	{ "mode", 1 },
+	{ "mode", 0 },
 #define FOLDERSSW 1
-	{ "folders", 1 },
+	{ "folders", 0 },
 #define VERSIONSW 2
-	{ "Version", 1 },
+	{ "Version", 0 },
 #define HELPSW 3
-	{ "help", 1 },
+	{ "help", 0 },
 	{ NULL, 0 }
 };
 
@@ -112,7 +113,6 @@ get_msgnums(char *folder, char *sequences[])
 				fp)) {
 		case FLD:
 		case FLDPLUS:
-		case FLDEOF:
 			if (state == FLDPLUS) {
 				cp = getcpy(field);
 				while (state == FLDPLUS) {
@@ -154,13 +154,10 @@ get_msgnums(char *folder, char *sequences[])
 				}
 			}
 
-			if (state == FLDEOF)
-				break;
 			continue;
 
 		case BODY:
-		case BODYEOF:
-			adios(NULL, "no blank lines are permitted in %s",
+			adios(EX_DATAERR, NULL, "no blank lines are permitted in %s",
 					seqfile);
 			/* fall */
 
@@ -168,7 +165,7 @@ get_msgnums(char *folder, char *sequences[])
 			break;
 
 		default:
-			adios(NULL, "%s is poorly formatted", seqfile);
+			adios(EX_SOFTWARE, NULL, "%s is poorly formatted", seqfile);
 		}
 		break;  /* break from for loop */
 	}
@@ -190,9 +187,9 @@ check_folder(char *folder, size_t len, struct list_state *b)
 
 	if (is_cur || msgnums != NULL) {
 		if (*b->first == NULL) {
-			*b->first = b->node = mh_xmalloc(sizeof(*b->node));
+			*b->first = b->node = mh_xcalloc(1, sizeof(*b->node));
 		} else {
-			b->node->n_next = mh_xmalloc(sizeof(*b->node));
+			b->node->n_next = mh_xcalloc(1, sizeof(*b->node));
 			b->node = b->node->n_next;
 		}
 		b->node->n_name = folder;
@@ -256,7 +253,7 @@ check_folders(struct node **first, struct node **last,
 	} else {
 		fp = fopen(folders, "r");
 		if (fp  == NULL) {
-			adios(NULL, "failed to read %s", folders);
+			adios(EX_IOERR, NULL, "failed to read %s", folders);
 		}
 		while (vfgets(fp, &line) == OK) {
 			len = strlen(line) - 1;
@@ -283,7 +280,7 @@ join_sequences(char *sequences[])
 	for (i = 0; sequences[i] != NULL; i++) {
 		len += strlen(sequences[i]) + 1;
 	}
-	result = mh_xmalloc(len + 1);
+	result = mh_xcalloc(len + 1, sizeof(char));
 
 	for (i = 0, cp = result; sequences[i] != NULL; i++, cp += len + 1) {
 		len = strlen(sequences[i]);
@@ -311,7 +308,11 @@ doit(char *cur, char *folders, char *sequences[])
 	struct node *first, *cur_node, *node, *last = NULL, *prev;
 	size_t folder_len;
 	int count, total = 0;
-	char *command = NULL, *sequences_s = NULL;
+	char *sequences_s = NULL;
+	int argc = 0;
+	char *argv[MAXARGS];
+	char **seqp;
+	char buf[BUFSIZ];
 
 	if (cur == NULL || cur[0] == '\0') {
 		cur = "inbox";
@@ -383,14 +384,15 @@ doit(char *cur, char *folders, char *sequences[])
 			}
 			fflush(stdout);
 
-			/*
-			** TODO: Split enough of scan.c out so that we can
-			** call it here.
-			*/
-			command = concat("scan +", node->n_name, " ",
-					sequences_s, (void *)NULL);
-			system(command);
-			free(command);
+			argc = 0;
+			argv[argc++] = "scan";
+			snprintf(buf, sizeof buf, "+%s", node->n_name);
+			argv[argc++] = buf;
+			for (seqp=sequences; *seqp; seqp++) {
+				argv[argc++] = *seqp;
+			}
+			argv[argc] = (char *)NULL;
+			execprog(*argv, argv);
 		} else {
 			if (node->n_field == NULL) {
 				continue;
@@ -435,9 +437,7 @@ main(int argc, char **argv)
 	sequences[0] = NULL;
 	sequences[1] = NULL;
 
-#ifdef LOCALE
 	setlocale(LC_ALL, "");
-#endif
 	invo_name = mhbasename(argv[0]);
 
 	/* read user profile/context */
@@ -454,28 +454,28 @@ main(int argc, char **argv)
 			switch (smatch(++cp, switches)) {
 			case AMBIGSW:
 				ambigsw(cp, switches);
-				done(1);
+				exit(EX_USAGE);
 			case UNKWNSW:
-				adios(NULL, "-%s unknown", cp);
+				adios(EX_USAGE, NULL, "-%s unknown", cp);
 
 			case HELPSW:
 				snprintf(help, sizeof(help),
 						"%s [switches] [sequences]",
 						invo_name);
 				print_help(help, switches, 1);
-				done(1);
+				exit(argc == 2 ? EX_OK : EX_USAGE);
 			case VERSIONSW:
 				print_version(invo_name);
-				done(1);
+				exit(argc == 2 ? EX_OK : EX_USAGE);
 
 			case FOLDERSSW:
 				if (!(folders = *argp++) || *folders == '-')
-					adios(NULL, "missing argument to %s",
+					adios(EX_USAGE, NULL, "missing argument to %s",
 							argp[-2]);
 				continue;
 			case MODESW:
 				if (!(invo_name = *argp++) || *invo_name == '-')
-					adios(NULL, "missing argument to %s",
+					adios(EX_USAGE, NULL, "missing argument to %s",
 							argp[-2]);
 				invo_name = mhbasename(invo_name);
 				continue;
@@ -509,7 +509,7 @@ main(int argc, char **argv)
 		/* no sequence arguments; use unseen */
 		if ((unseen = context_find(usequence))) {
 			if (!*unseen) {
-				adios(NULL, "profile entry %s set, but empty, and no sequences given", usequence);
+				adios(EX_CONFIG, NULL, "profile entry %s set, but empty, and no sequences given", usequence);
 			}
 		} else {
 			unseen = seq_unseen;  /* use default */
@@ -523,7 +523,7 @@ main(int argc, char **argv)
 
 	folder = doit(context_find(curfolder), folders, sequences);
 	if (folder == NULL) {
-		done(0);
+		exit(EX_OK);
 		return 1;
 	}
 
@@ -547,6 +547,5 @@ main(int argc, char **argv)
 
 	context_save();
 
-	done(0);
-	return 1;
+	return 0;
 }