X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/ec18722d02bd307bd09f30715dc8ba4e1b8a6716..f1049604f9c88b9c8470bff8baee72414b724a9a:/uip/sortm.c

diff --git a/uip/sortm.c b/uip/sortm.c
index 3ebb5325..2e2809a2 100644
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -8,7 +8,7 @@
 #include <h/mh.h>
 #include <h/tws.h>
 #include <h/utils.h>
-#include "../sbr/m_maildir.h"
+#include "sbr/m_maildir.h"
 
 #define SORTM_SWITCHES \
     X("datefield field", 0, DATESW) \
@@ -43,7 +43,7 @@ struct smsg {
 static struct smsg *smsgs;
 int nmsgs;
 
-char *subjsort = (char *) 0;    /* sort on subject if != 0 */
+char *subjsort;                 /* sort on subject if != 0 */
 time_t datelimit = 0;
 int submajor = 0;		/* if true, sort on subject-major */
 int verbose;
@@ -167,10 +167,9 @@ main (int argc, char **argv)
 	if (*cp == '+' || *cp == '@') {
 	    if (folder)
 		adios (NULL, "only one folder at a time!");
-	    else
-		folder = pluspath (cp);
+            folder = pluspath (cp);
 	} else
-		app_msgarg(&msgs, cp);
+            app_msgarg(&msgs, cp);
     }
 
     if (!context_find ("path"))
@@ -391,8 +390,8 @@ get_fields (char *datesw, int msg, struct smsg *smsg)
 		      msg, compnum);
 		check_failed = 1;
 	    }
-            mh_xfree(datecomp);
-            mh_xfree(subjcomp);
+            free(datecomp);
+            free(subjcomp);
 	    fclose (in);
 	    return (0);
 
@@ -454,7 +453,7 @@ get_fields (char *datesw, int msg, struct smsg *smsg)
 	smsg->s_subj = subjcomp;
     }
     fclose (in);
-    mh_xfree(datecomp);
+    free(datecomp);
 
     return (1);
 }