Attachment 10141 Details for Bug 20445 – file.diff

[patch] file.diff

file.diff (text/plain), 2.34 KB, created by jkuroda on 2000-08-06 20:00:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: jkuroda

Created: 2000-08-06 20:00:04 UTC

Size: 2.34 KB

patch

obsolete

>*** dirs.c	Sun Aug  6 11:46:31 2000
>--- dirs.c.moremkstemp	Sun Aug  6 11:46:22 2000
>***************
>*** 148,158 ****
>  
>  	vprintf(stdout, "Extract directories from tape\n");
>  	(void) sprintf(dirfile, "%srstdir%d", _PATH_TMP, dumpdate);
>! 	if (command != 'r' && command != 'R') {
>  		(void *) strcat(dirfile, "-XXXXXX");
>  		fd = mkstemp(dirfile);
>! 	} else
>! 		fd = open(dirfile, O_RDWR|O_CREAT|O_EXCL, 0666);
>  	if (fd == -1 || (df = fdopen(fd, "w")) == NULL) {
>  		if (fd != -1)
>  			close(fd);
>--- 148,158 ----
>  
>  	vprintf(stdout, "Extract directories from tape\n");
>  	(void) sprintf(dirfile, "%srstdir%d", _PATH_TMP, dumpdate);
>! 	/* if (command != 'r' && command != 'R') { */
>  		(void *) strcat(dirfile, "-XXXXXX");
>  		fd = mkstemp(dirfile);
>! 	/*} else
>! 		fd = open(dirfile, O_RDWR|O_CREAT|O_EXCL, 0666); */
>  	if (fd == -1 || (df = fdopen(fd, "w")) == NULL) {
>  		if (fd != -1)
>  			close(fd);
>***************
>*** 161,171 ****
>  	}
>  	if (genmode != 0) {
>  		(void) sprintf(modefile, "%srstmode%d", _PATH_TMP, dumpdate);
>! 		if (command != 'r' && command != 'R') {
>  			(void *) strcat(modefile, "-XXXXXX");
>  			fd = mkstemp(modefile);
>! 		} else
>! 			fd = open(modefile, O_RDWR|O_CREAT|O_EXCL, 0666);
>  		if (fd == -1 || (mf = fdopen(fd, "w")) == NULL) {
>  			if (fd != -1)
>  				close(fd);
>--- 161,171 ----
>  	}
>  	if (genmode != 0) {
>  		(void) sprintf(modefile, "%srstmode%d", _PATH_TMP, dumpdate);
>! 		/* if (command != 'r' && command != 'R') { */
>  			(void *) strcat(modefile, "-XXXXXX");
>  			fd = mkstemp(modefile);
>! 		/* } else 
>! 			fd = open(modefile, O_RDWR|O_CREAT|O_EXCL, 0666); */
>  		if (fd == -1 || (mf = fdopen(fd, "w")) == NULL) {
>  			if (fd != -1)
>  				close(fd);
>***************
>*** 594,601 ****
>  	char *cp;
>  
>  	vprintf(stdout, "Set directory mode, owner, and times.\n");
>! 	if (command == 'r' || command == 'R')
>! 		(void) sprintf(modefile, "%srstmode%d", _PATH_TMP, dumpdate);
>  	if (modefile[0] == '#') {
>  		panic("modefile not defined\n");
>  		fprintf(stderr, "directory mode, owner, and times not set\n");
>--- 594,601 ----
>  	char *cp;
>  
>  	vprintf(stdout, "Set directory mode, owner, and times.\n");
>! 	/* if (command == 'r' || command == 'R')
>! 		(void) sprintf(modefile, "%srstmode%d", _PATH_TMP, dumpdate); */
>  	if (modefile[0] == '#') {
>  		panic("modefile not defined\n");
>  		fprintf(stderr, "directory mode, owner, and times not set\n");

Actions: View | Diff

Attachments on bug 20445: 10141