From 100cbc5f3f41bebc03bf6838569845863c4c6649 Mon Sep 17 00:00:00 2001 From: Ben Gardner Date: Tue, 24 May 2016 17:34:10 -0500 Subject: [PATCH] Use DROPBEAR_PATH_DEVNULL instead of undefined _PATH_DEVNULL --- cli-session.c | 2 +- compat.c | 2 +- scpmisc.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cli-session.c b/cli-session.c index d89416f..d8525ae 100644 --- a/cli-session.c +++ b/cli-session.c @@ -287,7 +287,7 @@ static void cli_sessionloop() { 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)); diff --git a/compat.c b/compat.c index 71558a5..f3e9a52 100644 --- a/compat.c +++ b/compat.c @@ -177,7 +177,7 @@ int daemon(int nochdir, int noclose) { 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); diff --git a/scpmisc.c b/scpmisc.c index d99e358..33e1891 100644 --- a/scpmisc.c +++ b/scpmisc.c @@ -235,7 +235,7 @@ sanitise_stdfd(void) { 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); }