X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhstore.c;h=7be916328f9628e8a8077fb14344f2c30e2b47c3;hp=add5c0281bee1b9ac177fa5cec46c7c2a0f27119;hb=240013872c392fe644bd4f79382d9f5314b4ea60;hpb=ced6090a330d3d83d0bce709f756aa3d7d65fea4

diff --git a/uip/mhstore.c b/uip/mhstore.c
index add5c02..7be9163 100644
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -86,30 +86,30 @@ int verbosw = 0;
 #define quitser pipeser
 
 /* mhparse.c */
-CT parse_mime (char *);
+CT parse_mime(char *);
 
 /* mhmisc.c */
-int part_ok (CT, int);
-int type_ok (CT, int);
-void set_endian (void);
-void flush_errors (void);
+int part_ok(CT, int);
+int type_ok(CT, int);
+void set_endian(void);
+void flush_errors(void);
 
 /* mhstoresbr.c */
-void store_all_messages (CT *);
+void store_all_messages(CT *);
 
 /* mhfree.c */
-void free_content (CT);
+void free_content(CT);
 extern CT *cts;
-void freects_done (int) NORETURN;
+void freects_done(int) NORETURN;
 
 /*
 ** static prototypes
 */
-static RETSIGTYPE pipeser (int);
+static RETSIGTYPE pipeser(int);
 
 
 int
-main (int argc, char **argv)
+main(int argc, char **argv)
 {
 	int msgnum, *icachesw;
 	char *cp, *file = NULL, *folder = NULL;
@@ -125,12 +125,12 @@ 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;
 
 	/*
@@ -138,21 +138,20 @@ 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 AUTOSW:
 				autosw++;
@@ -168,13 +167,14 @@ main (int argc, char **argv)
 				icachesw = &wcachesw;
 do_cache:
 				if (!(cp = *argp++) || *cp == '-')
-					adios (NULL, "missing argument to %s", argp[-2]);
-				switch (*icachesw = smatch (cp, caches)) {
+					adios(NULL, "missing argument to %s",
+							argp[-2]);
+				switch (*icachesw = smatch(cp, caches)) {
 				case AMBIGSW:
-					ambigsw (cp, caches);
-					done (1);
+					ambigsw(cp, caches);
+					done(1);
 				case UNKWNSW:
-					adios (NULL, "%s unknown", cp);
+					adios(NULL, "%s unknown", cp);
 				default:
 					break;
 				}
@@ -189,26 +189,27 @@ do_cache:
 
 			case PARTSW:
 				if (!(cp = *argp++) || *cp == '-')
-					adios (NULL, "missing argument to %s", argp[-2]);
+					adios(NULL, "missing argument to %s",
+							argp[-2]);
 				if (npart >= NPARTS)
-					adios (NULL, "too many parts (starting with %s), %d max",
-						   cp, NPARTS);
+					adios(NULL, "too many parts (starting with %s), %d max", cp, NPARTS);
 				parts[npart++] = cp;
 				continue;
 
 			case TYPESW:
 				if (!(cp = *argp++) || *cp == '-')
-					adios (NULL, "missing argument to %s", argp[-2]);
+					adios(NULL, "missing argument to %s",
+							argp[-2]);
 				if (ntype >= NTYPES)
-					adios (NULL, "too many types (starting with %s), %d max",
-						   cp, NTYPES);
+					adios(NULL, "too many types (starting with %s), %d max", cp, NTYPES);
 				types[ntype++] = cp;
 				continue;
 
 			case FILESW:
 				if (!(cp = *argp++) || (*cp == '-' && cp[1]))
-					adios (NULL, "missing argument to %s", argp[-2]);
-				file = *cp == '-' ? cp : path (cp, TFILE);
+					adios(NULL, "missing argument to %s",
+							argp[-2]);
+				file = *cp == '-' ? cp : path(cp, TFILE);
 				continue;
 
 			case VERBSW:
@@ -224,9 +225,9 @@ do_cache:
 		}
 		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
 				app_msgarg(&msgs, cp);
 	}
@@ -235,67 +236,68 @@ do_cache:
 	parts[npart] = NULL;
 	types[ntype] = NULL;
 
-	set_endian ();
+	set_endian();
 
 	/*
 	** Check if we've specified an additional profile
 	*/
-	if ((cp = getenv ("MHSTORE"))) {
-		if ((fp = fopen (cp, "r"))) {
-			readconfig ((struct node **) 0, fp, cp, 0);
-			fclose (fp);
+	if ((cp = getenv("MHSTORE"))) {
+		if ((fp = fopen(cp, "r"))) {
+			readconfig((struct node **) 0, fp, cp, 0);
+			fclose(fp);
 		} else {
-			admonish ("", "unable to read $MHSTORE profile (%s)", cp);
+			admonish("", "unable to read $MHSTORE profile (%s)",
+					cp);
 		}
 	}
 
 	/*
 	** Read the standard profile setup
 	*/
-	if ((fp = fopen (cp = etcpath ("mhn.defaults"), "r"))) {
-		readconfig ((struct node **) 0, fp, cp, 0);
-		fclose (fp);
+	if ((fp = fopen(cp = etcpath("mhn.defaults"), "r"))) {
+		readconfig((struct node **) 0, fp, cp, 0);
+		fclose(fp);
 	}
 
 	/* Check for public cache location */
-	if ((cache_public = context_find (nmhcache)) && *cache_public != '/')
+	if ((cache_public = context_find(nmhcache)) && *cache_public != '/')
 		cache_public = NULL;
 
 	/* Check for private cache location */
-	if (!(cache_private = context_find (nmhprivcache)))
+	if (!(cache_private = context_find(nmhprivcache)))
 		cache_private = ".cache";
-	cache_private = getcpy (m_maildir (cache_private));
+	cache_private = getcpy(m_maildir(cache_private));
 
 	/*
 	** Cache the current directory before we do any chdirs()'s.
 	*/
-	cwd = getcpy (pwd());
+	cwd = getcpy(pwd());
 
 	/*
 	** Check for storage directory.  If specified,
 	** then store temporary files there.  Else we
 	** store them in standard nmh directory.
 	*/
-	if ((cp = context_find (nmhstorage)) && *cp)
-		tmp = concat (cp, "/", invo_name, NULL);
+	if ((cp = context_find(nmhstorage)) && *cp)
+		tmp = concat(cp, "/", invo_name, NULL);
 	else
-		tmp = add (m_maildir (invo_name), NULL);
+		tmp = add(m_maildir(invo_name), NULL);
 
-	if (!context_find ("path"))
-		free (path ("./", TFOLDER));
+	if (!context_find("path"))
+		free(path("./", TFOLDER));
 
 	if (file && msgs.size)
-		adios (NULL, "cannot specify msg and file at same time!");
+		adios(NULL, "cannot specify msg and file at same time!");
 
 	/*
 	** check if message is coming from file
 	*/
 	if (file) {
-		if (!(cts = (CT *) calloc ((size_t) 2, sizeof(*cts))))
-			adios (NULL, "out of memory");
+		if (!(cts = (CT *) calloc((size_t) 2, sizeof(*cts))))
+			adios(NULL, "out of memory");
 		ctp = cts;
 
-		if ((ct = parse_mime (file)));
+		if ((ct = parse_mime(file)));
 			*ctp++ = ct;
 	} else {
 		/*
@@ -304,48 +306,48 @@ do_cache:
 		if (!msgs.size)
 			app_msgarg(&msgs, "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 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 */
 
-		if (!(cts = (CT *) calloc ((size_t) (mp->numsel + 1),
+		if (!(cts = (CT *) calloc((size_t) (mp->numsel + 1),
 				sizeof(*cts))))
-			adios (NULL, "out of memory");
+			adios(NULL, "out of memory");
 		ctp = cts;
 
 		for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
 			if (is_selected(mp, msgnum)) {
 				char *msgnam;
 
-				msgnam = m_name (msgnum);
-				if ((ct = parse_mime (msgnam)))
+				msgnam = m_name(msgnum);
+				if ((ct = parse_mime(msgnam)))
 					*ctp++ = ct;
 			}
 		}
 	}
 
 	if (!*cts)
-		done (1);
+		done(1);
 
 	userrs = 1;
-	SIGNAL (SIGQUIT, quitser);
-	SIGNAL (SIGPIPE, pipeser);
+	SIGNAL(SIGQUIT, quitser);
+	SIGNAL(SIGPIPE, pipeser);
 
 	/*
 	** Get the associated umask for the relevant contents.
@@ -354,8 +356,8 @@ do_cache:
 		struct stat st;
 
 		ct = *ctp;
-		if (type_ok (ct, 1) && !ct->c_umask) {
-			if (stat (ct->c_file, &st) != NOTOK)
+		if (type_ok(ct, 1) && !ct->c_umask) {
+			if (stat(ct->c_file, &st) != NOTOK)
 				ct->c_umask = ~(st.st_mode & 0777);
 			else
 				ct->c_umask = ~m_gmprot();
@@ -365,38 +367,38 @@ do_cache:
 	/*
 	** Store the message content
 	*/
-	store_all_messages (cts);
+	store_all_messages(cts);
 
 	/* Now free all the structures for the content */
 	for (ctp = cts; *ctp; ctp++)
-		free_content (*ctp);
+		free_content(*ctp);
 
-	free ((char *) cts);
+	free((char *) cts);
 	cts = NULL;
 
 	/* If reading from a folder, do some updating */
 	if (mp) {
-		context_replace (pfolder, folder);  /* update current folder */
-		seq_setcur (mp, mp->hghsel);  /* 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->hghsel);  /* update current message */
+		seq_save(mp);  /* synchronize sequences  */
+		context_save();  /* save the context file  */
 	}
 
-	done (0);
+	done(0);
 	return 1;
 }
 
 
 static RETSIGTYPE
-pipeser (int i)
+pipeser(int i)
 {
 	if (i == SIGQUIT) {
-		unlink ("core");
-		fflush (stdout);
-		fprintf (stderr, "\n");
-		fflush (stderr);
+		unlink("core");
+		fflush(stdout);
+		fprintf(stderr, "\n");
+		fflush(stderr);
 	}
 
-	done (1);
+	done(1);
 	/* NOTREACHED */
 }