X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fsortm.c;h=4cd999d8f3d2234dba9156601752ac9f07048c21;hp=a5d0e118cb164fb8fac30aa06ea75f5a74294c03;hb=5f2b39344cca1086c975d47b730929d8f1904214;hpb=714b5c530ece27ea2835a313013f5b770163403c

diff --git a/uip/sortm.c b/uip/sortm.c
index a5d0e11..4cd999d 100644
--- 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;
 
@@ -78,7 +76,7 @@ main(int argc, char **argv)
 #ifdef LOCALE
 	setlocale(LC_ALL, "");
 #endif
-	invo_name = r1bindex(argv[0], '/');
+	invo_name = mhbasename(argv[0]);
 
 	/* read user profile/context */
 	context_read();
@@ -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:
@@ -159,20 +154,18 @@ 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);
 	}
 
-	if (!context_find("path"))
-		free(path("./", TFOLDER));
 	if (!msgs.size)
-		app_msgarg(&msgs, "all");
+		app_msgarg(&msgs, seq_all);
 	if (!datesw)
 		datesw = "date";
 	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");
@@ -279,7 +272,7 @@ main(int argc, char **argv)
 
 	rename_msgs(mp, dlist);
 
-	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 */
@@ -564,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);
 
@@ -581,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)