X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fsortm.c;h=9e8da9f6227d3fbed516da4fac74d0e484d6622b;hb=2337d83d410d6a64ad7707fe7f093fc654f66e4f;hp=5faec79aeb2851329c664e27eb5f9dafda8ac4f4;hpb=174d375bb4b9bcaa0c3f28c422216f68703494a8;p=mmh

diff --git a/uip/sortm.c b/uip/sortm.c
index 5faec79..9e8da9f 100644
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -2,8 +2,6 @@
 /*
  * sortm.c -- sort messages in a folder by date/time
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
@@ -47,7 +45,7 @@ static struct smsg *smsgs;
 int nmsgs;
 
 char *subjsort = (char *) 0;    /* sort on subject if != 0 */
-unsigned long datelimit = 0;
+time_t datelimit = 0;
 int submajor = 0;		/* if true, sort on subject-major */
 int verbose;
 
@@ -70,7 +68,8 @@ int
 main (int argc, char **argv)
 {
     int	i, msgnum;
-    char *cp, *maildir, *datesw = NULL;
+    unsigned char *cp;
+    char *maildir, *datesw = NULL;
     char *folder = NULL, buf[BUFSIZ], **argp;
     char **arguments;
     struct msgs_array msgs = { 0, 0, NULL };
@@ -160,7 +159,7 @@ main (int argc, char **argv)
 	    if (folder)
 		adios (NULL, "only one folder at a time!");
 	    else
-		folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+		folder = pluspath (cp);
 	} else
 		app_msgarg(&msgs, cp);
     }
@@ -284,7 +283,8 @@ main (int argc, char **argv)
     seq_save (mp);			/* synchronize message sequences */
     context_save ();			/* save the context file         */
     folder_free (mp);			/* free folder/message structure */
-    return done (0);
+    done (0);
+    return 1;
 }
 
 static int
@@ -408,7 +408,8 @@ get_fields (char *datesw, int msg, struct smsg *smsg)
 	     * leading "re:", everything but letters & smash
 	     * letters to lower case.
 	     */
-	    register char  *cp, *cp2, c;
+	    register char  *cp, *cp2;
+	    register unsigned char c;
 
 	    cp = subjcomp;
 	    cp2 = subjcomp;