Mercurial > dropbear

changeset 1388:271c57aa3da5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge pull request #31 from bengardner/PATH_DEVNULL Use DROPBEAR_PATH_DEVNULL instead of undefined _PATH_DEVNULL
author Matt Johnston <matt@ucc.asn.au>
date Fri, 02 Jun 2017 22:57:09 +0800
parents 1a3c4ec0f840 (current diff) e7f11ed5fe28 (diff)
children b413787adcdb
files compat.c
diffstat 3 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/cli-session.c	Sat May 20 10:27:29 2017 +0800
+++ b/cli-session.c	Fri Jun 02 22:57:09 2017 +0800
@@ -287,7 +287,7 @@
 				int devnull;
 				/* keeping stdin open steals input from the terminal and
 				   is confusing, though stdout/stderr could be useful. */
-				devnull = open(_PATH_DEVNULL, O_RDONLY);
+				devnull = open(DROPBEAR_PATH_DEVNULL, O_RDONLY);
 				if (devnull < 0) {
 					dropbear_exit("Opening /dev/null: %d %s",
 							errno, strerror(errno));
--- a/compat.c	Sat May 20 10:27:29 2017 +0800
+++ b/compat.c	Fri Jun 02 22:57:09 2017 +0800
@@ -174,7 +174,7 @@
 	if (!nochdir)
 		(void)chdir("/");
 
-	if (!noclose && (fd = open(_PATH_DEVNULL, O_RDWR, 0)) != -1) {
+	if (!noclose && (fd = open(DROPBEAR_PATH_DEVNULL, O_RDWR, 0)) != -1) {
 		(void)dup2(fd, STDIN_FILENO);
 		(void)dup2(fd, STDOUT_FILENO);
 		(void)dup2(fd, STDERR_FILENO);
--- a/scpmisc.c	Sat May 20 10:27:29 2017 +0800
+++ b/scpmisc.c	Fri Jun 02 22:57:09 2017 +0800
@@ -235,7 +235,7 @@
 {
 	int nullfd, dupfd;
 
-	if ((nullfd = dupfd = open(_PATH_DEVNULL, O_RDWR)) == -1) {
+	if ((nullfd = dupfd = open(DROPBEAR_PATH_DEVNULL, O_RDWR)) == -1) {
 		fprintf(stderr, "Couldn't open /dev/null: %s", strerror(errno));
 		exit(1);
 	}