projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
utils: Allow users to define LTTNG_MANPATH
[lttng-tools.git]
/
src
/
common
/
utils.cpp
diff --git
a/src/common/utils.cpp
b/src/common/utils.cpp
index 0f6e0362f2d32f6c557ffede0341ed0d829b2ff7..7cd61c049c3ffeae0b7bdcf74dc5a0eb9a6c58da 100644
(file)
--- a/
src/common/utils.cpp
+++ b/
src/common/utils.cpp
@@
-1020,10
+1020,23
@@
static const char *get_man_bin_path()
return DEFAULT_MAN_BIN_PATH;
}
return DEFAULT_MAN_BIN_PATH;
}
+static const char *get_manpath()
+{
+ char *manpath = lttng_secure_getenv(DEFAULT_MANPATH);
+
+ if (manpath) {
+ return manpath;
+ }
+
+ /* As defined during configuration. */
+ return MANPATH;
+}
+
int utils_show_help(int section, const char *page_name, const char *help_msg)
{
char section_string[8];
const char *man_bin_path = get_man_bin_path();
int utils_show_help(int section, const char *page_name, const char *help_msg)
{
char section_string[8];
const char *man_bin_path = get_man_bin_path();
+ const char *manpath = get_manpath();
int ret = 0;
if (help_msg) {
int ret = 0;
if (help_msg) {
@@
-1042,7
+1055,7
@@
int utils_show_help(int section, const char *page_name, const char *help_msg)
* be installed outside /usr, in which case its man pages are
* not located in the default /usr/share/man directory.
*/
* be installed outside /usr, in which case its man pages are
* not located in the default /usr/share/man directory.
*/
- ret = execlp(man_bin_path, "man", "-M",
MANPATH
, section_string, page_name, NULL);
+ ret = execlp(man_bin_path, "man", "-M",
manpath
, section_string, page_name, NULL);
end:
return ret;
end:
return ret;
This page took
0.024168 seconds
and
4
git commands to generate.