X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;ds=sidebyside;f=uip%2Fnew.c;h=a43a710fe6fc392d7ef6a6158add3356f96435a2;hb=8bf8e1e29df17658c3d77629e17f88bf9159e21b;hp=7c3191aa93c519dab359a98e8c97d9486632d76c;hpb=bd60514e13b4b1d4e2f726e6fc54da9eff6a263e;p=mmh

diff --git a/uip/new.c b/uip/new.c
index 7c3191a..a43a710 100644
--- a/uip/new.c
+++ b/uip/new.c
@@ -311,7 +311,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 *cp;
+	char buf[BUFSIZ];
 
 	if (cur == NULL || cur[0] == '\0') {
 		cur = "inbox";
@@ -383,14 +387,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 (cp=*sequences; *cp; cp++) {
+				argv[argc++] = cp;
+			}
+			argv[argc] = (char *)NULL;
+			execprog(*argv, argv);
 		} else {
 			if (node->n_field == NULL) {
 				continue;
@@ -435,9 +440,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 */