X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhstore.c;h=5b56b090f3bb853744d196b3bbb6df10b7648311;hb=2823e13f67239db7deb7274f3a47bfbff56c7c64;hp=50c911c86117e68786459b2ec582ed41bd33da9d;hpb=41b6eadbcecf63c9a66aa5e582011987494abefb;p=mmh

diff --git a/uip/mhstore.c b/uip/mhstore.c
index 50c911c..5b56b09 100644
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -21,7 +21,7 @@ static struct swit switches[] = {
 #define AUTOSW  0
 	{ "auto", 0 },
 #define NAUTOSW  1
-	{ "noauto", 0 },
+	{ "noauto", 2 },
 #define FILESW  2  /* interface from show */
 	{ "file file", 0 },
 #define PARTSW  3
@@ -29,7 +29,7 @@ static struct swit switches[] = {
 #define TYPESW  4
 	{ "type content", 0 },
 #define VERSIONSW  5
-	{ "version", 0 },
+	{ "Version", 0 },
 #define HELPSW  6
 	{ "help", 0 },
 #define DEBUGSW  7
@@ -64,7 +64,7 @@ void flush_errors(void);
 /* mhfree.c */
 void free_content(CT);
 extern CT *cts;  /* The list of top-level contents to display */
-void freects_done(int) NORETURN;
+void freects_done();
 
 /*
 ** static prototypes
@@ -130,11 +130,9 @@ main(int argc, char **argv)
 	CT ct, *ctp;
 	FILE *fp;
 
-	done=freects_done;
+	atexit(freects_done);
 
-#ifdef LOCALE
 	setlocale(LC_ALL, "");
-#endif
 	invo_name = mhbasename(argv[0]);
 
 	/* read user profile/context */
@@ -151,17 +149,17 @@ main(int argc, char **argv)
 			switch (smatch(++cp, switches)) {
 			case AMBIGSW:
 				ambigsw(cp, switches);
-				done(1);
+				exit(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);
+				exit(0);
 			case VERSIONSW:
 				print_version(invo_name);
-				done(1);
+				exit(0);
 
 			case AUTOSW:
 				autosw++;
@@ -288,7 +286,7 @@ main(int argc, char **argv)
 		/* 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);
+				exit(1);
 		seq_setprev(mp);  /* set the previous-sequence */
 
 		if (!(cts = (CT *) calloc((size_t) (mp->numsel + 1),
@@ -308,7 +306,7 @@ main(int argc, char **argv)
 	}
 
 	if (!*cts)
-		done(1);
+		exit(1);
 
 	userrs = 1;
 	SIGNAL(SIGQUIT, quitser);
@@ -349,8 +347,7 @@ main(int argc, char **argv)
 		context_save();  /* save the context file  */
 	}
 
-	done(0);
-	return 1;
+	return 0;
 }
 
 
@@ -364,7 +361,7 @@ pipeser(int i)
 		fflush(stderr);
 	}
 
-	done(1);
+	exit(1);
 	/* NOTREACHED */
 }
 
@@ -466,7 +463,6 @@ store_switch(CT ct)
 ** Generic routine to store a MIME content.
 ** (application, audio, video, image, text, message/rfc922)
 */
-
 static int
 store_generic(CT ct)
 {
@@ -477,10 +473,8 @@ store_generic(CT ct)
 	** Check if the content specifies a filename in its MIME parameters.
 	** Don't bother with this for type "message"
 	** (only the "message" subtype "rfc822" will use store_generic).
-	** The storeproc may already be defined, if this content
-	** is part of a "message/external", for instance.
 	*/
-	if (autosw && ct->c_type != CT_MESSAGE && !ct->c_storeproc) {
+	if (autosw && ct->c_type != CT_MESSAGE) {
 		/*
 		** Check the attribute/value pairs, for the attribute "name".
 		** If found, take the basename, do a few sanity checks and
@@ -633,50 +627,36 @@ losing:
 
 
 /*
-** Store content from a message of type "message/external".
+** Show how to retrieve content of type "message/external".
 */
-
 static int
 store_external(CT ct)
 {
-	int result = NOTOK;
-	struct exbody *e = (struct exbody *) ct->c_ctparams;
-	CT p = e->eb_content;
-
-	if (!type_ok(p, 1))
-		return OK;
+	char **ap, **ep;
+	char *msg;
+	FILE *fp;
+	char buf[BUFSIZ];
 
-	/*
-	** Check if the parameters for the external body
-	** specified a filename.
-	*/
-	if (autosw) {
-		char *cp;
-
-		cp = mhbasename(e->eb_name);
-		if (*cp && *cp!='.' && *cp!='|' && *cp!='!' &&
-				!strchr(cp, '%')) {
-			/* filename looks good: use it */
-			if (!ct->c_storeproc)
-				ct->c_storeproc = getcpy(cp);
-			if (!p->c_storeproc)
-				p->c_storeproc = getcpy(cp);
+	msg = add("You need to fetch the contents yourself:", NULL);
+	ap = ct->c_ctinfo.ci_attrs;
+	ep = ct->c_ctinfo.ci_values;
+	for (; *ap; ap++, ep++) {
+		msg = add(concat("\n\t", *ap, ": ", *ep, NULL), msg);
+	}
+	if (!(fp = fopen(ct->c_file, "r"))) {
+		adios(ct->c_file, "unable to open");
+	}
+	fseek(fp, ct->c_begin, SEEK_SET);
+	while (!feof(fp) && ftell(fp) < ct->c_end) {
+		if (!fgets(buf, sizeof buf, fp)) {
+			adios(ct->c_file, "unable to read");
 		}
+		*strchr(buf, '\n') = '\0';
+		msg = add(concat("\n\t", buf, NULL), msg);
 	}
-
-	/*
-	** Since we will let the Content structure for the
-	** external body substitute for the current content,
-	** we temporarily change its partno (number inside
-	** multipart), so everything looks right.
-	*/
-	p->c_partno = ct->c_partno;
-
-	/* we probably need to check if content is really there */
-	result = store_switch(p);
-
-	p->c_partno = NULL;
-	return result;
+	fclose(fp);
+	advise(NULL, msg);
+	return OK;
 }
 
 
@@ -766,7 +746,7 @@ store_content(CT ct, CT p)
 	** 4) Else if content is "message", use "+" (current folder)
 	** 5) Else use string "%m%P.%s".
 	*/
-	if ((cp = ct->c_storeproc) == NULL || *cp == '\0') {
+	if (!(cp = ct->c_storeproc) || !*cp) {
 		CI ci = &ct->c_ctinfo;
 
 		snprintf(buffer, sizeof(buffer), "%s-store-%s/%s",