Renamed -version switch to -Version to remove the conflict with -verbose.

[mmh] / uip / mark.c

diff --git a/uip/mark.c b/uip/mark.c
index fa5c2cb..3818c29 100644 (file)
--- a/uip/mark.c
+++ b/uip/mark.c
@@ -29,7 +29,7 @@ static struct swit switches[] = {
 #define NZEROSW  7
        { "nozero", 0 },
 #define VERSIONSW  8
-       { "version", 0 },
+       { "Version", 0 },
 #define HELPSW  9
        { "help", 0 },
 #define DEBUGSW  10
@@ -48,8 +48,8 @@ int
 main(int argc, char **argv)
 {
        int addsw = 0, deletesw = 0, debugsw = 0;
-       int listsw = 0, publicsw = -1, zerosw = 0;
-       int seqp = 0, msgnum;
+       int listsw = 0, publicsw = -1, zerosw = 0, msgnum;
+       unsigned int seqp = 0;
        char *cp, *maildir, *folder = NULL, buf[BUFSIZ];
        char **argp, **arguments;
        char *seqs[NUMATTRS + 1];
@@ -134,9 +134,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);
        }
 
        /*
@@ -151,13 +151,11 @@ main(int argc, char **argv)
                        listsw++;
        }
 
-       if (!context_find("path"))
-               free(path("./", TFOLDER));
        if (!msgs.size)
-               app_msgarg(&msgs, listsw ? "all" :"cur");
+               app_msgarg(&msgs, listsw ? seq_all : seq_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");
@@ -223,7 +221,7 @@ main(int argc, char **argv)
        }
 
        seq_save(mp);  /* synchronize message sequences */
-       context_replace(pfolder, folder);  /* update current folder */
+       context_replace(curfolder, folder);  /* update current folder */
        context_save();  /* save the context file */
        folder_free(mp);  /* free folder/message structure */
        done(0);