X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fpick.c;h=e4d1370440d089a26b6f4b2810b551c749d85d02;hb=5b9d883db0318ed2b84bb82dee880d7381f99188;hp=93a240068b4044069aee161b1ad1f608e35b1f16;hpb=240013872c392fe644bd4f79382d9f5314b4ea60;p=mmh diff --git a/uip/pick.c b/uip/pick.c index 93a2400..e4d1370 100644 --- a/uip/pick.c +++ b/uip/pick.c @@ -182,25 +182,22 @@ 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); } vec[vecp] = NULL; - if (!context_find("path")) - free(path("./", TFOLDER)); - /* ** If we didn't specify which messages to search, ** then search the whole folder. */ if (!msgs.size) - app_msgarg(&msgs, "all"); + app_msgarg(&msgs, seq_all); 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"); @@ -291,7 +288,7 @@ main(int argc, char **argv) printf("%d hit%s\n", mp->numsel, mp->numsel == 1 ? "" : "s"); } - context_replace(pfolder, folder); /* update current folder */ + context_replace(curfolder, folder); /* update current folder */ seq_save(mp); /* synchronize message sequences */ context_save(); /* save the context file */ folder_free(mp); /* free folder/message structure */