1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950 |
- --- ./tools/lvmcmdline.c
- +++ ./tools/lvmcmdline.c
- @@ -1252,7 +1252,7 @@
- int err = is_valid_fd(STDERR_FILENO);
-
- if (!is_valid_fd(STDIN_FILENO) &&
- - !(stdin = fopen(_PATH_DEVNULL, "r"))) {
- + !freopen(_PATH_DEVNULL, "r", stdin)) {
- if (err)
- perror("stdin stream open");
- else
- @@ -1262,7 +1262,7 @@
- }
-
- if (!is_valid_fd(STDOUT_FILENO) &&
- - !(stdout = fopen(_PATH_DEVNULL, "w"))) {
- + !freopen(_PATH_DEVNULL, "w", stdout)) {
- if (err)
- perror("stdout stream open");
- /* else no stdout */
- @@ -1270,7 +1270,7 @@
- }
-
- if (!is_valid_fd(STDERR_FILENO) &&
- - !(stderr = fopen(_PATH_DEVNULL, "w"))) {
- + !freopen(_PATH_DEVNULL, "w", stderr)) {
- printf("stderr stream open: %s\n",
- strerror(errno));
- return 0;
- --- ./lib/commands/toolcontext.c.orig
- +++ ./lib/commands/toolcontext.c
- @@ -1860,7 +1860,7 @@
- /* FIXME Make this configurable? */
- reset_lvm_errno(1);
-
- -#ifndef VALGRIND_POOL
- +#if !defined(VALGRIND_POOL) && defined(__GLIBC__)
- /* Set in/out stream buffering before glibc */
- if (set_buffering
- #ifdef SYS_gettid
- @@ -2254,7 +2254,7 @@
- if (cmd->libmem)
- dm_pool_destroy(cmd->libmem);
-
- -#ifndef VALGRIND_POOL
- +#if !defined(VALGRIND_POOL) && defined(__GLIBC__)
- if (cmd->linebuffer) {
- /* Reset stream buffering to defaults */
- if (is_valid_fd(STDIN_FILENO) &&
|