X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fcomp.c;h=9f0929d7104277dd6dcb17c650bdd2300d8090f4;hb=097c84b61603c4a4c5837f3dcc09c30a1e751702;hp=554d310ec615a6b4c24171e8eed067fe4344e499;hpb=337338b404931f06f0db2119c9e145e8ca5a9860;p=mmh

diff --git a/uip/comp.c b/uip/comp.c
index 554d310..9f0929d 100644
--- a/uip/comp.c
+++ b/uip/comp.c
@@ -1,10 +1,10 @@
 /*
- * comp.c -- compose a message
- *
- * This code is Copyright (c) 2002, by the authors of nmh.  See the
- * COPYRIGHT file in the root directory of the nmh distribution for
- * complete copyright information.
- */
+** comp.c -- compose a message
+**
+** This code is Copyright (c) 2002, by the authors of nmh.  See the
+** COPYRIGHT file in the root directory of the nmh distribution for
+** complete copyright information.
+*/
 
 #include <h/mh.h>
 #include <h/utils.h>
@@ -50,7 +50,7 @@ static struct swit aqrunl[] = {
 
 
 int
-main (int argc, char **argv)
+main(int argc, char **argv)
 {
 	int use = NOUSE, nedit = 0, nwhat = 0;
 	int i, in, out;
@@ -64,35 +64,34 @@ main (int argc, char **argv)
 #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)) {
+			switch (smatch(++cp, switches)) {
 				case AMBIGSW:
-					ambigsw (cp, switches);
-					done (1);
+					ambigsw(cp, switches);
+					done(1);
 				case UNKWNSW:
-					adios (NULL, "-%s unknown", cp);
+					adios(NULL, "-%s unknown", cp);
 
 				case HELPSW:
-					snprintf (buf, sizeof(buf), "%s [+folder] [msg] [switches]",
-						invo_name);
-					print_help (buf, switches, 1);
-					done (1);
+					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);
+					done(1);
 
 				case EDITRSW:
 					if (!(ed = *argp++) || *ed == '-')
-						adios (NULL, "missing argument to %s", argp[-2]);
+						adios(NULL, "missing argument to %s", argp[-2]);
 					nedit = 0;
 					continue;
 				case NEDITSW:
@@ -101,7 +100,7 @@ main (int argc, char **argv)
 
 				case WHATSW:
 					if (!(whatnowproc = *argp++) || *whatnowproc == '-')
-						adios (NULL, "missing argument to %s", argp[-2]);
+						adios(NULL, "missing argument to %s", argp[-2]);
 					nwhat = 0;
 					continue;
 				case NWHATSW:
@@ -110,7 +109,7 @@ main (int argc, char **argv)
 
 				case FORMSW:
 					if (!(form = *argp++) || *form == '-')
-						adios (NULL, "missing argument to %s", argp[-2]);
+						adios(NULL, "missing argument to %s", argp[-2]);
 					continue;
 
 				case USESW:
@@ -123,87 +122,88 @@ main (int argc, char **argv)
 		}
 		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 = pluspath(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 ());
+	cwd = getcpy(pwd());
 
-	if (!context_find ("path"))
-		free (path ("./", TFOLDER));
+	if (!context_find("path"))
+		free(path("./", TFOLDER));
 
 	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.
-		 */
+		** Take a message as the "form" for the new message.
+		*/
 		if (!msg)
 			msg = "cur";
 		if (!folder)
-			folder = getfolder (1);
-		maildir = m_maildir (folder);
+			folder = getfolder(FCUR);
+		maildir = m_maildir(folder);
 
-		if (chdir (maildir) == NOTOK)
-			adios (maildir, "unable to change directory to");
+		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!");
+			adios(NULL, "only one message at a time!");
 
-		if ((in = open (form = getcpy (m_name (mp->lowsel)),
+		if ((in = open(form = getcpy(m_name(mp->lowsel)),
 				O_RDONLY)) == NOTOK)
-			adios (form, "unable to open message");
+			adios(form, "unable to open message");
 	} else
 		in = open_form(&form, components);
 
 try_it_again:
-	strncpy (drft, m_draft(use ? (msg?msg:"cur") : "new"), sizeof(drft));
+	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);
+	** 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 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);
+		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)) {
+			if (!(argp = getans("\nDisposition? ", aqrunl)))
+				done(1);
+			switch (i = smatch(*argp, aqrunl)) {
 				case NOSW:
-					done (0);
+					done(0);
 				case NEWSW:
 					use = NOUSE;
 					goto try_it_again;
@@ -213,34 +213,33 @@ try_it_again:
 					use++;
 					goto edit_it;
 				case LISTDSW:
-					showfile (++argp, drft);
+					showfile(++argp, drft);
 					break;
 				case REFILSW:
-					if (refile (++argp, drft) == 0)
+					if (refile(++argp, drft) == 0)
 						i = YESW;
 					break;
 				default:
-					advise (NULL, "say what?");
+					advise(NULL, "say what?");
 					break;
 			}
 		}
-	} else {
-		if (use)
-			adios (drft, "unable to open");
+	} else if (use) {
+		adios(drft, "unable to open");
 	}
 
-	if ((out = creat (drft, m_gmprot ())) == NOTOK)
-		adios (drft, "unable to create");
-	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);
 
 edit_it:
-	context_save ();  /* save the context file */
+	context_save();  /* save the context file */
 
 	if (nwhat)
-		done (0);
-	what_now (ed, nedit, use, drft, NULL, 0, NULLMP, NULL, 0, cwd);
-	done (1);
+		done(0);
+	what_now(ed, nedit, use, drft, NULL, 0, NULLMP, NULL, 0, cwd);
+	done(1);
 	return 1;
 }