diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2012-06-08 10:22:05 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2012-06-08 10:22:05 +0200 |
commit | ba1d561d767a6f05da62adadc798f98118b2a3ee (patch) | |
tree | 70be595abd2f8ac2cf515896c3299b5fcb453382 | |
parent | 84406e459be31b89de5a3d822f205d61c4c5855b (diff) | |
download | busybox-w32-ba1d561d767a6f05da62adadc798f98118b2a3ee.tar.gz busybox-w32-ba1d561d767a6f05da62adadc798f98118b2a3ee.tar.bz2 busybox-w32-ba1d561d767a6f05da62adadc798f98118b2a3ee.zip |
man: fix handling of gzipped manpages
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r-- | miscutils/man.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/miscutils/man.c b/miscutils/man.c index 611466349..e380fdaba 100644 --- a/miscutils/man.c +++ b/miscutils/man.c | |||
@@ -129,27 +129,21 @@ static int show_manpage(const char *pager, char *man_filename, int man, int leve | |||
129 | #endif | 129 | #endif |
130 | #if ENABLE_FEATURE_SEAMLESS_XZ | 130 | #if ENABLE_FEATURE_SEAMLESS_XZ |
131 | strcpy(ext, "xz"); | 131 | strcpy(ext, "xz"); |
132 | if (run_pipe(pager, man_filename, man, level)) | 132 | if (run_pipe(pager, filename_with_zext, man, level)) |
133 | return 1; | 133 | return 1; |
134 | #endif | 134 | #endif |
135 | #if ENABLE_FEATURE_SEAMLESS_BZ2 | 135 | #if ENABLE_FEATURE_SEAMLESS_BZ2 |
136 | strcpy(ext, "bz2"); | 136 | strcpy(ext, "bz2"); |
137 | if (run_pipe(pager, man_filename, man, level)) | 137 | if (run_pipe(pager, filename_with_zext, man, level)) |
138 | return 1; | 138 | return 1; |
139 | #endif | 139 | #endif |
140 | #if ENABLE_FEATURE_SEAMLESS_GZ | 140 | #if ENABLE_FEATURE_SEAMLESS_GZ |
141 | strcpy(ext, "gz"); | 141 | strcpy(ext, "gz"); |
142 | if (run_pipe(pager, man_filename, man, level)) | 142 | if (run_pipe(pager, filename_with_zext, man, level)) |
143 | return 1; | 143 | return 1; |
144 | #endif | 144 | #endif |
145 | 145 | ||
146 | #if SEAMLESS_COMPRESSION | 146 | return run_pipe(pager, man_filename, man, level); |
147 | ext[-1] = '\0'; | ||
148 | #endif | ||
149 | if (run_pipe(pager, man_filename, man, level)) | ||
150 | return 1; | ||
151 | |||
152 | return 0; | ||
153 | } | 147 | } |
154 | 148 | ||
155 | int man_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; | 149 | int man_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; |