X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Finc.c;h=2a866e925867497638a42f80b770fd2465aa64e1;hb=d39e2c447b0d163a5a63f480b23d06edb7a73aa0;hp=d23bf32d399bbba9ed86bbecf02cfbce7203f521;hpb=097c84b61603c4a4c5837f3dcc09c30a1e751702;p=mmh

diff --git a/uip/inc.c b/uip/inc.c
index d23bf32..2a866e9 100644
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -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(FDEF);
-	maildir = m_maildir(folder);
+		folder = getdeffol();
+	maildir = toabsdir(folder);
 
 	if ((maildir_copy = strdup(maildir)) == (char *)0)
 		adios(maildir, "error allocating memory to copy maildir");