X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fdist.c;h=89315c2cbbd8abe5a41fca824bf86136d9355ad2;hp=86c564f66ebeeaf3dac19bcc0310c2861f518a35;hb=714b5c530ece27ea2835a313013f5b770163403c;hpb=ced6090a330d3d83d0bce709f756aa3d7d65fea4

diff --git a/uip/dist.c b/uip/dist.c
index 86c564f..89315c2 100644
--- a/uip/dist.c
+++ b/uip/dist.c
@@ -40,7 +40,7 @@ static struct swit switches[] = {
 
 
 int
-main (int argc, char **argv)
+main(int argc, char **argv)
 {
 	int anot = 0, inplace = 1, nedit = 0;
 	int nwhat = 0, in, out;
@@ -53,31 +53,30 @@ main (int argc, char **argv)
 #ifdef LOCALE
 	setlocale(LC_ALL, "");
 #endif
-	invo_name = r1bindex (argv[0], '/');
+	invo_name = r1bindex(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 ANNOSW:
 					anot++;
@@ -88,7 +87,7 @@ main (int argc, char **argv)
 
 				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:
@@ -97,7 +96,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:
@@ -106,14 +105,14 @@ main (int argc, char **argv)
 
 				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 FORMSW:
 					if (!(form = *argp++) || *form == '-')
-						adios (NULL, "missing argument to %s", argp[-2]);
+						adios(NULL, "missing argument to %s", argp[-2]);
 					continue;
 
 				case INPLSW:
@@ -126,34 +125,34 @@ 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 (file && (msg || folder))
-		adios (NULL, "can't mix files and folders/msgs");
+		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("new"), sizeof(drft));
 
-	if ((out = creat (drft, m_gmprot ())) == NOTOK)
-		adios (drft, "unable to create");
+	if ((out = creat(drft, m_gmprot())) == NOTOK)
+		adios(drft, "unable to create");
 
-	cpydata (in, out, form, drft);
-	close (in);
-	close (out);
+	cpydata(in, out, form, drft);
+	close(in);
+	close(out);
 
 	if (file) {
 		/*
@@ -167,44 +166,44 @@ 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!");
 	}
 
-	msgnam = file ? file : getcpy (m_name (mp->lowsel));
-	if ((in = open (msgnam, O_RDONLY)) == NOTOK)
-		adios (msgnam, "unable to open message");
+	msgnam = file ? file : getcpy(m_name(mp->lowsel));
+	if ((in = open(msgnam, O_RDONLY)) == NOTOK)
+		adios(msgnam, "unable to open message");
 
 	if (!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  */
+		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  */
 	}
 
 	if (nwhat)
-		done (0);
-	what_now (ed, nedit, NOUSE, drft, msgnam, 1, mp,
-		anot ? "Resent" : NULL, inplace, cwd);
-	done (1);
+		done(0);
+	what_now(ed, nedit, NOUSE, drft, msgnam, 1, mp, anot ? "Resent" : NULL,
+			inplace, cwd);
+	done(1);
 	return 1;
 }