mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-02-23 21:57:40 +03:00
Remove use of _PATH_DEVNULL in favour of /dev/null for portability (John Levon)
This commit is contained in:
parent
4cea12bb69
commit
f4cbc9370e
@ -1,3 +1,9 @@
|
||||
Wed Dec 17 18:03:39 GMT 2008 Daniel P. Berrange <berrange@redhat.com>
|
||||
|
||||
* qemud/qemud.c, src/util.c, tests/testutils.c: Remove use
|
||||
of _PATH_DEVNULL in favour of "/dev/null" for portability
|
||||
(John Levon)
|
||||
|
||||
Wed Dec 17 18:10:51 +0100 2008 Jim Meyering <meyering@redhat.com>
|
||||
|
||||
enforce the "include <config.h> first" rule
|
||||
|
@ -406,9 +406,9 @@ static int qemudGoDaemon(void) {
|
||||
int stdoutfd = -1;
|
||||
int nextpid;
|
||||
|
||||
if ((stdinfd = open(_PATH_DEVNULL, O_RDONLY)) < 0)
|
||||
if ((stdinfd = open("/dev/null", O_RDONLY)) < 0)
|
||||
goto cleanup;
|
||||
if ((stdoutfd = open(_PATH_DEVNULL, O_WRONLY)) < 0)
|
||||
if ((stdoutfd = open("/dev/null", O_WRONLY)) < 0)
|
||||
goto cleanup;
|
||||
if (dup2(stdinfd, STDIN_FILENO) != STDIN_FILENO)
|
||||
goto cleanup;
|
||||
|
@ -205,10 +205,10 @@ __virExec(virConnectPtr conn,
|
||||
return -1;
|
||||
}
|
||||
|
||||
if ((null = open(_PATH_DEVNULL, O_RDONLY)) < 0) {
|
||||
if ((null = open("/dev/null", O_RDONLY)) < 0) {
|
||||
ReportError(conn, VIR_ERR_INTERNAL_ERROR,
|
||||
_("cannot open %s: %s"),
|
||||
_PATH_DEVNULL, strerror(errno));
|
||||
"/dev/null", strerror(errno));
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
|
@ -35,10 +35,6 @@
|
||||
#include <paths.h>
|
||||
#endif
|
||||
|
||||
#ifndef _PATH_DEVNULL
|
||||
#define _PATH_DEVNULL "/dev/null"
|
||||
#endif
|
||||
|
||||
#define GETTIMEOFDAY(T) gettimeofday(T, NULL)
|
||||
#define DIFF_MSEC(T, U) \
|
||||
((((int) ((T)->tv_sec - (U)->tv_sec)) * 1000000.0 + \
|
||||
@ -155,9 +151,9 @@ void virtTestCaptureProgramExecChild(const char *const argv[],
|
||||
NULL
|
||||
};
|
||||
|
||||
if ((stdinfd = open(_PATH_DEVNULL, O_RDONLY)) < 0)
|
||||
if ((stdinfd = open("/dev/null", O_RDONLY)) < 0)
|
||||
goto cleanup;
|
||||
if ((stderrfd = open(_PATH_DEVNULL, O_WRONLY)) < 0)
|
||||
if ((stderrfd = open("/dev/null", O_WRONLY)) < 0)
|
||||
goto cleanup;
|
||||
|
||||
open_max = sysconf (_SC_OPEN_MAX);
|
||||
|
Loading…
x
Reference in New Issue
Block a user