diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2003-07-08 04:45:33 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2003-07-08 04:45:33 +0000 |
| commit | 78d665c755f5e7de62a18c028cfb410e27cd209c (patch) | |
| tree | 217f71071016ef79b1a0eb0c4445aabeebc86661 /usr.bin | |
| parent | c2f1bc1298fd7370d1e9bb9232a0b0ca01089d69 (diff) | |
o Avoid a temp file if using stdin and stdin is redirected from a regular file
o Fix a double free in the temmp file case
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/diff/diff.c | 8 | ||||
| -rw-r--r-- | usr.bin/diff/diffreg.c | 26 |
2 files changed, 19 insertions, 15 deletions
diff --git a/usr.bin/diff/diff.c b/usr.bin/diff/diff.c index afd54bdf271..6d497053d6c 100644 --- a/usr.bin/diff/diff.c +++ b/usr.bin/diff/diff.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff.c,v 1.25 2003/07/06 22:17:21 millert Exp $ */ +/* $OpenBSD: diff.c,v 1.26 2003/07/08 04:45:32 millert Exp $ */ /* * Copyright (c) 2003 Todd C. Miller <Todd.Miller@courtesan.com> @@ -21,7 +21,7 @@ */ #ifndef lint -static const char rcsid[] = "$OpenBSD: diff.c,v 1.25 2003/07/06 22:17:21 millert Exp $"; +static const char rcsid[] = "$OpenBSD: diff.c,v 1.26 2003/07/08 04:45:32 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -176,12 +176,12 @@ main(int argc, char **argv) if (argc != 2) usage(); if (strcmp(argv[0], "-") == 0) { - stb1.st_mode = S_IFREG; + fstat(STDIN_FILENO, &stb1); gotstdin = 1; } else if (stat(argv[0], &stb1) != 0) error("%s", argv[0]); if (strcmp(argv[1], "-") == 0) { - stb2.st_mode = S_IFREG; + fstat(STDIN_FILENO, &stb2); gotstdin = 1; } else if (stat(argv[1], &stb2) != 0) error("%s", argv[1]); diff --git a/usr.bin/diff/diffreg.c b/usr.bin/diff/diffreg.c index 4e15c6b8ac1..75b95c5b6a4 100644 --- a/usr.bin/diff/diffreg.c +++ b/usr.bin/diff/diffreg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diffreg.c,v 1.28 2003/07/06 22:17:21 millert Exp $ */ +/* $OpenBSD: diffreg.c,v 1.29 2003/07/08 04:45:32 millert Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. @@ -65,7 +65,7 @@ */ #ifndef lint -static const char rcsid[] = "$OpenBSD: diffreg.c,v 1.28 2003/07/06 22:17:21 millert Exp $"; +static const char rcsid[] = "$OpenBSD: diffreg.c,v 1.29 2003/07/08 04:45:32 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -282,7 +282,7 @@ diffreg(char *ofile1, char *ofile2, int flags) status |= 2; goto closem; } - } else if (strcmp(file1, "-") == 0 || !S_ISREG(stb1.st_mode)) { + } else if (!S_ISREG(stb1.st_mode)) { file1 = copytemp(file1, 1); if (file1 == NULL || stat(file1, &stb1) < 0) { warn("%s", file1); @@ -290,7 +290,10 @@ diffreg(char *ofile1, char *ofile2, int flags) goto closem; } } - f1 = fopen(file1, "r"); + if (strcmp(file1, "-") == 0) + f1 = stdin; + else + f1 = fopen(file1, "r"); } if (f1 == NULL) { warn("%s", file1); @@ -308,7 +311,7 @@ diffreg(char *ofile1, char *ofile2, int flags) status |= 2; goto closem; } - } else if (strcmp(file2, "-") == 0 || !S_ISREG(stb2.st_mode)) { + } else if (!S_ISREG(stb1.st_mode)) { file2 = copytemp(file2, 2); if (file2 == NULL || stat(file2, &stb2) < 0) { warn("%s", file2); @@ -316,7 +319,10 @@ diffreg(char *ofile1, char *ofile2, int flags) goto closem; } } - f2 = fopen(file2, "r"); + if (strcmp(file2, "-") == 0) + f2 = stdin; + else + f2 = fopen(file2, "r"); } if (f2 == NULL) { warn("%s", file2); @@ -398,15 +404,13 @@ closem: unlink(tempfiles[0]); free(tempfiles[0]); tempfiles[0] = NULL; - } + } else if (file1 != ofile1) + free(file1); if (tempfiles[1] != NULL) { unlink(tempfiles[1]); free(tempfiles[1]); tempfiles[1] = NULL; - } - if (file1 != ofile1) - free(file1); - if (file2 != ofile2) + } else if (file2 != ofile2) free(file2); } |