X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Finc.c;h=1834c9207124383d573b83e1c59503be92451640;hb=246ca516a0f7b870316116bc184347b0fb2bc00b;hp=186312ed681306b01ba12287f6e0b1170c9f61ff;hpb=714b5c530ece27ea2835a313013f5b770163403c;p=mmh

diff --git a/uip/inc.c b/uip/inc.c
index 186312e..1834c92 100644
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -163,7 +163,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();
@@ -192,7 +192,7 @@ main(int argc, char **argv)
 			case AUDSW:
 				if (!(cp = *argp++) || *cp == '-')
 					adios(NULL, "missing argument to %s", argp[-2]);
-				audfile = getcpy(m_maildir(cp));
+				audfile = getcpy(expanddir(cp));
 				continue;
 			case NAUDSW:
 				audfile = NULL;
@@ -223,7 +223,7 @@ main(int argc, char **argv)
 				if (!(cp = *argp++) || *cp == '-')
 					adios(NULL, "missing argument to %s",
 							argp[-2]);
-				from = path(cp, TFILE);
+				from = getcpy(expanddir(cp));
 
 				/*
 				** If the truncate file is in default state,
@@ -265,7 +265,7 @@ main(int argc, char **argv)
 			if (folder)
 				adios(NULL, "only one folder at a time!");
 			else
-				folder = pluspath(cp);
+				folder = getcpy(expandfol(cp));
 		} else {
 			adios(NULL, "usage: %s [+folder] [switches]",
 					invo_name);
@@ -286,9 +286,9 @@ main(int argc, char **argv)
 	if (from)
 		newmail = from;
 	else if ((newmail = getenv("MAILDROP")) && *newmail)
-		newmail = m_mailpath(newmail);
+		newmail = toabsdir(newmail);
 	else if ((newmail = context_find("maildrop")) && *newmail)
-		newmail = m_mailpath(newmail);
+		newmail = toabsdir(newmail);
 	else {
 		newmail = concat(MAILDIR, "/", MAILFIL, NULL);
 	}
@@ -300,11 +300,9 @@ main(int argc, char **argv)
 
 	newmail = cp;
 
-	if (!context_find("path"))
-		free(path("./", TFOLDER));
 	if (!folder)
-		folder = getfolder(0);
-	maildir = m_maildir(folder);
+		folder = getdeffol();
+	maildir = toabsdir(folder);
 
 	if ((maildir_copy = strdup(maildir)) == (char *)0)
 		adios(maildir, "error allocating memory to copy maildir");
@@ -465,7 +463,7 @@ main(int argc, char **argv)
 	if (incerr < 0) {  /* error */
 		if (locked) {
 			GETGROUPPRIVS();  /* Be sure we can unlock mail file */
-			(void) lkfclose(in, newmail); in = NULL;
+			lkfclose(in, newmail); in = NULL;
 			DROPGROUPPRIVS();  /*
 					** And then return us to normal
 					** privileges
@@ -508,7 +506,7 @@ main(int argc, char **argv)
 	if (msgnum == hghnum) {
 		admonish(NULL, "no messages incorporated");
 	} else {
-		context_replace(pfolder, folder);  /* update current folder */
+		context_replace(curfolder, folder); /* update current folder */
 		if (chgflag)
 			mp->curmsg = hghnum + 1;
 		mp->hghmsg = msgnum;
@@ -523,7 +521,7 @@ main(int argc, char **argv)
 	*/
 	if (locked) {
 		GETGROUPPRIVS();  /* Be sure we can unlock mail file */
-		(void) lkfclose(in, newmail); in = NULL;
+		lkfclose(in, newmail); in = NULL;
 		DROPGROUPPRIVS();  /* And then return us to normal privileges */
 	} else {
 		fclose(in); in = NULL;