Removed support for UUCP bang path addresses.

[mmh] / sbr / fmt_scan.c

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index 4f9bce0..f26b02b 100644 (file)
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -31,10 +31,6 @@
 
 extern char *formataddr();  /* hook for custom address formatting */
 
-#ifdef LBL
-struct msgs *fmt_current_folder; /* current folder (set by main program) */
-#endif
-
 extern int fmt_norm;  /* defined in sbr/fmt_def.c = AD_NAME */
 struct mailname fmt_mnull;
 
@@ -57,32 +53,17 @@ match(char *str, char *sub)
        int c1, c2;
        char *s1, *s2;
 
-#ifdef LOCALE
-       while ((c1 = *sub)) {
-               c1 = (isalpha(c1) && isupper(c1)) ? tolower(c1) : c1;
-               while ((c2 = *str++) && c1 != ((isalpha(c2) && isupper(c2)) ? tolower(c2) : c2))
-                       ;
-               if (! c2)
-                       return 0;
-               s1 = sub + 1; s2 = str;
-               while ((c1 = *s1++) && ((isalpha(c1) && isupper(c1)) ? tolower(c1) : c1) == ((isalpha(c2 =*s2++) && isupper(c2)) ? tolower(c2) : c2))
-                       ;
-               if (! c1)
-                       return 1;
-       }
-#else
        while ((c1 = *sub)) {
-               while ((c2 = *str++) && (c1 | 040) != (c2 | 040))
+               while ((c2 = *str++) && tolower(c1) != tolower(c2))
                        ;
                if (! c2)
                        return 0;
                s1 = sub + 1; s2 = str;
-               while ((c1 = *s1++) && (c1 | 040) == (*s2++ | 040))
+               while ((c1 = *s1++) && tolower(c1) == tolower(*s2++))
                        ;
                if (! c1)
                        return 1;
        }
-#endif
        return 1;
 }
 
@@ -217,12 +198,7 @@ cpstripped(char **start, char *end, char *str)
                return;
 
        /* skip any initial control characters or spaces */
-       while ((c = (unsigned char) *s) &&
-#ifdef LOCALE
-                       (iscntrl(c) || isspace(c)))
-#else
-                       (c <= 32))
-#endif
+       while ((c = (unsigned char) *s) && (iscntrl(c) || isspace(c)))
                s++;
 
        /* compact repeated control characters and spaces into a single space */
@@ -231,11 +207,7 @@ cpstripped(char **start, char *end, char *str)
                        *(*start)++ = c;
                else {
                        while ((c = (unsigned char) *s) &&
-#ifdef LOCALE
-                               (iscntrl(c) || isspace(c)))
-#else
-                               (c <= 32))
-#endif
+                                       (iscntrl(c) || isspace(c)))
                                s++;
                        *(*start)++ = ' ';
                }
@@ -706,15 +678,9 @@ fmt_scan(struct format *format, char *scanl, int width, int *dat)
                                        case LOCALHOST:
                                                str = mn->m_mbox;
                                                break;
-                                       case UUCPHOST:
-                                               snprintf(buffer, sizeof(buffer), "%s!%s",
-                                                       mn->m_host, mn->m_mbox);
-                                               str = buffer;
-                                               break;
                                        default:
                                                if (mn->m_mbox) {
-                                                       snprintf(buffer, sizeof(buffer), "%s@%s",
-                                                               mn->m_mbox, mn->m_host);
+                                                       snprintf(buffer, sizeof(buffer), "%s@%s", mn->m_mbox, mn->m_host);
                                                        str= buffer;
                                                } else
                                                        str = mn->m_text;
@@ -902,28 +868,17 @@ fmt_scan(struct format *format, char *scanl, int width, int *dat)
                        }
                        break;
 
-               case FT_ADDTOSEQ:
-#ifdef LBL
-                       /*
-                       ** If we're working on a folder (as opposed to a
-                       ** file), add the current msg to sequence given
-                       ** in literal field.  Don't disturb string or
-                       ** value registers.
-                       */
-                       if (fmt_current_folder)
-                               seq_addmsg(fmt_current_folder, fmt->f_text, dat[0], -1);
-#endif
-                       break;
                }
                fmt++;
        }
-#ifndef JLR
-       finished:;
+finished:;
        if (cp[-1] != '\n')
                *cp++ = '\n';
-       *cp   = 0;
+       *cp = '\0';
        return ((struct format *)0);
-#else /* JLR */
+
+#ifdef JLR
+       /* I'll remove this as soon as I understand what it does. --meillo */
        if (cp[-1] != '\n')
                *cp++ = '\n';
        while (fmt->f_type != FT_DONE)
@@ -932,6 +887,6 @@ fmt_scan(struct format *format, char *scanl, int width, int *dat)
        finished:;
        *cp = '\0';
        return (fmt->f_value ? ++fmt : (struct format *) 0);
-
 #endif /* JLR */
+
 }