summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2011-09-23 10:42:02 +1000
committerDamien Miller <djm@mindrot.org>2011-09-23 10:42:02 +1000
commit834e82031749cb039ad9258314e62ebf25ca4365 (patch)
tree6a3fc8c3424fe03ee402dc3bf91cfd19a9c39e6e
parentacdf3fbdba747125c1d8d2dce8c5ffb3ddd23f58 (diff)
- tobias@cvs.openbsd.org 2007/10/21 11:09:30
[mktemp.c] Comment fix about time consumption of _gettemp. FreeBSD did this in revision 1.20. OK deraadt@, krw@
-rw-r--r--ChangeLog5
-rw-r--r--openbsd-compat/mktemp.c7
2 files changed, 7 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index dbe531fc6..4d6f152f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,11 @@
7 [openbsd-compat/strlcpy.c] 7 [openbsd-compat/strlcpy.c]
8 Convert do {} while loop -> while {} for clarity. No binary change 8 Convert do {} while loop -> while {} for clarity. No binary change
9 on most architectures. From Oliver Smith. OK deraadt@ and henning@ 9 on most architectures. From Oliver Smith. OK deraadt@ and henning@
10 - tobias@cvs.openbsd.org 2007/10/21 11:09:30
11 [mktemp.c]
12 Comment fix about time consumption of _gettemp.
13 FreeBSD did this in revision 1.20.
14 OK deraadt@, krw@
10 15
1120110922 1620110922
12 - OpenBSD CVS Sync 17 - OpenBSD CVS Sync
diff --git a/openbsd-compat/mktemp.c b/openbsd-compat/mktemp.c
index 2285c84df..5529bee75 100644
--- a/openbsd-compat/mktemp.c
+++ b/openbsd-compat/mktemp.c
@@ -1,7 +1,7 @@
1/* THIS FILE HAS BEEN MODIFIED FROM THE ORIGINAL OPENBSD SOURCE */ 1/* THIS FILE HAS BEEN MODIFIED FROM THE ORIGINAL OPENBSD SOURCE */
2/* Changes: Removed mktemp */ 2/* Changes: Removed mktemp */
3 3
4/* $OpenBSD: mktemp.c,v 1.19 2005/08/08 08:05:36 espie Exp $ */ 4/* $OpenBSD: mktemp.c,v 1.20 2007/10/21 11:09:30 tobias Exp $ */
5/* 5/*
6 * Copyright (c) 1987, 1993 6 * Copyright (c) 1987, 1993
7 * The Regents of the University of California. All rights reserved. 7 * The Regents of the University of California. All rights reserved.
@@ -112,10 +112,7 @@ _gettemp(path, doopen, domkdir, slen)
112 } 112 }
113 start = trv + 1; 113 start = trv + 1;
114 114
115 /* 115 /* Check the target directory. */
116 * check the target directory; if you have six X's and it
117 * doesn't exist this runs for a *very* long time.
118 */
119 if (doopen || domkdir) { 116 if (doopen || domkdir) {
120 for (;; --trv) { 117 for (;; --trv) {
121 if (trv <= path) 118 if (trv <= path)