Deleted Added
sdiff udiff text old ( 24360 ) new ( 27270 )
full compact
from.c (24360) from.c (27270)
1/*
2 * Copyright (c) 1980, 1988, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 18 unchanged lines hidden (view full) ---

27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 */
33
34#ifndef lint
1/*
2 * Copyright (c) 1980, 1988, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 18 unchanged lines hidden (view full) ---

27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 */
33
34#ifndef lint
35static char copyright[] =
35static const char copyright[] =
36"@(#) Copyright (c) 1980, 1988, 1993\n\
37 The Regents of the University of California. All rights reserved.\n";
38#endif /* not lint */
39
40#ifndef lint
36"@(#) Copyright (c) 1980, 1988, 1993\n\
37 The Regents of the University of California. All rights reserved.\n";
38#endif /* not lint */
39
40#ifndef lint
41#if 0
41static char sccsid[] = "@(#)from.c 8.1 (Berkeley) 6/6/93";
42static char sccsid[] = "@(#)from.c 8.1 (Berkeley) 6/6/93";
43#endif
44static const char rcsid[] =
45 "$Id$";
42#endif /* not lint */
43
44#include <sys/types.h>
46#endif /* not lint */
47
48#include <sys/types.h>
45
46#include <ctype.h>
49#include <ctype.h>
50#include <err.h>
47#include <pwd.h>
48#include <stdio.h>
49#include <stdlib.h>
51#include <pwd.h>
52#include <stdio.h>
53#include <stdlib.h>
50#include <string.h>
51#include <paths.h>
54#include <paths.h>
55#include <string.h>
56#include <unistd.h>
52
57
58int match __P((char *, char *));
59static void usage __P((void));
60
61int
53main(argc, argv)
54 int argc;
55 char **argv;
56{
57 extern char *optarg;
58 extern int optind;
59 struct passwd *pwd;
60 int ch, newline;
61 char *file, *sender, *p;
62#if MAXPATHLEN > BUFSIZ
63 char buf[MAXPATHLEN];
64#else
65 char buf[BUFSIZ];
66#endif
67
68 file = sender = NULL;
62main(argc, argv)
63 int argc;
64 char **argv;
65{
66 extern char *optarg;
67 extern int optind;
68 struct passwd *pwd;
69 int ch, newline;
70 char *file, *sender, *p;
71#if MAXPATHLEN > BUFSIZ
72 char buf[MAXPATHLEN];
73#else
74 char buf[BUFSIZ];
75#endif
76
77 file = sender = NULL;
69 while ((ch = getopt(argc, argv, "f:s:?")) != -1)
78 while ((ch = getopt(argc, argv, "f:s:")) != -1)
70 switch((char)ch) {
71 case 'f':
72 file = optarg;
73 break;
74 case 's':
75 sender = optarg;
76 for (p = sender; *p; ++p)
77 if (isupper(*p))
78 *p = tolower(*p);
79 break;
80 case '?':
81 default:
79 switch((char)ch) {
80 case 'f':
81 file = optarg;
82 break;
83 case 's':
84 sender = optarg;
85 for (p = sender; *p; ++p)
86 if (isupper(*p))
87 *p = tolower(*p);
88 break;
89 case '?':
90 default:
82 fprintf(stderr, "usage: from [-f file] [-s sender] [user]\n");
83 exit(1);
91 usage();
84 }
85 argv += optind;
86
87 if (!file) {
88 if (*argv) {
89 (void)sprintf(buf, "%s/%s", _PATH_MAILDIR, *argv);
90 file = buf;
91 } else {
92 if (!(file = getenv("MAIL"))) {
92 }
93 argv += optind;
94
95 if (!file) {
96 if (*argv) {
97 (void)sprintf(buf, "%s/%s", _PATH_MAILDIR, *argv);
98 file = buf;
99 } else {
100 if (!(file = getenv("MAIL"))) {
93 if (!(pwd = getpwuid(getuid()))) {
94 (void)fprintf(stderr,
95 "from: no password file entry for you.\n");
96 exit(1);
97 }
101 if (!(pwd = getpwuid(getuid())))
102 errx(1, "no password file entry for you");
98 file = pwd->pw_name;
99 (void)sprintf(buf,
100 "%s/%s", _PATH_MAILDIR, file);
101 file = buf;
102 }
103 }
104 }
105
106 /* read from stdin */
107 if (strcmp(file, "-") == 0) {
108 }
109 else if (!freopen(file, "r", stdin)) {
103 file = pwd->pw_name;
104 (void)sprintf(buf,
105 "%s/%s", _PATH_MAILDIR, file);
106 file = buf;
107 }
108 }
109 }
110
111 /* read from stdin */
112 if (strcmp(file, "-") == 0) {
113 }
114 else if (!freopen(file, "r", stdin)) {
110 fprintf(stderr, "from: can't read %s.\n", file);
111 exit(1);
115 errx(1, "can't read %s", file);
112 }
113 for (newline = 1; fgets(buf, sizeof(buf), stdin);) {
114 if (*buf == '\n') {
115 newline = 1;
116 continue;
117 }
118 if (newline && !strncmp(buf, "From ", 5) &&
119 (!sender || match(buf + 5, sender)))
120 printf("%s", buf);
121 newline = 0;
122 }
123 exit(0);
124}
125
116 }
117 for (newline = 1; fgets(buf, sizeof(buf), stdin);) {
118 if (*buf == '\n') {
119 newline = 1;
120 continue;
121 }
122 if (newline && !strncmp(buf, "From ", 5) &&
123 (!sender || match(buf + 5, sender)))
124 printf("%s", buf);
125 newline = 0;
126 }
127 exit(0);
128}
129
130static void
131usage()
132{
133 fprintf(stderr, "usage: from [-f file] [-s sender] [user]\n");
134 exit(1);
135}
136
137int
126match(line, sender)
127 register char *line, *sender;
128{
129 register char ch, pch, first, *p, *t;
130
131 for (first = *sender++;;) {
132 if (isspace(ch = *line))
133 return(0);

--- 16 unchanged lines hidden --- 		138match(line, sender)
139 register char *line, *sender;
140{
141 register char ch, pch, first, *p, *t;
142
143 for (first = *sender++;;) {
144 if (isspace(ch = *line))
145 return(0);

--- 16 unchanged lines hidden ---