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

diff --git a/uip/sortm.c b/uip/sortm.c
index 68132989..0b8e1853 100644
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -70,8 +70,7 @@ int
 main (int argc, char **argv)
 {
     int	i, msgnum;
-    unsigned char *cp;
-    char *maildir, *datesw = NULL;
+    char *cp, *maildir, *datesw = NULL;
     char *folder = NULL, buf[BUFSIZ], **argp;
     char **arguments;
     struct msgs_array msgs = { 0, 0, NULL };
@@ -79,13 +78,7 @@ main (int argc, char **argv)
     struct smsg **dlist;
     int checksw = 0;
 
-#ifdef LOCALE
-    setlocale(LC_ALL, "");
-#endif
-    invo_name = r1bindex (argv[0], '/');
-
-    /* read user profile/context */
-    context_read();
+    if (nmh_init(argv[0], 1)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
@@ -141,7 +134,7 @@ main (int argc, char **argv)
 		    submajor++;		/* sort subject-major */
 		    continue;
 		}
-		if (!isdigit(*cp) || !(datelimit = atoi(cp)))
+		if (!isdigit((unsigned char) *cp) || !(datelimit = atoi(cp)))
 		    adios (NULL, "impossible limit %s", cp);
 		datelimit *= 60*60*24;
 		continue;
@@ -200,7 +193,7 @@ main (int argc, char **argv)
 	adios (maildir, "unable to change directory to");
 
     /* read folder and create message structure */
-    if (!(mp = folder_read (folder)))
+    if (!(mp = folder_read (folder, 1)))
 	adios (NULL, "unable to read folder %s", folder);
 
     /* check for empty folder */
@@ -260,7 +253,7 @@ main (int argc, char **argv)
 	 * the collection of messages with the same subj
 	 * given a message number.
 	 */
-	il = (struct smsg ***) calloc (mp->hghsel+1, sizeof(*il));
+	il = (struct smsg ***) mh_xcalloc (mp->hghsel+1, sizeof(*il));
 	if (! il)
 	    adios (NULL, "couldn't allocate msg list");
 	for (i = 0; i < nmsgs; i++)
@@ -294,6 +287,7 @@ main (int argc, char **argv)
 	    }
 	}
 	*fp = 0;
+	free (il);
 	free (slist);
 	free (dlist);
 	dlist = flist;
@@ -324,7 +318,7 @@ read_hdrs (struct msgs *mp, char *datesw)
     twscopy (&tb, dlocaltimenow ());
 
     smsgs = (struct smsg *)
-	calloc ((size_t) (mp->hghsel - mp->lowsel + 2),
+	mh_xcalloc ((size_t) (mp->hghsel - mp->lowsel + 2),
 	    sizeof(*smsgs));
     if (smsgs == NULL)
 	adios (NULL, "unable to allocate sort storage");
@@ -369,7 +363,7 @@ get_fields (char *datesw, int msg, struct smsg *smsg)
 	case FLD:
 	case FLDPLUS:
 	    compnum++;
-	    if (!mh_strcasecmp (nam, datesw)) {
+	    if (!strcasecmp (nam, datesw)) {
 		datecomp = add (buf, datecomp);
 		while (state == FLDPLUS) {
 		    bufsz = sizeof buf;
@@ -378,7 +372,7 @@ get_fields (char *datesw, int msg, struct smsg *smsg)
 		}
 		if (!subjsort || subjcomp)
 		    break;
-	    } else if (subjsort && !mh_strcasecmp (nam, subjsort)) {
+	    } else if (subjsort && !strcasecmp (nam, subjsort)) {
 		subjcomp = add (buf, subjcomp);
 		while (state == FLDPLUS) {
 		    bufsz = sizeof buf;
@@ -446,14 +440,13 @@ get_fields (char *datesw, int msg, struct smsg *smsg)
 	     * leading "re:", everything but letters & smash
 	     * letters to lower case.
 	     */
-	    register char  *cp, *cp2;
-	    register unsigned char c;
+	    register char  *cp, *cp2, c;
 
 	    cp = subjcomp;
 	    cp2 = subjcomp;
 	    if (strcmp (subjsort, "subject") == 0) {
 		while ((c = *cp)) {
-		    if (! isspace(c)) {
+		    if (! isspace((unsigned char) c)) {
 			if(uprf(cp, "re:"))
 			    cp += 2;
 			else
@@ -464,8 +457,9 @@ get_fields (char *datesw, int msg, struct smsg *smsg)
 	    }
 
 	    while ((c = *cp++)) {
-		if (isalnum(c))
-		    *cp2++ = isupper(c) ? tolower(c) : c;
+		if (isascii((unsigned char) c) && isalnum((unsigned char) c))
+		    *cp2++ = isupper((unsigned char) c) ?
+		    			tolower((unsigned char) c) : c;
 	    }
 
 	    *cp2 = '\0';
@@ -566,7 +560,7 @@ static void
 rename_msgs (struct msgs *mp, struct smsg **mlist)
 {
     int i, j, old, new;
-    seqset_t tmpset;
+    bvector_t tmpset = bvector_create (0);
     char f1[BUFSIZ], tmpfil[BUFSIZ];
     char newbuf[PATH_MAX + 1];
     struct smsg *sp;
@@ -606,7 +600,7 @@ rename_msgs (struct msgs *mp, struct smsg **mlist)
 	if (rename (f1, tmpfil) == NOTOK)
 	    adios (tmpfil, "unable to rename %s to ", f1);
 
-	get_msg_flags (mp, &tmpset, old);
+	get_msg_flags (mp, tmpset, old);
 
 	rename_chain (mp, mlist, j, i);
 
@@ -621,7 +615,9 @@ rename_msgs (struct msgs *mp, struct smsg **mlist)
 	if (rename (tmpfil, m_name(new)) == NOTOK)
 	    adios (m_name(new), "unable to rename %s to", tmpfil);
 
-	set_msg_flags (mp, &tmpset, new);
+	set_msg_flags (mp, tmpset, new);
 	mp->msgflags |= SEQMOD;
     }
+
+    bvector_free (tmpset);
 }