Hi,

Unless I'm missing something more clever, in vacation.c,
nsearch() is just a slower strcasestr(3).

--
Scott Cheloha

? vacation
Index: vacation.c
===================================================================
RCS file: /cvs/src/usr.bin/vacation/vacation.c,v
retrieving revision 1.37
diff -u -p -r1.37 vacation.c
--- vacation.c  20 Aug 2015 22:32:42 -0000      1.37
+++ vacation.c  17 Feb 2017 03:00:43 -0000
@@ -74,7 +74,6 @@ char from[MAXLINE];
 char subj[MAXLINE];
 
 int junkmail(void);
-int nsearch(char *, char *);
 void readheaders(void);
 int recent(void);
 void sendmessage(char *);
@@ -300,8 +299,10 @@ readheaders(void)
                                cont = 0;
                                break;
                        }
-findme:                        for (cur = names; !tome && cur; cur = cur->next)
-                               tome += nsearch(cur->name, buf);
+findme:                        for (cur = names; !tome && cur; cur = 
cur->next) {
+                               if (strcasestr(buf, cur->name) != NULL)
+                                       tome = 1;
+                       }
                }
        if (!tome)
                exit(0);
@@ -310,21 +311,6 @@ findme:                    for (cur = names; !tome && cur
                    "no initial \"From\" or \"Return-Path\"line.");
                exit(1);
        }
-}
-
-/*
- * nsearch --
- *     do a nice, slow, search of a string for a substring.
- */
-int
-nsearch(char *name, char *str)
-{
-       int len;
-
-       for (len = strlen(name); *str; ++str)
-               if (!strncasecmp(name, str, len))
-                       return(1);
-       return(0);
 }
 
 /*

Reply via email to