utils/lvm2/patches/002-const-stdio.patch

   1 --- a/lib/commands/toolcontext.c
   2 +++ b/lib/commands/toolcontext.c
   3 @@ -1740,8 +1740,10 @@ struct cmd_context *create_toolcontext(u
   4                                        unsigned set_filters)
   5  {
   6         struct cmd_context *cmd;
   7 +#if defined(__GLIBC__) && !defined(VALGRIND_POOL)
   8         FILE *new_stream;
   9         int flags;
  10 +#endif
  11
  12  #ifdef M_MMAP_MAX
  13         mallopt(M_MMAP_MAX, 0);
  14 @@ -1777,7 +1779,7 @@ struct cmd_context *create_toolcontext(u
  15         /* FIXME Make this configurable? */
  16         reset_lvm_errno(1);
  17
  18 -#ifndef VALGRIND_POOL
  19 +#if defined(__GLIBC__) && !defined(VALGRIND_POOL)
  20         /* Set in/out stream buffering before glibc */
  21         if (set_buffering) {
  22                 /* Allocate 2 buffers */
  23 @@ -2160,7 +2162,7 @@ void destroy_toolcontext(struct cmd_cont
  24         if (cmd->libmem)
  25                 dm_pool_destroy(cmd->libmem);
  26
  27 -#ifndef VALGRIND_POOL
  28 +#if defined(__GLIBC__) && !defined(VALGRIND_POOL)
  29         if (cmd->linebuffer) {
  30                 /* Reset stream buffering to defaults */
  31                 if (is_valid_fd(STDIN_FILENO) &&
  32 --- a/tools/lvmcmdline.c
  33 +++ b/tools/lvmcmdline.c
  34 @@ -1741,6 +1741,7 @@ int lvm_split(char *str, int *argc, char
  35  /* Make sure we have always valid filedescriptors 0,1,2 */
  36  static int _check_standard_fds(void)
  37  {
  38 +#ifdef __GLIBC__
  39         int err = is_valid_fd(STDERR_FILENO);
  40
  41         if (!is_valid_fd(STDIN_FILENO) &&
  42 @@ -1767,6 +1768,12 @@ static int _check_standard_fds(void)
  43                        strerror(errno));
  44                 return 0;
  45         }
  46 +#else
  47 +       if (!is_valid_fd(STDERR_FILENO) ||
  48 +           !is_valid_fd(STDOUT_FILENO) ||
  49 +           !is_valid_fd(STDIN_FILENO))
  50 +               return 0;
  51 +#endif
  52
  53         return 1;
  54  }