X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhparse.c;h=6553ac35ff8c6f83055544310bb0b2abfb805062;hp=db6f0ad92449f5427601c51aceaa885c3ff04252;hb=240013872c392fe644bd4f79382d9f5314b4ea60;hpb=714b5c530ece27ea2835a313013f5b770163403c

diff --git a/uip/mhparse.c b/uip/mhparse.c
index db6f0ad..6553ac3 100644
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -946,11 +946,11 @@ bad_quote:
 			/*
 			** If there is a Content-Disposition header and
 			** it doesn't have a *filename=, extract it from
-			** the magic contents.  The r1bindex call skips
+			** the magic contents.  The mhbasename call skips
 			** any leading directory components.
 			*/
 			if (ct->c_dispo)
-				ct->c_dispo = incl_name_value(ct->c_dispo, "filename", r1bindex(extract_name_value("name", ci->ci_magic), '/'));
+				ct->c_dispo = incl_name_value(ct->c_dispo, "filename", mhbasename(extract_name_value("name", ci->ci_magic)));
 			} else
 				advise(NULL, "extraneous information in message %s's %s: field\n%*.*s(%s)", ct->c_file, TYPE_FIELD, i, i, "", cp);
 	}
@@ -2603,7 +2603,7 @@ openFTP(CT ct, char **file)
 		char *vec[9];
 
 		vecp = 0;
-		vec[vecp++] = r1bindex(ftp, '/');
+		vec[vecp++] = mhbasename(ftp);
 		vec[vecp++] = e->eb_site;
 		vec[vecp++] = user;
 		vec[vecp++] = pass;
@@ -2757,7 +2757,7 @@ openMail(CT ct, char **file)
 		return NOTOK;
 
 	vecp = 0;
-	vec[vecp++] = r1bindex(mailproc, '/');
+	vec[vecp++] = mhbasename(mailproc);
 	vec[vecp++] = e->eb_server;
 	vec[vecp++] = "-subject";
 	vec[vecp++] = e->eb_subject ? e->eb_subject : "mail-server request";