Module Name: src
Committed By: christos
Date: Thu Oct 23 21:03:25 UTC 2014
Modified Files:
src/bin/sh: redir.c
Log Message:
simplify and eliminate TOCTOU.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/bin/sh/redir.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/sh/redir.c
diff -u src/bin/sh/redir.c:1.36 src/bin/sh/redir.c:1.37
--- src/bin/sh/redir.c:1.36 Wed Oct 15 10:54:25 2014
+++ src/bin/sh/redir.c Thu Oct 23 17:03:25 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: redir.c,v 1.36 2014/10/15 14:54:25 christos Exp $ */
+/* $NetBSD: redir.c,v 1.37 2014/10/23 21:03:25 christos Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)redir.c 8.2 (Berkeley) 5/4/95";
#else
-__RCSID("$NetBSD: redir.c,v 1.36 2014/10/15 14:54:25 christos Exp $");
+__RCSID("$NetBSD: redir.c,v 1.37 2014/10/23 21:03:25 christos Exp $");
#endif
#endif /* not lint */
@@ -197,20 +197,17 @@ openredirect(union node *redir, char mem
case NTO:
if (Cflag) {
fname = redir->nfile.expfname;
- if (stat(fname, &sb) == -1) {
+ if ((f = open(fname, O_WRONLY)) == -1) {
if ((f = open(fname, O_WRONLY|O_CREAT|O_EXCL,
0666)) < 0)
goto ecreate;
- } else if (!S_ISREG(sb.st_mode)) {
- if ((f = open(fname, O_WRONLY, 0666)) < 0)
- goto ecreate;
- if (fstat(f, &sb) != -1 &&
- S_ISREG(sb.st_mode)) {
- close(f);
- errno = EEXIST;
- goto ecreate;
- }
- } else {
+ } else if (fstat(f, &sb) == -1) {
+ int serrno = errno;
+ close(f);
+ errno = serrno;
+ goto ecreate;
+ } else if (S_ISREG(sb.st_mode)) {
+ close(f);
errno = EEXIST;
goto ecreate;
}
