X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Frcvstore.c;h=868ed47b111702875102385647599aec9dc071d8;hp=2458852a2cb4ab25ed9591f9150f51d9fa99c80d;hb=714b5c530ece27ea2835a313013f5b770163403c;hpb=a485ed478abbd599d8c9aab48934e7a26733ecb1

diff --git a/uip/rcvstore.c b/uip/rcvstore.c
index 2458852..868ed47 100644
--- a/uip/rcvstore.c
+++ b/uip/rcvstore.c
@@ -1,10 +1,10 @@
 /*
- * rcvstore.c -- asynchronously add mail to a folder
- *
- * 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.
- */
+** rcvstore.c -- asynchronously add mail to a folder
+**
+** 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 <fcntl.h>
@@ -41,14 +41,14 @@ static struct swit switches[] = {
 
 
 /*
- * name of temporary file to store incoming message
- */
+** name of temporary file to store incoming message
+*/
 static char *tmpfilenam = NULL;
 
 static void unlink_done(int) NORETURN;
 
 int
-main (int argc, char **argv)
+main(int argc, char **argv)
 {
 	int publicsw = -1, zerosw = 0;
 	int create = 1, unseensw = 1;
@@ -63,42 +63,42 @@ 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();
 
-	mts_init (invo_name);
-	arguments = getarguments (invo_name, argc, argv, 1);
+	mts_init(invo_name);
+	arguments = getarguments(invo_name, argc, argv, 1);
 	argp = arguments;
 
 	/* parse 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] [switches]",
-					invo_name);
-				print_help (buf, switches, 1);
-				done (1);
+				snprintf(buf, sizeof(buf),
+						"%s [+folder] [switches]",
+						invo_name);
+				print_help(buf, switches, 1);
+				done(1);
 			case VERSIONSW:
 				print_version(invo_name);
-				done (1);
+				done(1);
 
 			case SEQSW:
 				if (!(cp = *argp++) || *cp == '-')
-					adios (NULL, "missing argument name to %s", argp[-2]);
+					adios(NULL, "missing argument name to %s", argp[-2]);
 
 				/* check if too many sequences specified */
 				if (seqp >= NUMATTRS)
-					adios (NULL, "too many sequences (more than %d) specified", NUMATTRS);
+					adios(NULL, "too many sequences (more than %d) specified", NUMATTRS);
 				seqs[seqp++] = cp;
 				continue;
 
@@ -133,108 +133,110 @@ 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 {
-			adios (NULL, "usage: %s [+folder] [switches]", invo_name);
+			adios(NULL, "usage: %s [+folder] [switches]",
+					invo_name);
 		}
 	}
 
 	seqs[seqp] = NULL;  /* NULL terminate list of sequences */
 
-	if (!context_find ("path"))
-		free (path ("./", TFOLDER));
+	if (!context_find("path"))
+		free(path("./", TFOLDER));
 
 	/* if no folder is given, use default folder */
 	if (!folder)
-		folder = getfolder (0);
-	maildir = m_maildir (folder);
+		folder = getfolder(0);
+	maildir = m_maildir(folder);
 
 	/* check if folder exists */
-	if (stat (maildir, &st) == NOTOK) {
+	if (stat(maildir, &st) == NOTOK) {
 		if (errno != ENOENT)
-			adios (maildir, "error on folder");
+			adios(maildir, "error on folder");
 		if (!create)
-			adios (NULL, "folder %s doesn't exist", maildir);
-		if (!makedir (maildir))
-			adios (NULL, "unable to create folder %s", maildir);
+			adios(NULL, "folder %s doesn't exist", maildir);
+		if (!makedir(maildir))
+			adios(NULL, "unable to create folder %s", maildir);
 	}
 
-	if (chdir (maildir) == NOTOK)
-		adios (maildir, "unable to change directory to");
+	if (chdir(maildir) == NOTOK)
+		adios(maildir, "unable to change directory to");
 
 	/* ignore a few signals */
-	SIGNAL (SIGHUP, SIG_IGN);
-	SIGNAL (SIGINT, SIG_IGN);
-	SIGNAL (SIGQUIT, SIG_IGN);
-	SIGNAL (SIGTERM, SIG_IGN);
+	SIGNAL(SIGHUP, SIG_IGN);
+	SIGNAL(SIGINT, SIG_IGN);
+	SIGNAL(SIGQUIT, SIG_IGN);
+	SIGNAL(SIGTERM, SIG_IGN);
 
 	/* create a temporary file */
-	tmpfilenam = m_mktemp (invo_name, &fd, NULL);
+	tmpfilenam = m_mktemp(invo_name, &fd, NULL);
 	if (tmpfilenam == NULL) {
-		adios ("rcvstore", "unable to create temporary file");
+		adios("rcvstore", "unable to create temporary file");
 	}
-	chmod (tmpfilenam, m_gmprot());
+	chmod(tmpfilenam, m_gmprot());
 
 	/* copy the message from stdin into temp file */
-	cpydata (fileno (stdin), fd, "standard input", tmpfilenam);
+	cpydata(fileno(stdin), fd, "standard input", tmpfilenam);
 
-	if (fstat (fd, &st) == NOTOK) {
-		unlink (tmpfilenam);
-		adios (tmpfilenam, "unable to fstat");
+	if (fstat(fd, &st) == NOTOK) {
+		unlink(tmpfilenam);
+		adios(tmpfilenam, "unable to fstat");
 	}
-	if (close (fd) == NOTOK)
-		adios (tmpfilenam, "error closing");
+	if (close(fd) == NOTOK)
+		adios(tmpfilenam, "error closing");
 
 	/* don't add file if it is empty */
 	if (st.st_size == 0) {
-		unlink (tmpfilenam);
-		advise (NULL, "empty file");
-		done (0);
+		unlink(tmpfilenam);
+		advise(NULL, "empty file");
+		done(0);
 	}
 
 	/*
-	 * read folder and create message structure
-	 */
-	if (!(mp = folder_read (folder)))
-		adios (NULL, "unable to read folder %s", folder);
+	** read folder and create message structure
+	*/
+	if (!(mp = folder_read(folder)))
+		adios(NULL, "unable to read folder %s", folder);
 
 	/*
-	 * Link message into folder, and possibly add
-	 * to the Unseen-Sequence's.
-	 */
-	if ((msgnum = folder_addmsg (&mp, tmpfilenam, 0, unseensw, 0, 0, (char *)0)) == -1)
-		done (1);
+	** Link message into folder, and possibly add
+	** to the Unseen-Sequence's.
+	*/
+	if ((msgnum = folder_addmsg(&mp, tmpfilenam, 0, unseensw, 0, 0,
+			(char *)0)) == -1)
+		done(1);
 
 	/*
-	 * Add the message to any extra sequences
-	 * that have been specified.
-	 */
+	** Add the message to any extra sequences
+	** that have been specified.
+	*/
 	for (seqp = 0; seqs[seqp]; seqp++) {
-		if (!seq_addmsg (mp, seqs[seqp], msgnum, publicsw, zerosw))
-			done (1);
+		if (!seq_addmsg(mp, seqs[seqp], msgnum, publicsw, zerosw))
+			done(1);
 	}
 
-	seq_setunseen (mp, 0);  /* synchronize any Unseen-Sequence's */
-	seq_save (mp);  /* synchronize and save message sequences */
-	folder_free (mp);  /* free folder/message structure */
+	seq_setunseen(mp, 0);  /* synchronize any Unseen-Sequence's */
+	seq_save(mp);  /* synchronize and save message sequences */
+	folder_free(mp);  /* free folder/message structure */
 
-	context_save ();  /* save the global context file */
-	unlink (tmpfilenam);  /* remove temporary file */
+	context_save();  /* save the global context file */
+	unlink(tmpfilenam);  /* remove temporary file */
 	tmpfilenam = NULL;
 
-	done (0);
+	done(0);
 	return 1;
 }
 
 /*
- * Clean up and exit
- */
+** Clean up and exit
+*/
 static void
 unlink_done(int status)
 {
 	if (tmpfilenam && *tmpfilenam)
-		unlink (tmpfilenam);
-	exit (status);
+		unlink(tmpfilenam);
+	exit(status);
 }