X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Frepl.c;h=61ba08cfe50a71954c74f3091dc452dafc25531d;hp=f6016deaf2f5892b932f1ee6b7581bd39eed91ff;hb=240013872c392fe644bd4f79382d9f5314b4ea60;hpb=ced6090a330d3d83d0bce709f756aa3d7d65fea4

diff --git a/uip/repl.c b/uip/repl.c
index f6016de..61ba08c 100644
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -99,11 +99,11 @@ char *fcc = NULL;  /* folders to add to Fcc: header */
 /*
 ** prototypes
 */
-void docc (char *, int);
+void docc(char *, int);
 
 
 int
-main (int argc, char **argv)
+main(int argc, char **argv)
 {
 	int anot = 0, inplace = 1;
 	int nedit = 0, nwhat = 0;
@@ -121,30 +121,30 @@ 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 (0);
+					snprintf(buf, sizeof(buf), "%s: [+folder] [msg] [switches]", invo_name);
+					print_help(buf, switches, 1);
+					done(0);
 				case VERSIONSW:
 					print_version(invo_name);
-					done (1);
+					done(1);
 
 				case GROUPSW:
 					groupreply++;
@@ -162,18 +162,18 @@ main (int argc, char **argv)
 
 				case CCSW:
 					if (!(cp = *argp++) || *cp == '-')
-						adios (NULL, "missing argument to %s", argp[-2]);
-					docc (cp, 1);
+						adios(NULL, "missing argument to %s", argp[-2]);
+					docc(cp, 1);
 					continue;
 				case NCCSW:
 					if (!(cp = *argp++) || *cp == '-')
-						adios (NULL, "missing argument to %s", argp[-2]);
-					docc (cp, 0);
+						adios(NULL, "missing argument to %s", argp[-2]);
+					docc(cp, 0);
 					continue;
 
 				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:
@@ -183,7 +183,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;
 #ifdef MHE
@@ -196,38 +196,38 @@ main (int argc, char **argv)
 
 				case FCCSW:
 					if (!(cp = *argp++) || *cp == '-')
-						adios (NULL, "missing argument to %s", argp[-2]);
+						adios(NULL, "missing argument to %s", argp[-2]);
 					dp = NULL;
 					if (*cp == '@')
-						cp = dp = path (cp + 1,
+						cp = dp = path(cp + 1,
 								TSUBCWF);
 					if (fcc)
-						fcc = add (", ", fcc);
-					fcc = add (cp, fcc);
+						fcc = add(", ", fcc);
+					fcc = add(cp, fcc);
 					if (dp)
-						free (dp);
+						free(dp);
 					continue;
 
 				case FILESW:
 					if (file)
-						adios (NULL, "only one file at a time!");
+						adios(NULL, "only one file at a time!");
 					if (!(cp = *argp++) || *cp == '-')
-						adios (NULL, "missing argument to %s", argp[-2]);
-					file = path (cp, TFILE);
+						adios(NULL, "missing argument to %s", argp[-2]);
+					file = path(cp, TFILE);
 					continue;
 				case FILTSW:
 					if (!(cp = *argp++) || *cp == '-')
-						adios (NULL, "missing argument to %s", argp[-2]);
-					filter = getcpy (etcpath (cp));
+						adios(NULL, "missing argument to %s", argp[-2]);
+					filter = getcpy(etcpath(cp));
 					mime = 0;
 					continue;
 				case FORMSW:
 					if (!(form = *argp++) || *form == '-')
-						adios (NULL, "missing argument to %s", argp[-2]);
+						adios(NULL, "missing argument to %s", argp[-2]);
 					continue;
 
 				case FRMTSW:
-					filter = getcpy (etcpath (mhlreply));
+					filter = getcpy(etcpath(mhlreply));
 					mime = 0;
 					continue;
 				case NFRMTSW:
@@ -258,20 +258,20 @@ main (int argc, char **argv)
 
 				case WIDTHSW:
 					if (!(cp = *argp++) || *cp == '-')
-						adios (NULL, "missing argument to %s", argp[-2]);
-					if ((outputlinelen = atoi (cp)) < 10)
-						adios (NULL, "impossible width %d", outputlinelen);
+						adios(NULL, "missing argument to %s", argp[-2]);
+					if ((outputlinelen = atoi(cp)) < 10)
+						adios(NULL, "impossible width %d", outputlinelen);
 					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 = pluspath(cp);
 		} else {
 			if (msg)
-				adios (NULL, "only one message at a time!");
+				adios(NULL, "only one message at a time!");
 			else
 				msg = cp;
 		}
@@ -284,18 +284,18 @@ main (int argc, char **argv)
 	if (ccme == -1)
 		ccme = groupreply;
 
-	cwd = getcpy (pwd ());
+	cwd = getcpy(pwd());
 
-	if (!context_find ("path"))
-		free (path ("./", TFOLDER));
+	if (!context_find("path"))
+		free(path("./", TFOLDER));
 	if (file && (msg || folder))
-		adios (NULL, "can't mix files and folders/msgs");
+		adios(NULL, "can't mix files and folders/msgs");
 
 #ifdef MHE
-	strncpy (drft, buildsw ? m_maildir ("reply")
+	strncpy(drft, buildsw ? m_maildir("reply")
 		: m_draft("new"), sizeof(drft));
 #else
-	strncpy (drft, m_draft("new"), sizeof(drft));
+	strncpy(drft, m_draft("new"), sizeof(drft));
 #endif /* MHE */
 
 	if (file) {
@@ -310,68 +310,68 @@ main (int argc, char **argv)
 		if (!msg)
 			msg = "cur";
 		if (!folder)
-			folder = getfolder (1);
-		maildir = m_maildir (folder);
+			folder = getfolder(1);
+		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!");
 
-		context_replace (pfolder, folder);  /* update current folder */
-		seq_setcur (mp, mp->lowsel);  /* update current message  */
-		seq_save (mp);  /* synchronize sequences   */
-		context_save ();  /* save the context file   */
+		context_replace(pfolder, folder);  /* update current folder */
+		seq_setcur(mp, mp->lowsel);  /* update current message  */
+		seq_save(mp);  /* synchronize sequences   */
+		context_save();  /* save the context file   */
 	}
 
-	msg = file ? file : getcpy (m_name (mp->lowsel));
+	msg = file ? file : getcpy(m_name(mp->lowsel));
 
-	if ((in = fopen (msg, "r")) == NULL)
-		adios (msg, "unable to open");
+	if ((in = fopen(msg, "r")) == NULL)
+		adios(msg, "unable to open");
 
 	/* find form (components) file */
 	if (!form) {
 		if (groupreply)
-			form = etcpath (replgroupcomps);
+			form = etcpath(replgroupcomps);
 		else
-			form = etcpath (replcomps);
+			form = etcpath(replcomps);
 	}
 
-	replout (in, msg, drft, mp, outputlinelen, mime, form, filter, fcc);
-	fclose (in);
+	replout(in, msg, drft, mp, outputlinelen, mime, form, filter, fcc);
+	fclose(in);
 
 	if (nwhat)
-		done (0);
-	what_now (ed, nedit, NOUSE, drft, msg, 0, mp,
-			anot ? "Replied" : NULL, inplace, cwd);
-	done (1);
+		done(0);
+	what_now(ed, nedit, NOUSE, drft, msg, 0, mp, anot ? "Replied" : NULL,
+			inplace, cwd);
+	done(1);
 	return 1;
 }
 
 void
-docc (char *cp, int ccflag)
+docc(char *cp, int ccflag)
 {
-	switch (smatch (cp, ccswitches)) {
+	switch (smatch(cp, ccswitches)) {
 		case AMBIGSW:
-			ambigsw (cp, ccswitches);
-			done (1);
+			ambigsw(cp, ccswitches);
+			done(1);
 		case UNKWNSW:
-			adios (NULL, "-%scc %s unknown",
-					ccflag ? "" : "no", cp);
+			adios(NULL, "-%scc %s unknown", ccflag ? "" : "no",
+					cp);
 
 		case CTOSW:
 			ccto = ccflag;