diff options
| -rw-r--r-- | debugfs/util.c | 7 | ||||
| -rw-r--r-- | lib/ss/ss.h | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/debugfs/util.c b/debugfs/util.c index 7cbf34df..f43b4704 100644 --- a/debugfs/util.c +++ b/debugfs/util.c @@ -26,6 +26,7 @@ extern char *optarg; extern int optreset; /* defined by BSD, but not others */ #endif +#include "ss/ss.h" #include "debugfs.h" /* @@ -79,14 +80,14 @@ static const char *find_pager(char *buf) FILE *open_pager(void) { FILE *outfile = 0; - const char *pager = getenv("DEBUGFS_PAGER"); + const char *pager = ss_safe_getenv("DEBUGFS_PAGER"); char buf[80]; signal(SIGPIPE, SIG_IGN); if (!isatty(1)) return stdout; if (!pager) - pager = getenv("PAGER"); + pager = ss_safe_getenv("PAGER"); if (!pager) pager = find_pager(buf); if (!pager || @@ -197,7 +198,7 @@ char *time_to_string(__u32 cl) if (do_gmt == -1) { /* The diet libc doesn't respect the TZ environemnt variable */ - tz = getenv("TZ"); + tz = ss_safe_getenv("TZ"); if (!tz) tz = ""; do_gmt = !strcmp(tz, "GMT"); diff --git a/lib/ss/ss.h b/lib/ss/ss.h index 6cc050bd..7333ffc9 100644 --- a/lib/ss/ss.h +++ b/lib/ss/ss.h @@ -90,6 +90,7 @@ void ss_unimplemented(int argc, const char * const *argv, void ss_set_prompt(int sci_idx, char *new_prompt); char *ss_get_prompt(int sci_idx); void ss_get_readline(int sci_idx); +char *ss_safe_getenv(const char *arg); extern ss_request_table ss_std_requests; #endif /* _ss_h */ |