X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fcomp.c;h=ce76cd856d8bac8789968d07c67fb2f0dd959d71;hp=b39b6e7d04f6b654796f93e28377971d0e116107;hb=2d48b455c303a807041c35e4248955f8bec59eeb;hpb=ced6090a330d3d83d0bce709f756aa3d7d65fea4

diff --git a/uip/comp.c b/uip/comp.c
index b39b6e7..ce76cd8 100644
--- a/uip/comp.c
+++ b/uip/comp.c
@@ -32,214 +32,153 @@ static struct swit switches[] = {
 	{ NULL, 0 }
 };
 
-static struct swit aqrunl[] = {
-#define NOSW  0
-	{ "quit", 0 },
-#define YESW  1
-	{ "replace", 0 },
-#define USELSW  2
-	{ "use", 0 },
-#define LISTDSW  3
-	{ "list", 0 },
-#define REFILSW  4
-	{ "refile +folder", 0 },
-#define NEWSW  5
-	{ "new", 0 },
-	{ NULL, 0 }
-};
-
 
 int
-main (int argc, char **argv)
+main(int argc, char **argv)
 {
 	int use = NOUSE, nedit = 0, nwhat = 0;
-	int i, in, out;
+	int in, out;
 	char *cp, *cwd, *maildir;
 	char *ed = NULL, *form = NULL;
 	char *folder = NULL, *msg = NULL, buf[BUFSIZ];
 	char drft[BUFSIZ], **argp, **arguments;
 	struct msgs *mp = NULL;
-	struct stat st;
 
 #ifdef LOCALE
 	setlocale(LC_ALL, "");
 #endif
-	invo_name = r1bindex (argv[0], '/');
+	invo_name = mhbasename(argv[0]);
 
 	/* read user profile/context */
 	context_read();
 
-	arguments = getarguments (invo_name, argc, argv, 1);
+	arguments = getarguments(invo_name, argc, argv, 1);
 	argp = arguments;
 
 	while ((cp = *argp++)) {
 		if (*cp == '-') {
-			switch (smatch (++cp, switches)) {
-				case AMBIGSW:
-					ambigsw (cp, switches);
-					done (1);
-				case UNKWNSW:
-					adios (NULL, "-%s unknown", cp);
-
-				case HELPSW:
-					snprintf (buf, sizeof(buf), "%s [+folder] [msg] [switches]",
-						invo_name);
-					print_help (buf, switches, 1);
-					done (1);
-				case VERSIONSW:
-					print_version(invo_name);
-					done (1);
-
-				case EDITRSW:
-					if (!(ed = *argp++) || *ed == '-')
-						adios (NULL, "missing argument to %s", argp[-2]);
-					nedit = 0;
-					continue;
-				case NEDITSW:
-					nedit++;
-					continue;
-
-				case WHATSW:
-					if (!(whatnowproc = *argp++) || *whatnowproc == '-')
-						adios (NULL, "missing argument to %s", argp[-2]);
-					nwhat = 0;
-					continue;
-				case NWHATSW:
-					nwhat++;
-					continue;
-
-				case FORMSW:
-					if (!(form = *argp++) || *form == '-')
-						adios (NULL, "missing argument to %s", argp[-2]);
-					continue;
-
-				case USESW:
-					use++;
-					continue;
-				case NUSESW:
-					use = NOUSE;
-					continue;
+			switch (smatch(++cp, switches)) {
+			case AMBIGSW:
+				ambigsw(cp, switches);
+				done(1);
+			case UNKWNSW:
+				adios(NULL, "-%s unknown", cp);
+
+			case HELPSW:
+				snprintf(buf, sizeof(buf), "%s [+folder] [msg] [switches]", invo_name);
+				print_help(buf, switches, 1);
+				done(1);
+			case VERSIONSW:
+				print_version(invo_name);
+				done(1);
+
+			case EDITRSW:
+				if (!(ed = *argp++) || *ed == '-')
+					adios(NULL, "missing argument to %s", argp[-2]);
+				nedit = 0;
+				continue;
+			case NEDITSW:
+				nedit++;
+				continue;
+
+			case WHATSW:
+				if (!(whatnowproc = *argp++) || *whatnowproc == '-')
+					adios(NULL, "missing argument to %s", argp[-2]);
+				nwhat = 0;
+				continue;
+			case NWHATSW:
+				nwhat++;
+				continue;
+
+			case FORMSW:
+				if (!(form = *argp++) || *form == '-')
+					adios(NULL, "missing argument to %s", argp[-2]);
+				continue;
+
+			case USESW:
+				use++;
+				continue;
+			case NUSESW:
+				use = NOUSE;
+				continue;
 			}
 		}
 		if (*cp == '+' || *cp == '@') {
 			if (folder)
-				adios (NULL, "only one folder at a time!");
+				adios(NULL, "only one folder at a time!");
 			else
-				folder = pluspath (cp);
+				folder = getcpy(expandfol(cp));
 		} else {
 			if (msg)
-				adios (NULL, "only one message at a time!");
+				adios(NULL, "only one message at a time!");
 			else
 				msg = cp;
 		}
 	}
 
-	cwd = getcpy (pwd ());
-
-	if (!context_find ("path"))
-		free (path ("./", TFOLDER));
+	cwd = getcpy(pwd());
 
 	if (form && (folder || msg))
-			adios (NULL, "can't mix forms and folders/msgs");
+		adios(NULL, "can't mix forms and folders/msgs");
 
-	if (!use && (folder || msg)) {
-		/*
-		** Take a message as the "form" for the new message.
-		*/
-		if (!msg)
-			msg = "cur";
-		if (!folder)
-			folder = getfolder (1);
-		maildir = m_maildir (folder);
+	if (use && folder)
+		adios(NULL, "can't mix -use and +folder");
 
-		if (chdir (maildir) == NOTOK)
-			adios (maildir, "unable to change directory to");
+	if (use) {
+		/* Don't copy; the draft shall get removed in the end. */
+		strncpy(drft, m_draft(msg ? msg : seq_cur), sizeof(drft));
 
+	} else if (folder || msg) {
+		/* Take a message as the "form" for the new message. */
+		if (!msg)
+			msg = seq_cur;
+		if (!folder)
+			folder = getcurfol();
+		maildir = toabsdir(folder);
+		if (chdir(maildir) == NOTOK)
+			adios(maildir, "unable to change directory to");
 		/* read folder and create message structure */
-		if (!(mp = folder_read (folder)))
-			adios (NULL, "unable to read folder %s", folder);
-
+		if (!(mp = folder_read(folder)))
+			adios(NULL, "unable to read folder %s", folder);
 		/* check for empty folder */
 		if (mp->nummsg == 0)
-			adios (NULL, "no messages in %s", folder);
-
+			adios(NULL, "no messages in %s", folder);
 		/* parse the message range/sequence/name and set SELECTED */
-		if (!m_convert (mp, msg))
-			done (1);
-		seq_setprev (mp);  /* set the previous-sequence */
-
+		if (!m_convert(mp, msg))
+			done(1);
+		seq_setprev(mp);  /* set the previous-sequence */
 		if (mp->numsel > 1)
-			adios (NULL, "only one message at a time!");
-
-		if ((in = open (form = getcpy (m_name (mp->lowsel)),
+			adios(NULL, "only one message at a time!");
+		if ((in = open(form = getcpy(m_name(mp->lowsel)),
 				O_RDONLY)) == NOTOK)
-			adios (form, "unable to open message");
-	} else
+			adios(form, "unable to open message");
+
+		strncpy(drft, m_draft(seq_beyond), sizeof(drft));
+		if ((out = creat(drft, m_gmprot())) == NOTOK) {
+			adios(drft, "unable to create");
+		}
+		cpydata(in, out, form, drft);
+		close(in);
+		close(out);
+
+	} else {
 		in = open_form(&form, components);
 
-try_it_again:
-	strncpy (drft, m_draft(use ? (msg?msg:"cur") : "new"), sizeof(drft));
-
-	/*
-	** Check if we have an existing draft
-	*/
-	if ((out = open (drft, O_RDONLY)) != NOTOK) {
-		i = fdcompare (in, out);
-		close (out);
-
-		/*
-		** If we have given -use flag, or if the
-		** draft is just the same as the components
-		** file, then no need to ask any questions.
-		*/
-		if (use || i)
-			goto edit_it;
-
-		if (stat (drft, &st) == NOTOK)
-			adios (drft, "unable to stat");
-		printf ("Draft \"%s\" exists (%ld bytes).", drft, (long) st.st_size);
-		for (i = LISTDSW; i != YESW;) {
-			if (!(argp = getans ("\nDisposition? ", aqrunl)))
-				done (1);
-			switch (i = smatch (*argp, aqrunl)) {
-				case NOSW:
-					done (0);
-				case NEWSW:
-					use = NOUSE;
-					goto try_it_again;
-				case YESW:
-					break;
-				case USELSW:
-					use++;
-					goto edit_it;
-				case LISTDSW:
-					showfile (++argp, drft);
-					break;
-				case REFILSW:
-					if (refile (++argp, drft) == 0)
-						i = YESW;
-					break;
-				default:
-					advise (NULL, "say what?");
-					break;
-			}
+		strncpy(drft, m_draft(seq_beyond), sizeof(drft));
+		if ((out = creat(drft, m_gmprot())) == NOTOK) {
+			adios(drft, "unable to create");
 		}
-	} else if (use) {
-		adios (drft, "unable to open");
+		cpydata(in, out, form, drft);
+		close(in);
+		close(out);
 	}
 
-	if ((out = creat (drft, m_gmprot ())) == NOTOK)
-		adios (drft, "unable to create");
-	cpydata (in, out, form, drft);
-	close (in);
-	close (out);
+	context_save();
 
-edit_it:
-	context_save ();  /* save the context file */
-
-	if (nwhat)
-		done (0);
-	what_now (ed, nedit, use, drft, NULL, 0, NULLMP, NULL, 0, cwd);
-	done (1);
+	if (nwhat) {
+		done(0);
+	}
+	what_now(ed, nedit, use, drft, NULL, 0, NULLMP, NULL, cwd);
+	done(1);
 	return 1;
 }