From c41eda256d7a963ee651b2532e9e18f76581fcfb Mon Sep 17 00:00:00 2001
From: Lukas Fleischer <calcurse@cryptocrack.de>
Date: Thu, 29 Sep 2011 14:14:19 +0200
Subject: Do not hardcode paths to the default editor/pager
Use "vi" instead of "/usr/bin/vi" and "less" instead of "/usr/bin/less".
Hardcoding absolute paths is a bad idea:
$ uname -rsv
Linux 3.0-ARCH #1 SMP PREEMPT Tue Aug 30 07:32:23 UTC 2011
$ which less
/bin/less
The "$PATH" environment variable will almost always have a better idea
of where these binaries are located.
Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
---
src/calcurse.h | 3 +++
src/vars.c | 6 ++----
2 files changed, 5 insertions(+), 4 deletions(-)
(limited to 'src')
diff --git a/src/calcurse.h b/src/calcurse.h
index 383f53e..091d16a 100644
--- a/src/calcurse.h
+++ b/src/calcurse.h
@@ -100,6 +100,9 @@
#define DPID_PATH DIR_NAME DPID_PATH_NAME
#define NOTES_DIR DIR_NAME NOTES_DIR_NAME
+#define DEFAULT_EDITOR "vi"
+#define DEFAULT_PAGER "less"
+
#define ATTR_FALSE 0
#define ATTR_TRUE 1
#define ATTR_LOWEST 2
diff --git a/src/vars.c b/src/vars.c
index 4b1d7cd..84f8b08 100644
--- a/src/vars.c
+++ b/src/vars.c
@@ -114,8 +114,6 @@ struct dmon_conf dmon;
void
vars_init (struct conf *conf)
{
- char *PATH_VI = "/usr/bin/vi";
- char *PATH_LESS = "/usr/bin/less";
char *ed, *pg;
/* Variables for user configuration */
@@ -133,12 +131,12 @@ vars_init (struct conf *conf)
if (ed == NULL || ed[0] == '\0')
ed = getenv ("EDITOR");
if (ed == NULL || ed[0] == '\0')
- ed = PATH_VI;
+ ed = DEFAULT_EDITOR;
conf->editor = ed;
pg = getenv ("PAGER");
if (pg == NULL || pg[0] == '\0')
- pg = PATH_LESS;
+ pg = DEFAULT_PAGER;
conf->pager = pg;
wins_set_layout (1);
--
cgit v1.2.3-70-g09d2