summaryrefslogtreecommitdiff
path: root/misc.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2009-02-22 08:47:02 +1100
committerDamien Miller <djm@mindrot.org>2009-02-22 08:47:02 +1100
commit9eab9564d5185b52f33f4a265914d32a3147338e (patch)
tree86145fce64db1121ce8920426693f472c8f7d373 /misc.c
parent7691e5fa44a54b193f00380634c3978a961480d2 (diff)
- (djm) OpenBSD CVS Sync
- tobias@cvs.openbsd.org 2009/02/21 19:32:04 [misc.c sftp-server-main.c ssh-keygen.c] Added missing newlines in error messages. ok dtucker
Diffstat (limited to 'misc.c')
-rw-r--r--misc.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/misc.c b/misc.c
index 755eda105..143dbf0e2 100644
--- a/misc.c
+++ b/misc.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: misc.c,v 1.70 2009/01/22 10:02:34 djm Exp $ */ 1/* $OpenBSD: misc.c,v 1.71 2009/02/21 19:32:04 tobias Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * Copyright (c) 2005,2006 Damien Miller. All rights reserved. 4 * Copyright (c) 2005,2006 Damien Miller. All rights reserved.
@@ -714,7 +714,8 @@ sanitise_stdfd(void)
714 int nullfd, dupfd; 714 int nullfd, dupfd;
715 715
716 if ((nullfd = dupfd = open(_PATH_DEVNULL, O_RDWR)) == -1) { 716 if ((nullfd = dupfd = open(_PATH_DEVNULL, O_RDWR)) == -1) {
717 fprintf(stderr, "Couldn't open /dev/null: %s", strerror(errno)); 717 fprintf(stderr, "Couldn't open /dev/null: %s\n",
718 strerror(errno));
718 exit(1); 719 exit(1);
719 } 720 }
720 while (++dupfd <= 2) { 721 while (++dupfd <= 2) {
@@ -722,7 +723,7 @@ sanitise_stdfd(void)
722 if (fcntl(dupfd, F_GETFL, 0) >= 0) 723 if (fcntl(dupfd, F_GETFL, 0) >= 0)
723 continue; 724 continue;
724 if (dup2(nullfd, dupfd) == -1) { 725 if (dup2(nullfd, dupfd) == -1) {
725 fprintf(stderr, "dup2: %s", strerror(errno)); 726 fprintf(stderr, "dup2: %s\n", strerror(errno));
726 exit(1); 727 exit(1);
727 } 728 }
728 } 729 }