X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fpackf.c;h=14ecdaaf4fa9e997c43a8028da52e32776fcfa0b;hp=732be656691fbdfa6c54688440fb38dd6f142b43;hb=714b5c530ece27ea2835a313013f5b770163403c;hpb=ced6090a330d3d83d0bce709f756aa3d7d65fea4

diff --git a/uip/packf.c b/uip/packf.c
index 732be65..14ecdaa 100644
--- a/uip/packf.c
+++ b/uip/packf.c
@@ -36,7 +36,7 @@ char *file = NULL;
 
 
 int
-main (int argc, char **argv)
+main(int argc, char **argv)
 {
 	int fd, msgnum;
 	char *cp, *maildir, *msgnam, *folder = NULL, buf[BUFSIZ];
@@ -50,12 +50,12 @@ 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;
 
 	/*
@@ -63,26 +63,26 @@ main (int argc, char **argv)
 	*/
 	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] [msgs] [switches]", invo_name);
-					print_help (buf, switches, 1);
-					done (1);
+					snprintf(buf, sizeof(buf), "%s [+folder] [msgs] [switches]", invo_name);
+					print_help(buf, switches, 1);
+					done(1);
 				case VERSIONSW:
 					print_version(invo_name);
-					done (1);
+					done(1);
 
 				case FILESW:
 					if (file)
-						adios (NULL, "only one file at a time!");
+						adios(NULL, "only one file at a time!");
 					if (!(file = *argp++) || *file == '-')
-						adios (NULL, "missing argument to %s", argp[-2]);
+						adios(NULL, "missing argument to %s", argp[-2]);
 					continue;
 
 				case MBOXSW:
@@ -97,15 +97,15 @@ main (int argc, char **argv)
 		}
 		if (*cp == '+' || *cp == '@') {
 			if (folder)
-				adios (NULL, "only one folder at a time!");
-			folder = pluspath (cp);
+				adios(NULL, "only one folder at a time!");
+			folder = pluspath(cp);
 		} else
 			app_msgarg(&msgs, cp);
 	}
 
 	if (!file)
 		file = "./msgbox";
-	file = path (file, TFILE);
+	file = path(file, TFILE);
 
 	/*
 	** Check if file to be created (or appended to)
@@ -113,78 +113,78 @@ main (int argc, char **argv)
 	*/
 	if (stat (file, &st) == NOTOK) {
 		if (errno != ENOENT)
-			adios (file, "error on file");
-		cp = concat ("Create file \"", file, "\"? ", NULL);
-		if (!getanswer (cp))
-			done (1);
-		free (cp);
+			adios(file, "error on file");
+		cp = concat("Create file \"", file, "\"? ", NULL);
+		if (!getanswer(cp))
+			done(1);
+		free(cp);
 	}
 
-	if (!context_find ("path"))
-		free (path ("./", TFOLDER));
+	if (!context_find("path"))
+		free(path("./", TFOLDER));
 
 	/* default is to pack whole folder */
 	if (!msgs.size)
 		app_msgarg(&msgs, "all");
 
 	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 all the message ranges/sequences and set SELECTED */
 	for (msgnum = 0; msgnum < msgs.size; msgnum++)
-		if (!m_convert (mp, msgs.msgs[msgnum]))
-			done (1);
-	seq_setprev (mp);  /* set the previous-sequence */
+		if (!m_convert(mp, msgs.msgs[msgnum]))
+			done(1);
+	seq_setprev(mp);  /* set the previous-sequence */
 
 	/* open and lock new maildrop file */
 	if ((md = mbx_open(file, mbx_style, getuid(), getgid(), m_gmprot()))
 			== NOTOK)
-		adios (file, "unable to open");
+		adios(file, "unable to open");
 
 	/* copy all the SELECTED messages to the file */
 	for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++)
 		if (is_selected(mp, msgnum)) {
-			if ((fd = open (msgnam = m_name (msgnum), O_RDONLY))
+			if ((fd = open(msgnam = m_name(msgnum), O_RDONLY))
 					== NOTOK) {
-				admonish (msgnam, "unable to read message");
+				admonish(msgnam, "unable to read message");
 				break;
 			}
 
 			if (mbx_copy(file, mbx_style, md, fd, mapping, NULL, 1)
 					== NOTOK)
-				adios (file, "error writing to file");
+				adios(file, "error writing to file");
 
-			close (fd);
+			close(fd);
 		}
 
 	/* close and unlock maildrop file */
-	mbx_close (file, md);
+	mbx_close(file, md);
 
-	context_replace (pfolder, folder);  /* update current folder */
+	context_replace(pfolder, folder);  /* update current folder */
 	if (mp->hghsel != mp->curmsg)
-		seq_setcur (mp, mp->lowsel);
-	seq_save (mp);
-	context_save ();  /* save the context file */
-	folder_free (mp);  /* free folder/message structure */
-	done (0);
+		seq_setcur(mp, mp->lowsel);
+	seq_save(mp);
+	context_save();  /* save the context file */
+	folder_free(mp);  /* free folder/message structure */
+	done(0);
 	return 1;
 }
 
 static void
-mbxclose_done (int status)
+mbxclose_done(int status)
 {
-	mbx_close (file, md);
-	exit (status);
+	mbx_close(file, md);
+	exit(status);
 }