chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
systemctl: Add SYSTEMD_PAGER for setting the pager to use in systemctl
[elogind.git]
/
src
/
systemctl.c
diff --git
a/src/systemctl.c
b/src/systemctl.c
index 2bd173c5d0216699363b77776a8f4273db01d45c..ab41566577167f3fe9997328197e831abd1ef496 100644
(file)
--- a/
src/systemctl.c
+++ b/
src/systemctl.c
@@
-3963,6
+3963,7
@@
static int create_symlink(const char *verb, const char *old_path, const char *ne
return 1;
}
return 1;
}
+ free(dest);
return 0;
}
return 0;
}
@@
-4089,7
+4090,7
@@
static int install_info_apply(const char *verb, LookupPaths *paths, InstallInfo
}
if (!f) {
}
if (!f) {
-#if (defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_SUSE)
) || defined(TARGET_MEEGO
) && defined (HAVE_SYSV_COMPAT)
+#if (defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_SUSE)
|| defined(TARGET_MEEGO) || defined(TARGET_ALTLINUX)
) && defined (HAVE_SYSV_COMPAT)
if (endswith(i->name, ".service")) {
char *sysv;
if (endswith(i->name, ".service")) {
char *sysv;
@@
-5571,7
+5572,7
@@
static void pager_open(void) {
if (!on_tty() || arg_no_pager)
return;
if (!on_tty() || arg_no_pager)
return;
- if ((pager = getenv("PAGER")))
+ if ((pager = getenv("
SYSTEMD_PAGER")) || (pager = getenv("
PAGER")))
if (!*pager || streq(pager, "cat"))
return;
if (!*pager || streq(pager, "cat"))
return;