vcs.maemo.org Git - busybox-power/blob - debian/patches/hotfixes/busybox-1.20.1-man.patch

   1 --- busybox-1.20.1/miscutils/man.c
   2 +++ busybox-1.20.1-man/miscutils/man.c
   3 @@ -129,27 +129,21 @@ static int show_manpage(const char *page
   4  #endif
   5  #if ENABLE_FEATURE_SEAMLESS_XZ
   6         strcpy(ext, "xz");
   7 -       if (run_pipe(pager, man_filename, man, level))
   8 +       if (run_pipe(pager, filename_with_zext, man, level))
   9                 return 1;
  10  #endif
  11  #if ENABLE_FEATURE_SEAMLESS_BZ2
  12         strcpy(ext, "bz2");
  13 -       if (run_pipe(pager, man_filename, man, level))
  14 +       if (run_pipe(pager, filename_with_zext, man, level))
  15                 return 1;
  16  #endif
  17  #if ENABLE_FEATURE_SEAMLESS_GZ
  18         strcpy(ext, "gz");
  19 -       if (run_pipe(pager, man_filename, man, level))
  20 +       if (run_pipe(pager, filename_with_zext, man, level))
  21                 return 1;
  22  #endif
  23
  24 -#if SEAMLESS_COMPRESSION
  25 -       ext[-1] = '\0';
  26 -#endif
  27 -       if (run_pipe(pager, man_filename, man, level))
  28 -               return 1;
  29 -
  30 -       return 0;
  31 +       return run_pipe(pager, man_filename, man, level);
  32  }
  33
  34  int man_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;