ClearML/dropbear
1
0
Fork 0
mirror of https://github.com/clearml/dropbear synced 2025-02-07 13:21:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #31 from bengardner/PATH_DEVNULL

Browse Source 
Use DROPBEAR_PATH_DEVNULL instead of undefined _PATH_DEVNULL
This commit is contained in:
Matt Johnston 2017-06-02 22:57:09 +08:00 committed by GitHub
commit 33e28fb96b
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli-session.c
View File

@ -287,7 +287,7 @@ static void cli_sessionloop() {
int devnull; int devnull;
/* keeping stdin open steals input from the terminal and /* keeping stdin open steals input from the terminal and
is confusing, though stdout/stderr could be useful. */ is confusing, though stdout/stderr could be useful. */
devnull = open(_PATH_DEVNULL, O_RDONLY); devnull = open(DROPBEAR_PATH_DEVNULL, O_RDONLY);
if (devnull < 0) { if (devnull < 0) {
dropbear_exit("Opening /dev/null: %d %s", dropbear_exit("Opening /dev/null: %d %s",
errno, strerror(errno)); errno, strerror(errno));

2
compat.c
View File

@ -174,7 +174,7 @@ int daemon(int nochdir, int noclose) {
if (!nochdir) if (!nochdir)
(void)chdir("/"); (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, STDIN_FILENO);
(void)dup2(fd, STDOUT_FILENO); (void)dup2(fd, STDOUT_FILENO);
(void)dup2(fd, STDERR_FILENO); (void)dup2(fd, STDERR_FILENO);

2
scpmisc.c
View File

@ -235,7 +235,7 @@ sanitise_stdfd(void)
{ {
int nullfd, dupfd; 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)); fprintf(stderr, "Couldn't open /dev/null: %s", strerror(errno));
exit(1); exit(1);
} }