Require at least 2 chars for `no' variants of switches.

[mmh] / uip / sortm.c

diff --git a/uip/sortm.c b/uip/sortm.c
index 0caab30..4cd999d 100644 (file)
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -16,20 +16,18 @@ static struct swit switches[] = {
 #define TEXTSW  1
         { "textfield field", 0 },
 #define NSUBJSW  2
-        { "notextfield", 0 },
-#define SUBJSW  3
-        { "subject", -3 },  /* backward-compatibility */
-#define LIMSW  4
+        { "notextfield", 2 },
+#define LIMSW  3
         { "limit days", 0 },
-#define NLIMSW  5
-        { "nolimit", 0 },
-#define VERBSW  6
+#define NLIMSW  4
+        { "nolimit", 2 },
+#define VERBSW  5
         { "verbose", 0 },
-#define NVERBSW  7
-        { "noverbose", 0 },
-#define VERSIONSW  8
-        { "version", 0 },
-#define HELPSW  9
+#define NVERBSW  6
+        { "noverbose", 2 },
+#define VERSIONSW  7
+        { "Version", 0 },
+#define HELPSW  8
         { "help", 0 },
         { NULL, 0 }
 };
@@ -43,8 +41,8 @@ struct smsg {
 static struct smsg *smsgs;
 int nmsgs;
 
-char *subjsort = (char *) 0;  /* sort on subject if != 0 */
-unsigned long datelimit = 0;
+char *subjsort = NULL;  /* sort on subject if != 0 */
+time_t datelimit = 0;
 int submajor = 0;  /* if true, sort on subject-major */
 int verbose;
 
@@ -122,11 +120,8 @@ main(int argc, char **argv)
                                                        argp[-2]);
                                continue;
 
-                       case SUBJSW:
-                               subjsort = "subject";
-                               continue;
                        case NSUBJSW:
-                               subjsort = (char *)0;
+                               subjsort = NULL;
                                continue;
 
                        case LIMSW:
@@ -165,7 +160,7 @@ main(int argc, char **argv)
        }
 
        if (!msgs.size)
-               app_msgarg(&msgs, "all");
+               app_msgarg(&msgs, seq_all);
        if (!datesw)
                datesw = "date";
        if (!folder)
@@ -562,8 +557,8 @@ rename_msgs(struct msgs *mp, struct smsg **mlist)
                ** messages in the folder.
                */
 
-               (void)snprintf(f1, sizeof (f1), "%s/%d", mp->foldpath, old);
-               (void)snprintf(newbuf, sizeof (newbuf), "%s/%d",
+               snprintf(f1, sizeof (f1), "%s/%d", mp->foldpath, old);
+               snprintf(newbuf, sizeof (newbuf), "%s/%d",
                                mp->foldpath, mp->hghmsg + 1);
                ext_hook("ref-hook", f1, newbuf);
 
@@ -579,7 +574,7 @@ rename_msgs(struct msgs *mp, struct smsg **mlist)
                ** to the real place.
                */
 
-               (void)snprintf(f1, sizeof (f1), "%s/%d", mp->foldpath, new);
+               snprintf(f1, sizeof (f1), "%s/%d", mp->foldpath, new);
                ext_hook("ref-hook", newbuf, f1);
 
                if (rename(tmpfil, m_name(new)) == NOTOK)