X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fdist.c;h=869a906ba6137f0547c85f4b3aac03746f56e08c;hp=131cda9428371858889a77898b771a9cff10bbac;hb=43ea5347b6b445d926082d6e3c1ddec376e8692d;hpb=097c84b61603c4a4c5837f3dcc09c30a1e751702

diff --git a/uip/dist.c b/uip/dist.c
index 131cda9..869a906 100644
--- a/uip/dist.c
+++ b/uip/dist.c
@@ -21,19 +21,15 @@ static struct swit switches[] = {
 	{ "noedit", 0 },
 #define FORMSW  4
 	{ "form formfile", 0 },
-#define INPLSW  5
-	{ "inplace", 0 },
-#define NINPLSW  6
-	{ "noinplace", 0 },
-#define WHATSW  7
+#define WHATSW  5
 	{ "whatnowproc program", 0 },
-#define NWHATSW  8
+#define NWHATSW  6
 	{ "nowhatnowproc", 0 },
-#define VERSIONSW  9
+#define VERSIONSW  7
 	{ "version", 0 },
-#define HELPSW  10
+#define HELPSW  8
 	{ "help", 0 },
-#define FILESW  11
+#define FILESW  9
 	{ "file file", -4 },  /* interface from msh */
 	{ NULL, 0 }
 };
@@ -42,13 +38,14 @@ static struct swit switches[] = {
 int
 main(int argc, char **argv)
 {
-	int anot = 0, inplace = 1, nedit = 0;
+	int anot = 0, nedit = 0;
 	int nwhat = 0, in, out;
 	char *cp, *cwd, *maildir, *msgnam;
 	char *ed = NULL, *file = NULL, *folder = NULL;
 	char *form = NULL, *msg = NULL, buf[BUFSIZ], drft[BUFSIZ];
 	char **argp, **arguments;
 	struct msgs *mp = NULL;
+	char *fmtstr;
 
 #ifdef LOCALE
 	setlocale(LC_ALL, "");
@@ -64,70 +61,67 @@ main(int argc, char **argv)
 	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 ANNOSW:
-					anot++;
-					continue;
-				case NANNOSW:
-					anot = 0;
-					continue;
-
-				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 FILESW:
-					if (file)
-						adios(NULL, "only one file at a time!");
-					if (!(cp = *argp++) || *cp == '-')
-						adios(NULL, "missing argument to %s", argp[-2]);
-					file = path(cp, TFILE);
-					continue;
-				case FORMSW:
-					if (!(form = *argp++) || *form == '-')
-						adios(NULL, "missing argument to %s", argp[-2]);
-					continue;
-
-				case INPLSW:
-					inplace++;
-					continue;
-				case NINPLSW:
-					inplace = 0;
-					continue;
+			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 ANNOSW:
+				anot++;
+				continue;
+			case NANNOSW:
+				anot = 0;
+				continue;
+
+			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 FILESW:
+				if (file)
+					adios(NULL, "only one file at a time!");
+				if (!(cp = *argp++) || *cp == '-')
+					adios(NULL, "missing argument to %s",
+							argp[-2]);
+				file = getcpy(expanddir(cp));
+				continue;
+			case FORMSW:
+				if (!(form = *argp++) || *form == '-')
+					adios(NULL, "missing argument to %s",
+							argp[-2]);
+				continue;
 			}
 		}
 		if (*cp == '+' || *cp == '@') {
 			if (folder)
 				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!");
@@ -138,20 +132,17 @@ main(int argc, char **argv)
 
 	cwd = getcpy(pwd());
 
-	if (!context_find("path"))
-		free(path("./", TFOLDER));
 	if (file && (msg || folder))
 		adios(NULL, "can't mix files and folders/msgs");
 
-	in = open_form(&form, distcomps);
-
-	strncpy(drft, m_draft("new"), sizeof(drft));
-
+	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);
+	fmtstr = new_fs(form, distcomps);
+	if (write(out, fmtstr, strlen(fmtstr)) != strlen(fmtstr)) {
+		adios(drft, "error writing");
+	}
 	close(out);
 
 	if (file) {
@@ -164,10 +155,10 @@ main(int argc, char **argv)
 		** Dist a message
 		*/
 		if (!msg)
-			msg = "cur";
+			msg = seq_cur;
 		if (!folder)
-			folder = getfolder(FCUR);
-		maildir = m_maildir(folder);
+			folder = getcurfol();
+		maildir = toabsdir(folder);
 
 		if (chdir(maildir) == NOTOK)
 			adios(maildir, "unable to change directory to");
@@ -194,7 +185,7 @@ main(int argc, char **argv)
 		adios(msgnam, "unable to open message");
 
 	if (!file) {
-		context_replace(pfolder, folder);  /* update current folder */
+		context_replace(curfolder, folder); /* update current folder */
 		seq_setcur(mp, mp->lowsel);  /* update current message */
 		seq_save(mp);  /* synchronize sequences  */
 		context_save();  /* save the context file  */
@@ -203,7 +194,7 @@ main(int argc, char **argv)
 	if (nwhat)
 		done(0);
 	what_now(ed, nedit, NOUSE, drft, msgnam, 1, mp, anot ? "Resent" : NULL,
-			inplace, cwd);
+			cwd);
 	done(1);
 	return 1;
 }