X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhstore.c;h=971ee7ef0d259175fa9ea43dd00f1cd2e86aa012;hp=2a0ddf9ea0dc7b165479be2d02010c01c075fea4;hb=93fa896ceb5fbebe2f1f6e6e36419a13f8ffd99f;hpb=72795bfcbe9f7fee8927b1a4942c0230b0f857a8

diff --git a/uip/mhstore.c b/uip/mhstore.c
index 2a0ddf9..971ee7e 100644
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -40,6 +40,7 @@ static struct swit switches[] = {
 	{ NULL, 0 }
 };
 
+char *version=VERSION;
 
 /* mhparse.c */
 extern char *tmp;  /* directory to place temp files */
@@ -195,7 +196,7 @@ main(int argc, char **argv)
 				if (!(cp = *argp++) || (*cp == '-' && cp[1]))
 					adios(EX_USAGE, NULL, "missing argument to %s",
 							argp[-2]);
-				file = *cp == '-' ? cp : getcpy(expanddir(cp));
+				file = *cp == '-' ? cp : mh_xstrdup(expanddir(cp));
 				continue;
 
 			case DEBUGSW:
@@ -207,7 +208,7 @@ main(int argc, char **argv)
 			if (folder)
 				adios(EX_USAGE, NULL, "only one folder at a time!");
 			else
-				folder = getcpy(expandfol(cp));
+				folder = mh_xstrdup(expandfol(cp));
 		} else
 			app_msgarg(&msgs, cp);
 	}
@@ -242,7 +243,7 @@ main(int argc, char **argv)
 	/*
 	** Cache the current directory before we do any chdirs()'s.
 	*/
-	cwd = getcpy(pwd());
+	cwd = mh_xstrdup(pwd());
 
 	/*
 	** Check for storage directory.  If specified,
@@ -252,7 +253,7 @@ main(int argc, char **argv)
 	if ((cp = context_find(nmhstorage)) && *cp)
 		tmp = concat(cp, "/", invo_name, NULL);
 	else
-		tmp = getcpy(toabsdir(invo_name));
+		tmp = mh_xstrdup(toabsdir(invo_name));
 
 	if (file && msgs.size)
 		adios(EX_USAGE, NULL, "cannot specify msg and file at same time!");
@@ -261,8 +262,7 @@ main(int argc, char **argv)
 	** check if message is coming from file
 	*/
 	if (file) {
-		if (!(cts = (CT *) mh_xcalloc((size_t) 2, sizeof(*cts))))
-			adios(EX_OSERR, NULL, "out of memory");
+		cts = mh_xcalloc(2, sizeof(*cts));
 		ctp = cts;
 
 		if ((ct = parse_mime(file)))
@@ -292,11 +292,8 @@ main(int argc, char **argv)
 		for (msgnum = 0; msgnum < msgs.size; msgnum++)
 			if (!m_convert(mp, msgs.msgs[msgnum]))
 				exit(EX_USAGE);
-		seq_setprev(mp);  /* set the previous-sequence */
 
-		if (!(cts = (CT *) mh_xcalloc((size_t) (mp->numsel + 1),
-				sizeof(*cts))))
-			adios(EX_OSERR, NULL, "out of memory");
+		cts = mh_xcalloc(mp->numsel + 1, sizeof(*cts));
 		ctp = cts;
 
 		for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
@@ -341,8 +338,7 @@ main(int argc, char **argv)
 	for (ctp = cts; *ctp; ctp++)
 		free_content(*ctp);
 
-	free((char *) cts);
-	cts = NULL;
+	mh_free0(&cts);
 
 	/* If reading from a folder, do some updating */
 	if (mp) {
@@ -386,9 +382,9 @@ store_all_messages(CT *cts)
 	** store any contents.
 	*/
 	if ((cp = context_find(nmhstorage)) && *cp)
-		dir = getcpy(cp);
+		dir = mh_xstrdup(cp);
 	else
-		dir = getcpy(cwd);
+		dir = mh_xstrdup(cwd);
 
 	for (ctp = cts; *ctp; ctp++) {
 		ct = *ctp;
@@ -472,7 +468,7 @@ store_switch(CT ct)
 static int
 store_generic(CT ct)
 {
-	char **ap, **vp, *cp;
+	char **ap, **vp, *cp, *filename;
 	CI ci = &ct->c_ctinfo;
 
 	/*
@@ -481,6 +477,18 @@ store_generic(CT ct)
 	** (only the "message" subtype "rfc822" will use store_generic).
 	*/
 	if (autosw && ct->c_type != CT_MESSAGE) {
+		/* First check for "filename" in Content-Disposition header */
+		filename = extract_name_value("filename", ct->c_dispo);
+		if (filename && strcmp(filename, ct->c_dispo)!=0) {
+			/* We found "filename" */
+			cp = mhbasename(filename);
+			if (*cp && *cp!='.' && *cp!='|' && *cp!='!' &&
+					!strchr(cp, '%')) {
+				/* filename looks good: use it */
+				ct->c_storeproc = mh_xstrdup(cp);
+				goto finished;
+			}
+		}
 		/*
 		** Check the attribute/value pairs, for the attribute "name".
 		** If found, take the basename, do a few sanity checks and
@@ -494,12 +502,13 @@ store_generic(CT ct)
 			if (*cp && *cp!='.' && *cp!='|' && *cp!='!' &&
 					!strchr(cp, '%')) {
 				/* filename looks good: use it */
-				ct->c_storeproc = getcpy(cp);
+				ct->c_storeproc = mh_xstrdup(cp);
 			}
 			break;
 		}
 	}
 
+finished:
 	return store_content(ct, NULL);
 }
 
@@ -570,8 +579,7 @@ store_partial(CT ct)
 		return NOTOK;
 	}
 
-	if ((base = (CT *) calloc((size_t) (i + 1), sizeof(*base))) == NULL)
-		adios(EX_OSERR, NULL, "out of memory");
+	base = mh_xcalloc(i + 1, sizeof(*base));
 
 	ctq = base;
 	for (ctp = cts; *ctp; ctp++) {
@@ -617,7 +625,7 @@ missing_part:
 	ct = *ctq++;
 	if (store_content(ct, NULL) == NOTOK) {
 losing:
-		free((char *) base);
+		mh_free0(&base);
 		return NOTOK;
 	}
 
@@ -627,7 +635,7 @@ losing:
 			goto losing;
 	}
 
-	free((char *) base);
+	mh_free0(&base);
 	return OK;
 }
 
@@ -733,11 +741,11 @@ store_content(CT ct, CT p)
 		*/
 		if (p) {
 			appending = 1;
-			ct->c_storage = getcpy(p->c_storage);
+			ct->c_storage = mh_xstrdup(p->c_storage);
 
 			/* record the folder name */
 			if (p->c_folder) {
-				ct->c_folder = getcpy(p->c_folder);
+				ct->c_folder = mh_xstrdup(p->c_folder);
 			}
 			goto got_filename;
 		}
@@ -777,11 +785,11 @@ store_content(CT ct, CT p)
 
 		/* Store content in temporary file for now */
 		tmpfilenam = m_mktemp(invo_name, NULL, NULL);
-		ct->c_storage = getcpy(tmpfilenam);
+		ct->c_storage = mh_xstrdup(tmpfilenam);
 
 		/* Get the folder name */
 		if (cp[1])
-			folder = getcpy(expandfol(cp));
+			folder = mh_xstrdup(expandfol(cp));
 		else
 			folder = getcurfol();
 
@@ -789,10 +797,10 @@ store_content(CT ct, CT p)
 		create_folder(toabsdir(folder), 0, exit);
 
 		/* Record the folder name */
-		ct->c_folder = getcpy(folder);
+		ct->c_folder = mh_xstrdup(folder);
 
 		if (cp[1])
-			free(folder);
+			mh_free0(&folder);
 
 		goto got_filename;
 	}
@@ -811,7 +819,7 @@ store_content(CT ct, CT p)
 		return show_content_aux(ct, 0, buffer + 1, dir);
 
 	/* record the filename */
-	ct->c_storage = getcpy(buffer);
+	ct->c_storage = mh_xstrdup(buffer);
 
 got_filename:
 	/* flush the output stream */