Finished replacing mh_strcasecmp() with strcasecmp(). Removed

[nmh] / uip / sortm.c

diff --git a/uip/sortm.c b/uip/sortm.c
index 68132989061c6c40ba3524d8ed35216eaea1b29d..452b774abbce9359aff5927bb0170f0fec2ea3dd 100644 (file)
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -70,8 +70,7 @@ int
 main (int argc, char **argv)
 {
     int        i, msgnum;
 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 };
     char *folder = NULL, buf[BUFSIZ], **argp;
     char **arguments;
     struct msgs_array msgs = { 0, 0, NULL };


@@ -141,7 +140,7 @@ main (int argc, char **argv)
                    submajor++;         /* sort subject-major */
                    continue;
                }
                    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;
                    adios (NULL, "impossible limit %s", cp);
                datelimit *= 60*60*24;
                continue;


@@ -200,7 +199,7 @@ main (int argc, char **argv)
        adios (maildir, "unable to change directory to");
 
     /* read folder and create message structure */
        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 */
        adios (NULL, "unable to read folder %s", folder);
 
     /* check for empty folder */


@@ -369,7 +368,7 @@ get_fields (char *datesw, int msg, struct smsg *smsg)
        case FLD:
        case FLDPLUS:
            compnum++;
        case FLD:
        case FLDPLUS:
            compnum++;

-           if (!mh_strcasecmp (nam, datesw)) {
+           if (!strcasecmp (nam, datesw)) {

                datecomp = add (buf, datecomp);
                while (state == FLDPLUS) {
                    bufsz = sizeof buf;
                datecomp = add (buf, datecomp);
                while (state == FLDPLUS) {
                    bufsz = sizeof buf;


@@ -378,7 +377,7 @@ get_fields (char *datesw, int msg, struct smsg *smsg)
                }
                if (!subjsort || subjcomp)
                    break;
                }
                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;
                subjcomp = add (buf, subjcomp);
                while (state == FLDPLUS) {
                    bufsz = sizeof buf;


@@ -446,14 +445,13 @@ get_fields (char *datesw, int msg, struct smsg *smsg)
             * leading "re:", everything but letters & smash
             * letters to lower case.
             */
             * 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)) {
 
            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
                        if(uprf(cp, "re:"))
                            cp += 2;
                        else


@@ -464,8 +462,9 @@ get_fields (char *datesw, int msg, struct smsg *smsg)
            }
 
            while ((c = *cp++)) {
            }
 
            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';
            }
 
            *cp2 = '\0';