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

diff --git a/uip/mhstore.c b/uip/mhstore.c
index b756956..7be9163 100644
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -1,13 +1,10 @@
-
 /*
- * mhstore.c -- store the contents of MIME messages
- *
- * $Id$
- *
- * 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.
- */
+** mhstore.c -- store the contents of MIME messages
+**
+** 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>
@@ -26,53 +23,45 @@
 # include <sys/wait.h>
 #endif
 
-/*
- * We allocate space for message names (msgs array)
- * this number of elements at a time.
- */
-#define MAXMSGS  256
-
-
 static struct swit switches[] = {
-#define	AUTOSW                  0
-    { "auto", 0 },
-#define	NAUTOSW                 1
-    { "noauto", 0 },
-#define	CHECKSW                 2
-    { "check", 0 },
-#define	NCHECKSW                3
-    { "nocheck", 0 },
-#define	VERBSW                  4
-    { "verbose", 0 },
-#define	NVERBSW                 5
-    { "noverbose", 0 },
-#define	FILESW                  6	/* interface from show */
-    { "file file", 0 },
-#define	PARTSW                  7
-    { "part number", 0 },
-#define	TYPESW                  8
-    { "type content", 0 },
-#define	RCACHESW                9
-    { "rcache policy", 0 },
-#define	WCACHESW               10
-    { "wcache policy", 0 },
-#define VERSIONSW              11
-    { "version", 0 },
-#define	HELPSW                 12
-    { "help", 0 },
+#define AUTOSW  0
+	{ "auto", 0 },
+#define NAUTOSW  1
+	{ "noauto", 0 },
+#define CHECKSW  2
+	{ "check", 0 },
+#define NCHECKSW  3
+	{ "nocheck", 0 },
+#define VERBSW  4
+	{ "verbose", 0 },
+#define NVERBSW  5
+	{ "noverbose", 0 },
+#define FILESW  6  /* interface from show */
+	{ "file file", 0 },
+#define PARTSW  7
+	{ "part number", 0 },
+#define TYPESW  8
+	{ "type content", 0 },
+#define RCACHESW  9
+	{ "rcache policy", 0 },
+#define WCACHESW  10
+	{ "wcache policy", 0 },
+#define VERSIONSW  11
+	{ "version", 0 },
+#define HELPSW  12
+	{ "help", 0 },
 
 /*
- * switches for debugging
- */
-#define	DEBUGSW                13
-    { "debug", -5 },
-    { NULL, 0 }
+** switches for debugging
+*/
+#define DEBUGSW  13
+	{ "debug", -5 },
+	{ NULL, 0 }
 };
 
 
 /* mhparse.c */
-extern int checksw;
-extern char *tmp;	/* directory to place temp files */
+extern char *tmp;  /* directory to place temp files */
 
 /* mhcachesbr.c */
 extern int rcachesw;
@@ -82,7 +71,7 @@ extern char *cache_private;
 
 /* mhstoresbr.c */
 extern int autosw;
-extern char *cwd;	/* cache current working directory */
+extern char *cwd;  /* cache current working directory */
 
 /* mhmisc.c */
 extern int npart;
@@ -94,348 +83,322 @@ extern int userrs;
 int debugsw = 0;
 int verbosw = 0;
 
-/* The list of top-level contents to display */
-CT *cts = NULL;
-
-#define	quitser	pipeser
+#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;
 
 /*
- * static prototypes
- */
-static RETSIGTYPE pipeser (int);
+** static prototypes
+*/
+static RETSIGTYPE pipeser(int);
 
 
 int
-main (int argc, char **argv)
+main(int argc, char **argv)
 {
-    int nummsgs, maxmsgs, msgnum, *icachesw;
-    char *cp, *file = NULL, *folder = NULL;
-    char *maildir, buf[100], **argp;
-    char **arguments, **msgs;
-    struct msgs *mp = NULL;
-    CT ct, *ctp;
-    FILE *fp;
+	int msgnum, *icachesw;
+	char *cp, *file = NULL, *folder = NULL;
+	char *maildir, buf[100], **argp;
+	char **arguments;
+	struct msgs_array msgs = { 0, 0, NULL };
+	struct msgs *mp = NULL;
+	CT ct, *ctp;
+	FILE *fp;
+
+	done=freects_done;
 
 #ifdef LOCALE
-    setlocale(LC_ALL, "");
+	setlocale(LC_ALL, "");
 #endif
-    invo_name = r1bindex (argv[0], '/');
-
-    /* read user profile/context */
-    context_read();
-
-    arguments = getarguments (invo_name, argc, argv, 1);
-    argp = arguments;
-
-    /*
-     * Allocate the initial space to record message
-     * names, ranges, and sequences.
-     */
-    nummsgs = 0;
-    maxmsgs = MAXMSGS;
-    msgs = (char **) mh_xmalloc ((size_t) (maxmsgs * sizeof(*msgs)));
-
-    /*
-     * Parse arguments
-     */
-    while ((cp = *argp++)) {
-	if (*cp == '-') {
-	    switch (smatch (++cp, switches)) {
-	    case AMBIGSW: 
-		ambigsw (cp, switches);
-		done (1);
-	    case UNKWNSW: 
-		adios (NULL, "-%s unknown", cp);
-
-	    case HELPSW: 
-		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);
-
-	    case AUTOSW:
-		autosw++;
-		continue;
-	    case NAUTOSW:
-		autosw = 0;
-		continue;
-
-	    case RCACHESW:
-		icachesw = &rcachesw;
-		goto do_cache;
-	    case WCACHESW:
-		icachesw = &wcachesw;
+	invo_name = mhbasename(argv[0]);
+
+	/* read user profile/context */
+	context_read();
+
+	arguments = getarguments(invo_name, argc, argv, 1);
+	argp = arguments;
+
+	/*
+	** Parse arguments
+	*/
+	while ((cp = *argp++)) {
+		if (*cp == '-') {
+			switch (smatch(++cp, switches)) {
+			case AMBIGSW:
+				ambigsw(cp, switches);
+				done(1);
+			case UNKWNSW:
+				adios(NULL, "-%s unknown", cp);
+
+			case HELPSW:
+				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);
+
+			case AUTOSW:
+				autosw++;
+				continue;
+			case NAUTOSW:
+				autosw = 0;
+				continue;
+
+			case RCACHESW:
+				icachesw = &rcachesw;
+				goto do_cache;
+			case WCACHESW:
+				icachesw = &wcachesw;
 do_cache:
-		if (!(cp = *argp++) || *cp == '-')
-		    adios (NULL, "missing argument to %s", argp[-2]);
-		switch (*icachesw = smatch (cp, caches)) {
-		case AMBIGSW:
-		    ambigsw (cp, caches);
-		    done (1);
-		case UNKWNSW:
-		    adios (NULL, "%s unknown", cp);
-		default:
-		    break;
+				if (!(cp = *argp++) || *cp == '-')
+					adios(NULL, "missing argument to %s",
+							argp[-2]);
+				switch (*icachesw = smatch(cp, caches)) {
+				case AMBIGSW:
+					ambigsw(cp, caches);
+					done(1);
+				case UNKWNSW:
+					adios(NULL, "%s unknown", cp);
+				default:
+					break;
+				}
+				continue;
+
+			case CHECKSW:
+				checksw++;
+				continue;
+			case NCHECKSW:
+				checksw = 0;
+				continue;
+
+			case PARTSW:
+				if (!(cp = *argp++) || *cp == '-')
+					adios(NULL, "missing argument to %s",
+							argp[-2]);
+				if (npart >= 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]);
+				if (ntype >= 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);
+				continue;
+
+			case VERBSW:
+				verbosw = 1;
+				continue;
+			case NVERBSW:
+				verbosw = 0;
+				continue;
+			case DEBUGSW:
+				debugsw = 1;
+				continue;
+			}
 		}
-		continue;
-
-	    case CHECKSW:
-		checksw++;
-		continue;
-	    case NCHECKSW:
-		checksw = 0;
-		continue;
-
-	    case PARTSW:
-		if (!(cp = *argp++) || *cp == '-')
-		    adios (NULL, "missing argument to %s", argp[-2]);
-		if (npart >= 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]);
-		if (ntype >= 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);
-		continue;
-
-	    case VERBSW: 
-		verbosw = 1;
-		continue;
-	    case NVERBSW: 
-		verbosw = 0;
-		continue;
-	    case DEBUGSW:
-		debugsw = 1;
-		continue;
-	    }
+		if (*cp == '+' || *cp == '@') {
+			if (folder)
+				adios(NULL, "only one folder at a time!");
+			else
+				folder = pluspath(cp);
+		} else
+				app_msgarg(&msgs, cp);
 	}
-	if (*cp == '+' || *cp == '@') {
-	    if (folder)
-		adios (NULL, "only one folder at a time!");
-	    else
-		folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
-	} else {
-	    /*
-	     * Check if we need to allocate more space
-	     * for message names/ranges/sequences.
-	     */
-	    if (nummsgs >= maxmsgs) {
-		maxmsgs += MAXMSGS;
-		msgs = (char **) mh_xrealloc (msgs,
-		    (size_t) (maxmsgs * sizeof(*msgs)));
-	    }
-	    msgs[nummsgs++] = cp;
-	}
-    }
 
-    /* null terminate the list of acceptable parts/types */
-    parts[npart] = NULL;
-    types[ntype] = NULL;
+	/* null terminate the list of acceptable parts/types */
+	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);
-	} else {
-	    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);
-    }
-
-    /* Check for public cache location */
-    if ((cache_public = context_find (nmhcache)) && *cache_public != '/')
-	cache_public = NULL;
-
-    /* Check for private cache location */
-    if (!(cache_private = context_find (nmhprivcache)))
-	cache_private = ".cache";
-    cache_private = getcpy (m_maildir (cache_private));
-
-    /*
-     * Cache the current directory before we do any chdirs()'s.
-     */
-    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);
-    else
-	tmp = add (m_maildir (invo_name), NULL);
-
-    if (!context_find ("path"))
-	free (path ("./", TFOLDER));
-
-    if (file && nummsgs)
-	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");
-	ctp = cts;
-
-	if ((ct = parse_mime (file)));
-	    *ctp++ = ct;
-    } else {
 	/*
-	 * message(s) are coming from a folder
-	 */
-	if (!nummsgs)
-	    msgs[nummsgs++] = "cur";
-	if (!folder)
-	    folder = getfolder (1);
-	maildir = m_maildir (folder);
-
-	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);
-
-	/* check for empty folder */
-	if (mp->nummsg == 0)
-	    adios (NULL, "no messages in %s", folder);
-
-	/* parse all the message ranges/sequences and set SELECTED */
-	for (msgnum = 0; msgnum < nummsgs; msgnum++)
-	    if (!m_convert (mp, msgs[msgnum]))
-		done (1);
-	seq_setprev (mp);	/* set the previous-sequence */
-
-	if (!(cts = (CT *) calloc ((size_t) (mp->numsel + 1), sizeof(*cts))))
-	    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)))
-		    *ctp++ = ct;
-	    }
+	** 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);
+		} else {
+			admonish("", "unable to read $MHSTORE profile (%s)",
+					cp);
+		}
 	}
-    }
-
-    if (!*cts)
-	done (1);
-
-    userrs = 1;
-    SIGNAL (SIGQUIT, quitser);
-    SIGNAL (SIGPIPE, pipeser);
-
-    /*
-     * Get the associated umask for the relevant contents.
-     */
-    for (ctp = cts; *ctp; ctp++) {
-	struct stat st;
-
-	ct = *ctp;
-	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();
+
+	/*
+	** Read the standard profile setup
+	*/
+	if ((fp = fopen(cp = etcpath("mhn.defaults"), "r"))) {
+		readconfig((struct node **) 0, fp, cp, 0);
+		fclose(fp);
 	}
-    }
 
-    /*
-     * Store the message content
-     */
-    store_all_messages (cts);
+	/* Check for public cache location */
+	if ((cache_public = context_find(nmhcache)) && *cache_public != '/')
+		cache_public = NULL;
 
-    /* Now free all the structures for the content */
-    for (ctp = cts; *ctp; ctp++)
-	free_content (*ctp);
+	/* Check for private cache location */
+	if (!(cache_private = context_find(nmhprivcache)))
+		cache_private = ".cache";
+	cache_private = getcpy(m_maildir(cache_private));
 
-    free ((char *) cts);
-    cts = NULL;
+	/*
+	** Cache the current directory before we do any chdirs()'s.
+	*/
+	cwd = getcpy(pwd());
 
-    /* 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  */
-    }
+	/*
+	** 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);
+	else
+		tmp = add(m_maildir(invo_name), NULL);
 
-    return done (0);
-}
+	if (!context_find("path"))
+		free(path("./", TFOLDER));
 
+	if (file && msgs.size)
+		adios(NULL, "cannot specify msg and file at same time!");
 
-static RETSIGTYPE
-pipeser (int i)
-{
-    if (i == SIGQUIT) {
-	unlink ("core");
-	fflush (stdout);
-	fprintf (stderr, "\n");
-	fflush (stderr);
-    }
-
-    done (1);
-    /* NOTREACHED */
+	/*
+	** check if message is coming from file
+	*/
+	if (file) {
+		if (!(cts = (CT *) calloc((size_t) 2, sizeof(*cts))))
+			adios(NULL, "out of memory");
+		ctp = cts;
+
+		if ((ct = parse_mime(file)));
+			*ctp++ = ct;
+	} else {
+		/*
+		** message(s) are coming from a folder
+		*/
+		if (!msgs.size)
+			app_msgarg(&msgs, "cur");
+		if (!folder)
+			folder = getfolder(1);
+		maildir = m_maildir(folder);
+
+		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);
+
+		/* check for empty folder */
+		if (mp->nummsg == 0)
+			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 (!(cts = (CT *) calloc((size_t) (mp->numsel + 1),
+				sizeof(*cts))))
+			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)))
+					*ctp++ = ct;
+			}
+		}
+	}
+
+	if (!*cts)
+		done(1);
+
+	userrs = 1;
+	SIGNAL(SIGQUIT, quitser);
+	SIGNAL(SIGPIPE, pipeser);
+
+	/*
+	** Get the associated umask for the relevant contents.
+	*/
+	for (ctp = cts; *ctp; ctp++) {
+		struct stat st;
+
+		ct = *ctp;
+		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();
+		}
+	}
+
+	/*
+	** Store the message content
+	*/
+	store_all_messages(cts);
+
+	/* Now free all the structures for the content */
+	for (ctp = cts; *ctp; ctp++)
+		free_content(*ctp);
+
+	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  */
+	}
+
+	done(0);
+	return 1;
 }
 
 
-int
-done (int status)
+static RETSIGTYPE
+pipeser(int i)
 {
-    CT *ctp;
-
-    if ((ctp = cts))
-	for (; *ctp; ctp++)
-	    free_content (*ctp);
+	if (i == SIGQUIT) {
+		unlink("core");
+		fflush(stdout);
+		fprintf(stderr, "\n");
+		fflush(stderr);
+	}
 
-    exit (status);
-    return 1;  /* dead code to satisfy the compiler */
+	done(1);
+	/* NOTREACHED */
 }