diff options
| author | Ron Yorston <rmy@pobox.com> | 2016-10-19 17:01:55 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2016-10-19 17:01:55 +0100 |
| commit | 075814c60a316cfd088c88f26f75ab21b5850b98 (patch) | |
| tree | f6e33ac693630827deb309faa5fa4931588db57d /miscutils/man.c | |
| parent | 977d65c1bbc57f5cdd0c8bfd67c8b5bb1cd390dd (diff) | |
| parent | f37e1155aabde6bd95d267a8aec347cedccb8bc3 (diff) | |
| download | busybox-w32-075814c60a316cfd088c88f26f75ab21b5850b98.tar.gz busybox-w32-075814c60a316cfd088c88f26f75ab21b5850b98.tar.bz2 busybox-w32-075814c60a316cfd088c88f26f75ab21b5850b98.zip | |
Merge branch busybox (up to "ash: comment out free(p) just before...")
Diffstat (limited to 'miscutils/man.c')
| -rw-r--r-- | miscutils/man.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/miscutils/man.c b/miscutils/man.c index 4ce40b247..6d32890d1 100644 --- a/miscutils/man.c +++ b/miscutils/man.c | |||
| @@ -232,8 +232,8 @@ int man_main(int argc UNUSED_PARAM, char **argv) | |||
| 232 | if (!token[1]) | 232 | if (!token[1]) |
| 233 | continue; | 233 | continue; |
| 234 | if (strcmp("DEFINE", token[0]) == 0) { | 234 | if (strcmp("DEFINE", token[0]) == 0) { |
| 235 | if (is_prefixed_with("pager", token[1])) { | 235 | if (is_prefixed_with(token[1], "pager")) { |
| 236 | pager = xstrdup(skip_whitespace(token[1]) + 5); | 236 | pager = xstrdup(skip_whitespace(token[1] + 5)); |
| 237 | } | 237 | } |
| 238 | } else | 238 | } else |
| 239 | if (strcmp("MANDATORY_MANPATH"+10, token[0]) == 0 /* "MANPATH"? */ | 239 | if (strcmp("MANDATORY_MANPATH"+10, token[0]) == 0 /* "MANPATH"? */ |