X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fscan.c;h=1276d5b17b6bfad3e55f3f8fbf202df9cf23ba2f;hp=80addfccbed6dceeb9effd6753f0d426a95f56c6;hb=d39e2c447b0d163a5a63f480b23d06edb7a73aa0;hpb=6e8aba3714fe8ffc21dbb75ea9efdc41ab87b07f

diff --git a/uip/scan.c b/uip/scan.c
index 80addfc..1276d5b 100644
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -143,8 +143,8 @@ main(int argc, char **argv)
 				case FILESW:
 					if (!(cp = *argp++) || (cp[0] == '-' && cp[1]))
 						adios(NULL, "missing argument to %s", argp[-2]);
-					if (strcmp(file = cp, "-"))
-						file = path(cp, TFILE);
+					if (strcmp(file = cp, "-")!=0)
+						file = getcpy(expanddir(cp));
 					continue;
 			}
 		}
@@ -152,9 +152,9 @@ main(int argc, char **argv)
 			if (folder)
 				adios(NULL, "only one folder at a time!");
 			else
-				folder = pluspath(cp);
+				folder = getcpy(expandfol(cp));
 		} else
-				app_msgarg(&msgs, cp);
+			app_msgarg(&msgs, cp);
 	}
 
 	/*
@@ -175,9 +175,8 @@ main(int argc, char **argv)
 		if (strcmp(file, "-") == 0) {
 			in = stdin;
 			file = "stdin";
-		} else {
-			if ((in = fopen(file, "r")) == NULL)
-				adios(file, "unable to open");
+		} else if (!(in = fopen(file, "r"))) {
+			adios(file, "unable to open");
 		}
 
 #ifndef JLR
@@ -204,8 +203,8 @@ main(int argc, char **argv)
 	if (!msgs.size)
 		app_msgarg(&msgs, "all");
 	if (!folder)
-		folder = getfolder(FCUR);
-	maildir = m_maildir(folder);
+		folder = getcurfol();
+	maildir = toabsdir(folder);
 
 	if (chdir(maildir) == NOTOK)
 		adios(maildir, "unable to change directory to");