emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

man: fix inverted cat/man bool variable

Browse Source
This commit is contained in:
Denis Vlasenko 2008-07-05 08:50:08 +00:00
parent fec8b42317
commit f6efccc065
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
miscutils/man.c
View File

@ -27,7 +27,7 @@ echo ".pl \n(nlu+10"
#define STR_catNULmanNUL "cat\0man" #define STR_catNULmanNUL "cat\0man"
#define STR_cat "cat\0man" #define STR_cat "cat\0man"
static int run_pipe(const char *unpacker, const char *pager, char *man_filename, int cat) static int run_pipe(const char *unpacker, const char *pager, char *man_filename, int man)
{ {
char *cmd; char *cmd;
@ -41,31 +41,32 @@ static int run_pipe(const char *unpacker, const char *pager, char *man_filename,
/* "2>&1" is added so that nroff errors are shown in pager too. /* "2>&1" is added so that nroff errors are shown in pager too.
* Otherwise it may show just empty screen */ * Otherwise it may show just empty screen */
cmd = xasprintf(cat ? "%s '%s' | %s" cmd = xasprintf(
: "%s '%s' | gtbl | nroff -Tlatin1 -mandoc 2>&1 | %s", man ? "%s '%s' | gtbl | nroff -Tlatin1 -mandoc 2>&1 | %s"
unpacker, man_filename, pager); : "%s '%s' | %s",
unpacker, man_filename, pager);
system(cmd); system(cmd);
free(cmd); free(cmd);
return 1; return 1;
} }
/* man_filename is of the form "/dir/dir/dir/name.s.bz2" */ /* man_filename is of the form "/dir/dir/dir/name.s.bz2" */
static int show_manpage(const char *pager, char *man_filename, int cat) static int show_manpage(const char *pager, char *man_filename, int man)
{ {
int len; int len;
if (run_pipe("bunzip2 -c", pager, man_filename, cat)) if (run_pipe("bunzip2 -c", pager, man_filename, man))
return 1; return 1;
len = strlen(man_filename) - 1; len = strlen(man_filename) - 1;
man_filename[len] = '\0'; /* ".bz2" -> ".gz" */ man_filename[len] = '\0'; /* ".bz2" -> ".gz" */
man_filename[len - 2] = 'g'; man_filename[len - 2] = 'g';
if (run_pipe("gunzip -c", pager, man_filename, cat)) if (run_pipe("gunzip -c", pager, man_filename, man))
return 1; return 1;
man_filename[len - 3] = '\0'; /* ".gz" -> "" */ man_filename[len - 3] = '\0'; /* ".gz" -> "" */
if (run_pipe(STR_cat, pager, man_filename, cat)) if (run_pipe(STR_cat, pager, man_filename, man))
return 1; return 1;
return 0; return 0;