general cleanup, add the -f flag, search entire address for string

add Berkeley copyright notice

SCCS-vsn: usr.bin/from/from.c 5.3

diff --git a/usr/src/usr.bin/from/from.c b/usr/src/usr.bin/from/from.c
index d5eb49d..a6cb87b 100644 (file)
--- a/usr/src/usr.bin/from/from.c
+++ b/usr/src/usr.bin/from/from.c
@@ -1,97 +1,118 @@
 /*
 /*

- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * Copyright (c) 1980, 1988 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.

  */
 
 #ifndef lint
 char copyright[] =
  */
 
 #ifndef lint
 char copyright[] =

-"@(#) Copyright (c) 1980 Regents of the University of California.\n\
+"@(#) Copyright (c) 1980, 1988 The Regents of the University of California.\n\

  All rights reserved.\n";
  All rights reserved.\n";

-#endif not lint
+#endif /* not lint */

 
 #ifndef lint
 
 #ifndef lint

-static char sccsid[] = "@(#)from.c     5.2 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)from.c     5.3 (Berkeley) %G%";
+#endif /* not lint */

 
 

-#include <stdio.h>

 #include <ctype.h>
 #include <pwd.h>
 #include <ctype.h>
 #include <pwd.h>

-
-struct passwd *getpwuid();
+#include <stdio.h>

 
 main(argc, argv)
        int argc;
 
 main(argc, argv)
        int argc;

-       register char **argv;
+       char **argv;

 {
 {

-       char lbuf[BUFSIZ];
-       char lbuf2[BUFSIZ];
-       register struct passwd *pp;
-       int stashed = 0;
-       register char *name;
-       char *sender;
-       char *getlogin();
+       extern char *optarg;
+       extern int optind;
+       struct passwd *pwd, *getpwuid();
+       int ch, newline;
+       char *file, *sender, *p;
+#if MAXPATHLEN > BUFSIZ
+       char buf[MAXPATHLEN];
+#else
+       char buf[BUFSIZ];
+#endif

 
 

-       if (argc > 1 && *(argv[1]) == '-' && (*++argv)[1] == 's') {
-               if (--argc <= 1) {
-                       fprintf (stderr, "Usage: from [-s sender] [user]\n");
-                       exit (1);
+       file = sender = NULL;
+       while ((ch = getopt(argc, argv, "f:s:")) != EOF)
+               switch((char)ch) {
+               case 'f':
+                       file = optarg;
+                       break;
+               case 's':
+                       sender = optarg;
+                       for (p = sender; *p; ++p)
+                               if (isupper(*p))
+                                       *p = tolower(*p);
+                       break;
+               case '?':
+               default:
+                       fprintf(stderr, "usage: from [-f file] [-s sender] [user]\n");
+                       exit(1);

                }
                }

-               --argc;
-               sender = *++argv;
-               for (name = sender; *name; name++)
-                       if (isupper(*name))
-                               *name = tolower(*name);
+       argv += optind;

 
 

-       } else
-               sender = NULL;
-       if (chdir("/usr/spool/mail") < 0)
-               exit(1);
-       if (argc > 1)
-               name = argv[1];
-       else {
-               name = getlogin ();
-               if (name == NULL || strlen(name) == 0) {
-                       pp = getpwuid(getuid());
-                       if (pp == NULL) {
-                               fprintf(stderr, "Who are you?\n");
+       if (!file) {
+               if (!(file = *argv)) {
+                       if (!(pwd = getpwuid(getuid()))) {
+                               fprintf(stderr,
+                                   "from: no password file entry for you.\n");

                                exit(1);
                        }
                                exit(1);
                        }

-                       name = pp->pw_name;
+                       file = pwd->pw_name;

                }
                }

+               (void)sprintf(buf, "/usr/spool/mail/%s", file);
+               file = buf;

        }
        }

-       if (freopen(name, "r", stdin) == NULL) {
-               fprintf(stderr, "Can't open /usr/spool/mail/%s\n", name);
-               exit(0);
+       if (!freopen(file, "r", stdin)) {
+               fprintf(stderr, "from: can't read %s.\n", file);
+               exit(1);

        }
        }

-       while (fgets(lbuf, sizeof lbuf, stdin) != NULL)
-               if (lbuf[0] == '\n' && stashed) {
-                       stashed = 0;
-                       printf("%s", lbuf2);
-               } else if (strncmp(lbuf, "From ", 5) == 0 &&
-                   (sender == NULL || match(&lbuf[4], sender))) {
-                       strcpy(lbuf2, lbuf);
-                       stashed = 1;
+       for (newline = 1; fgets(buf, sizeof(buf), stdin);) {
+               if (*buf == '\n') {
+                       newline = 1;
+                       continue;

                }
                }

-       if (stashed)
-               printf("%s", lbuf2);
+               if (newline && !strncmp(buf, "From ", 5) &&
+                   (!sender || match(buf + 5, sender)))
+                       printf("%s", buf);
+               newline = 0;
+       }

        exit(0);
 }
 
        exit(0);
 }
 

-match (line, str)
-       register char *line, *str;
+match(line, sender)
+       register char *line, *sender;

 {
 {

-       register char ch;
+       register char ch, pch, first, *p, *t;

 
 

-       while (*line == ' ' || *line == '\t')
+       for (first = *sender++;;) {
+               if (isspace(ch = *line))
+                       return(0);

                ++line;
                ++line;

-       if (*line == '\n')
-               return (0);
-       while (*str && *line != ' ' && *line != '\t' && *line != '\n') {
-               ch = isupper(*line) ? tolower(*line) : *line;
-               if (ch != *str++)
-                       return (0);
-               line++;
+               if (isupper(ch))
+                       ch = tolower(ch);
+               if (ch != first)
+                       continue;
+               for (p = sender, t = line;;) {
+                       if (!(pch = *p++))
+                               return(1);
+                       if (isupper(ch = *t++))
+                               ch = tolower(ch);
+                       if (ch != pch)
+                               break;
+               }

        }
        }

-       return (*str == '\0');
+       /* NOTREACHED */

 }
 }