Deleted Added
sdiff udiff text old ( 24360 ) new ( 32189 )
full compact
main.c (24360) main.c (32189)
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

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

56
57int
58main(argc, argv)
59 int argc;
60 char *argv[];
61{
62 register int i;
63 struct name *to, *cc, *bcc, *smopts;
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

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

56
57int
58main(argc, argv)
59 int argc;
60 char *argv[];
61{
62 register int i;
63 struct name *to, *cc, *bcc, *smopts;
64 char *subject;
65 char *ef;
64 char *subject, *replyto;
65 char *ef, *cp;
66 char nosrc = 0;
67 void hdrstop();
68 sig_t prevint;
69 void sigchild();
70
71 /*
72 * Set up a reasonable environment.
73 * Figure out whether we are being run interactively,

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

85 * first of these users.
86 */
87 ef = NOSTR;
88 to = NIL;
89 cc = NIL;
90 bcc = NIL;
91 smopts = NIL;
92 subject = NOSTR;
66 char nosrc = 0;
67 void hdrstop();
68 sig_t prevint;
69 void sigchild();
70
71 /*
72 * Set up a reasonable environment.
73 * Figure out whether we are being run interactively,

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

85 * first of these users.
86 */
87 ef = NOSTR;
88 to = NIL;
89 cc = NIL;
90 bcc = NIL;
91 smopts = NIL;
92 subject = NOSTR;
93 replyto = NOSTR;
93 while ((i = getopt(argc, argv, "INT:b:c:dfins:u:v")) != -1) {
94 switch (i) {
95 case 'T':
96 /*
97 * Next argument is temp file to write which
98 * articles have been read/deleted for netnews.
99 */
100 Tflag = optarg;

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

215 if (path_rc == NULL)
216 errx(1, "malloc(path_rc) failed");
217
218 strcpy(path_rc, _PATH_MASTER_RC);
219 while ((s = strsep(&path_rc, ":")) != NULL)
220 if (*s != '\0')
221 load(s);
222 }
94 while ((i = getopt(argc, argv, "INT:b:c:dfins:u:v")) != -1) {
95 switch (i) {
96 case 'T':
97 /*
98 * Next argument is temp file to write which
99 * articles have been read/deleted for netnews.
100 */
101 Tflag = optarg;

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

216 if (path_rc == NULL)
217 errx(1, "malloc(path_rc) failed");
218
219 strcpy(path_rc, _PATH_MASTER_RC);
220 while ((s = strsep(&path_rc, ":")) != NULL)
221 if (*s != '\0')
222 load(s);
223 }
224 if ((cp = getenv("REPLYTO")) != NULL)
225 replyto = cp;
223
224 /*
225 * Expand returns a savestr, but load only uses the file name
226 * for fopen, so it's safe to do this.
227 */
228 load(expand("~/.mailrc"));
229 if (!rcvmode) {
226
227 /*
228 * Expand returns a savestr, but load only uses the file name
229 * for fopen, so it's safe to do this.
230 */
231 load(expand("~/.mailrc"));
232 if (!rcvmode) {
230 mail(to, cc, bcc, smopts, subject);
233 mail(to, cc, bcc, smopts, subject, replyto);
231 /*
232 * why wait?
233 */
234 exit(senderr);
235 }
236 /*
237 * Ok, we are reading mail.
238 * Decide whether we are editing a mailbox or reading

--- 73 unchanged lines hidden --- 		234 /*
235 * why wait?
236 */
237 exit(senderr);
238 }
239 /*
240 * Ok, we are reading mail.
241 * Decide whether we are editing a mailbox or reading

--- 73 unchanged lines hidden ---