X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fsend.c;h=051e357cf6284a878d7a2328d3fb78dbdced0e48;hb=f387b393dfab5cb5c00974b1807e8633531e0774;hp=2416baf99f487e3dfa05b43669f18ccc1ab0769f;hpb=714b5c530ece27ea2835a313013f5b770163403c;p=mmh

diff --git a/uip/send.c b/uip/send.c
index 2416baf..051e357 100644
--- a/uip/send.c
+++ b/uip/send.c
@@ -109,7 +109,7 @@ main(int argc, char **argv)
 	char *msgs[MAXARGS], *vec[MAXARGS];
 	struct msgs *mp;
 	struct stat st;
-	char *attach = (char *)0;  /* header field name for attachments */
+	char *attach = NULL;  /* header field name for attachments */
 	int attachformat = 0; /* mhbuild format specifier for attachments */
 #ifdef UCI
 	FILE *fp;
@@ -118,7 +118,7 @@ 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();
@@ -127,7 +127,7 @@ main(int argc, char **argv)
 	argp = arguments;
 
 	vec[vecp++] = "-library";
-	vec[vecp++] = getcpy(m_maildir(""));
+	vec[vecp++] = getcpy(toabsdir("+"));
 
 	while ((cp = *argp++)) {
 		if (*cp == '-') {
@@ -257,12 +257,9 @@ main(int argc, char **argv)
 		}
 	}
 
-	if (!context_find("path"))
-		free(path("./", TFOLDER));
-
 	if (!msgp)
 		msgs[msgp++] = "cur";
-	maildir = m_maildir(draftfolder);
+	maildir = toabsdir(draftfolder);
 
 	if (chdir(maildir) == NOTOK)
 		adios(maildir, "unable to change directory to");
@@ -361,7 +358,7 @@ main(int argc, char **argv)
 		push();
 
 	status = 0;
-	vec[0] = r1bindex(postproc, '/');
+	vec[0] = mhbasename(postproc);
 	closefds(3);
 
 	for (msgnum = 0; msgnum < msgp; msgnum++) {