--- a/lib/commands/toolcontext.c +++ b/lib/commands/toolcontext.c @@ -1785,8 +1785,10 @@ struct cmd_context *create_toolcontext(u unsigned set_filters) { struct cmd_context *cmd; +#if defined(__GLIBC__) && !defined(VALGRIND_POOL) FILE *new_stream; int flags; +#endif #ifdef M_MMAP_MAX mallopt(M_MMAP_MAX, 0); @@ -1822,7 +1824,7 @@ struct cmd_context *create_toolcontext(u /* FIXME Make this configurable? */ reset_lvm_errno(1); -#ifndef VALGRIND_POOL +#if defined(__GLIBC__) && !defined(VALGRIND_POOL) /* Set in/out stream buffering before glibc */ if (set_buffering) { /* Allocate 2 buffers */ @@ -2205,7 +2207,7 @@ void destroy_toolcontext(struct cmd_cont if (cmd->libmem) dm_pool_destroy(cmd->libmem); -#ifndef VALGRIND_POOL +#if defined(__GLIBC__) && !defined(VALGRIND_POOL) if (cmd->linebuffer) { /* Reset stream buffering to defaults */ if (is_valid_fd(STDIN_FILENO) && --- a/tools/lvmcmdline.c +++ b/tools/lvmcmdline.c @@ -1782,6 +1782,7 @@ int lvm_split(char *str, int *argc, char /* Make sure we have always valid filedescriptors 0,1,2 */ static int _check_standard_fds(void) { +#ifdef __GLIBC__ int err = is_valid_fd(STDERR_FILENO); if (!is_valid_fd(STDIN_FILENO) && @@ -1808,6 +1809,12 @@ static int _check_standard_fds(void) strerror(errno)); return 0; } +#else + if (!is_valid_fd(STDERR_FILENO) || + !is_valid_fd(STDOUT_FILENO) || + !is_valid_fd(STDIN_FILENO)) + return 0; +#endif return 1; }