Deleted Added
full compact
main.c (78737) main.c (78904)
1/*
2 * Copyright (c) 1980, 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

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

37 The Regents of the University of California. All rights reserved.\n";
38#endif /* not lint */
39
40#ifndef lint
41#if 0
42static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93";
43#endif
44static const char rcsid[] =
1/*
2 * Copyright (c) 1980, 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

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

37 The Regents of the University of California. All rights reserved.\n";
38#endif /* not lint */
39
40#ifndef lint
41#if 0
42static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93";
43#endif
44static const char rcsid[] =
45 "$FreeBSD: head/usr.bin/mail/main.c 78737 2001-06-24 23:41:57Z dd $";
45 "$FreeBSD: head/usr.bin/mail/main.c 78904 2001-06-28 02:40:07Z mikeh $";
46#endif /* not lint */
47
48#include "rcv.h"
49#include <fcntl.h>
50#include "extern.h"
51
52/*
53 * Mail -- a mail program

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

88 * first of these users.
89 */
90 ef = NULL;
91 to = NULL;
92 cc = NULL;
93 bcc = NULL;
94 smopts = NULL;
95 subject = NULL;
46#endif /* not lint */
47
48#include "rcv.h"
49#include <fcntl.h>
50#include "extern.h"
51
52/*
53 * Mail -- a mail program

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

88 * first of these users.
89 */
90 ef = NULL;
91 to = NULL;
92 cc = NULL;
93 bcc = NULL;
94 smopts = NULL;
95 subject = NULL;
96 while ((i = getopt(argc, argv, "INT:b:c:dfins:u:v")) != -1) {
96 while ((i = getopt(argc, argv, "EINT:b:c:dfins:u:v")) != -1) {
97 switch (i) {
98 case 'T':
99 /*
100 * Next argument is temp file to write which
101 * articles have been read/deleted for netnews.
102 */
103 Tflag = optarg;
104 if ((i = open(Tflag, O_CREAT | O_TRUNC | O_WRONLY,

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

176 cc = cat(cc, nalloc(optarg, GCC));
177 break;
178 case 'b':
179 /*
180 * Get Blind Carbon Copy Recipient list
181 */
182 bcc = cat(bcc, nalloc(optarg, GBCC));
183 break;
97 switch (i) {
98 case 'T':
99 /*
100 * Next argument is temp file to write which
101 * articles have been read/deleted for netnews.
102 */
103 Tflag = optarg;
104 if ((i = open(Tflag, O_CREAT | O_TRUNC | O_WRONLY,

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

176 cc = cat(cc, nalloc(optarg, GCC));
177 break;
178 case 'b':
179 /*
180 * Get Blind Carbon Copy Recipient list
181 */
182 bcc = cat(bcc, nalloc(optarg, GBCC));
183 break;
184 case 'E':
185 /*
186 * Don't send empty files.
187 */
188 assign("dontsendempty", "");
189 break;
184 case '?':
185 fprintf(stderr, "\
190 case '?':
191 fprintf(stderr, "\
186Usage: %s [-iInv] [-s subject] [-c cc-addr] [-b bcc-addr] to-addr ...\n\
192Usage: %s [-EiInv] [-s subject] [-c cc-addr] [-b bcc-addr] to-addr ...\n\
187 %*s [- sendmail-options ...]\n\
193 %*s [- sendmail-options ...]\n\
188 %s [-iInNv] -f [name]\n\
189 %s [-iInNv] [-u user]\n",__progname, strlen(__progname), "", __progname,
190 __progname);
194 %s [-EiInNv] -f [name]\n\
195 %s [-EiInNv] [-u user]\n",__progname, strlen(__progname), "",
196 __progname, __progname);
191 exit(1);
192 }
193 }
194 for (i = optind; (argv[i] != NULL) && (*argv[i] != '-'); i++)
195 to = cat(to, nalloc(argv[i], GTO));
196 for (; argv[i] != NULL; i++)
197 smopts = cat(smopts, nalloc(argv[i], 0));
198 /*

--- 111 unchanged lines hidden ---
197 exit(1);
198 }
199 }
200 for (i = optind; (argv[i] != NULL) && (*argv[i] != '-'); i++)
201 to = cat(to, nalloc(argv[i], GTO));
202 for (; argv[i] != NULL; i++)
203 smopts = cat(smopts, nalloc(argv[i], 0));
204 /*

--- 111 unchanged lines hidden ---