Attachment 10824 Details for Bug 21570 – file.diff

[patch] file.diff

file.diff (text/plain), 3.56 KB, created by DougB on 2000-09-26 23:10:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: DougB

Created: 2000-09-26 23:10:01 UTC

Size: 3.56 KB

patch

obsolete

>Index: mail.1
>===================================================================
>RCS file: /usr/ncvs/src/usr.bin/mail/mail.1,v
>retrieving revision 1.19
>diff -u -r1.19 mail.1
>--- mail.1	2000/08/13 18:38:57	1.19
>+++ mail.1	2000/09/26 21:08:04
>@@ -44,6 +44,7 @@
> .Op Fl s Ar subject
> .Op Fl c Ar cc-addr
> .Op Fl b Ar bcc-addr
>+.Op Fl r Ar reply-to
> .Ar to-addr ...
> .Op \&- Ar sendmail-option ...
> .Nm mail
>@@ -99,6 +100,8 @@
> Send blind carbon copies to
> .Ar list .
> List should be a comma-separated list of names.
>+.It Fl r
>+Specify the Reply-To field on the command line.
> .It Fl f
> Read in the contents of your
> .Ar mbox
>Index: main.c
>===================================================================
>RCS file: /usr/ncvs/src/usr.bin/mail/main.c,v
>retrieving revision 1.6
>diff -u -r1.6 main.c
>--- main.c	1999/05/20 22:23:04	1.6
>+++ main.c	2000/09/26 21:31:23
>@@ -91,7 +91,7 @@
> 	smopts = NIL;
> 	subject = NOSTR;
> 	replyto = NOSTR;
>-	while ((i = getopt(argc, argv, "INT:b:c:dfins:u:v")) != -1) {
>+	while ((i = getopt(argc, argv, "INT:b:c:dfinr:s:u:v")) != -1) {
> 		switch (i) {
> 		case 'T':
> 			/*
>@@ -122,6 +122,9 @@
> 		case 'd':
> 			debug++;
> 			break;
>+		case 'r':
>+			replyto = optarg;
>+			break;
> 		case 's':
> 			/*
> 			 * Give a subject field for sending from
>@@ -182,8 +185,8 @@
> 			break;
> 		case '?':
> 			fputs("\
>-Usage: mail [-iInv] [-s subject] [-c cc-addr] [-b bcc-addr] to-addr ...\n\
>-            [- sendmail-options ...]\n\
>+Usage: mail [-iInv] [-s subject] [-c cc-addr] [-b bcc-addr] [-r reply-to]\n\
>+            to-addr ... [- sendmail-options ...]\n\
>        mail [-iInNv] -f [name]\n\
>        mail [-iInNv] [-u user]\n",
> 				stderr);
>Index: quit.c
>===================================================================
>RCS file: /usr/ncvs/src/usr.bin/mail/quit.c,v
>retrieving revision 1.2
>diff -u -r1.2 quit.c
>--- quit.c	1998/10/10 09:58:20	1.2
>+++ quit.c	2000/09/26 21:21:36
>@@ -390,7 +390,7 @@
> 	FILE *obuf, *ibuf, *readstat;
> 	struct stat statb;
> 	char tempname[30];
>-	char *mktemp();
>+	int mkstemp();
> 
> 	if (readonly)
> 		return;
>@@ -421,7 +421,7 @@
> 	if (stat(mailname, &statb) >= 0 && statb.st_size > mailsize) {
> 		strcpy(tempname, tmpdir);
> 		strcat(tempname, "mboxXXXXXX");
>-		mktemp(tempname);
>+		mkstemp(tempname);
> 		if ((obuf = Fopen(tempname, "w")) == NULL) {
> 			perror(tempname);
> 			relsesigs();
>Index: temp.c
>===================================================================
>RCS file: /usr/ncvs/src/usr.bin/mail/temp.c,v
>retrieving revision 1.6
>diff -u -r1.6 temp.c
>--- temp.c	1999/08/28 01:03:23	1.6
>+++ temp.c	2000/09/26 21:23:39
>@@ -77,23 +77,23 @@
> 	if ((tempMail = malloc(len + sizeof("RsXXXXXX"))) == NULL)
> 		panic("Out of memory");
> 	strcpy(tempMail, tmpdir);
>-	mktemp(strcat(tempMail, "RsXXXXXX"));
>+	mkstemp(strcat(tempMail, "RsXXXXXX"));
> 	if ((tempResid = malloc(len + sizeof("RqXXXXXX"))) == NULL)
> 		panic("Out of memory");
> 	strcpy(tempResid, tmpdir);
>-	mktemp(strcat(tempResid, "RqXXXXXX"));
>+	mkstemp(strcat(tempResid, "RqXXXXXX"));
> 	if ((tempQuit = malloc(len + sizeof("RmXXXXXX"))) == NULL)
> 		panic("Out of memory");
> 	strcpy(tempQuit, tmpdir);
>-	mktemp(strcat(tempQuit, "RmXXXXXX"));
>+	mkstemp(strcat(tempQuit, "RmXXXXXX"));
> 	if ((tempEdit = malloc(len + sizeof("ReXXXXXX"))) == NULL)
> 		panic("Out of memory");
> 	strcpy(tempEdit, tmpdir);
>-	mktemp(strcat(tempEdit, "ReXXXXXX"));
>+	mkstemp(strcat(tempEdit, "ReXXXXXX"));
> 	if ((tempMesg = malloc(len + sizeof("RxXXXXXX"))) == NULL)
> 		panic("Out of memory");
> 	strcpy(tempMesg, tmpdir);
>-	mktemp(strcat(tempMesg, "RxXXXXXX"));
>+	mkstemp(strcat(tempMesg, "RxXXXXXX"));
> 
> 	/*
> 	 * It's okay to call savestr in here because main will

Actions: View | Diff

Attachments on bug 21570: 10824