X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fsortm.c;h=734b63b9ecb9e8cacf37269aa72aba5a59d4999a;hp=59247c2b360c5f2c62b3398c2f91dc134ff3fc17;hb=2abb9a7cfb0930e27062088734d306e7d78e4cc2;hpb=7e3bc577e84e13a47005a706718bd6ec0e6a0e0a

diff --git a/uip/sortm.c b/uip/sortm.c
index 59247c2..734b63b 100644
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -9,6 +9,14 @@
 #include <h/mh.h>
 #include <h/tws.h>
 #include <h/utils.h>
+#include <unistd.h>
+#include <ctype.h>
+#include <sys/stat.h>
+#include <locale.h>
+
+#ifdef HAVE_SYS_PARAM_H
+# include <sys/param.h>
+#endif
 
 static struct swit switches[] = {
 #define DATESW  0
@@ -16,20 +24,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 }
 };
@@ -44,7 +50,7 @@ static struct smsg *smsgs;
 int nmsgs;
 
 char *subjsort = NULL;  /* sort on subject if != 0 */
-unsigned long datelimit = 0;
+time_t datelimit = 0;
 int submajor = 0;  /* if true, sort on subject-major */
 int verbose;
 
@@ -75,9 +81,7 @@ main(int argc, char **argv)
 	struct msgs *mp;
 	struct smsg **dlist;
 
-#ifdef LOCALE
 	setlocale(LC_ALL, "");
-#endif
 	invo_name = mhbasename(argv[0]);
 
 	/* read user profile/context */
@@ -94,17 +98,17 @@ main(int argc, char **argv)
 			switch (smatch(++cp, switches)) {
 			case AMBIGSW:
 				ambigsw(cp, switches);
-				done(1);
+				exit(1);
 			case UNKWNSW:
 				adios(NULL, "-%s unknown", cp);
 
 			case HELPSW:
 				snprintf(buf, sizeof(buf), "%s [+folder] [msgs] [switches]", invo_name);
 				print_help(buf, switches, 1);
-				done(1);
+				exit(0);
 			case VERSIONSW:
 				print_version(invo_name);
-				done(1);
+				exit(0);
 
 			case DATESW:
 				if (datesw)
@@ -122,9 +126,6 @@ main(int argc, char **argv)
 							argp[-2]);
 				continue;
 
-			case SUBJSW:
-				subjsort = "subject";
-				continue;
 			case NSUBJSW:
 				subjsort = NULL;
 				continue;
@@ -165,7 +166,7 @@ main(int argc, char **argv)
 	}
 
 	if (!msgs.size)
-		app_msgarg(&msgs, "all");
+		app_msgarg(&msgs, seq_all);
 	if (!datesw)
 		datesw = "date";
 	if (!folder)
@@ -186,7 +187,7 @@ main(int argc, char **argv)
 	/* parse all the message ranges/sequences and set SELECTED */
 	for (msgnum = 0; msgnum < msgs.size; msgnum++)
 		if (!m_convert(mp, msgs.msgs[msgnum]))
-			done(1);
+			exit(1);
 	seq_setprev(mp);  /* set the previous sequence */
 
 	if ((nmsgs = read_hdrs(mp, datesw)) <= 0)
@@ -281,8 +282,7 @@ main(int argc, char **argv)
 	seq_save(mp);  /* synchronize message sequences */
 	context_save();  /* save the context file */
 	folder_free(mp);  /* free folder/message structure */
-	done(0);
-	return 1;
+	return 0;
 }
 
 static int