X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fanno.c;h=1d27a9e9586e09d29cf3f54385bfbc919fb100f6;hb=363190329760d38060e89956206583831b0d084d;hp=a2cfc849b87cf83af5107939e9e5dedeedcbbafc;hpb=714b5c530ece27ea2835a313013f5b770163403c;p=mmh

diff --git a/uip/anno.c b/uip/anno.c
index a2cfc84..1d27a9e 100644
--- a/uip/anno.c
+++ b/uip/anno.c
@@ -99,7 +99,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();
@@ -198,7 +198,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
 			app_msgarg(&msgs, cp);
 	}
@@ -208,13 +208,11 @@ main(int argc, char **argv)
 		datesw = 0;
 #endif /* UCI */
 
-	if (!context_find("path"))
-		free(path("./", TFOLDER));
 	if (!msgs.size)
 		app_msgarg(&msgs, "cur");
 	if (!folder)
-		folder = getfolder(1);
-	maildir = m_maildir(folder);
+		folder = getcurfol();
+	maildir = toabsdir(folder);
 
 	if (chdir(maildir) == NOTOK)
 		adios(maildir, "unable to change directory to");
@@ -244,7 +242,7 @@ main(int argc, char **argv)
 		}
 	}
 
-	context_replace(pfolder, folder);  /* update current folder  */
+	context_replace(curfolder, folder);  /* update current folder  */
 	seq_setcur(mp, mp->lowsel);  /* update current message */
 	seq_save(mp);  /* synchronize message sequences */
 	folder_free(mp);  /* free folder/message structure */