From 6b14b414cce083a8a04a8265b657a4fe106f0988 Mon Sep 17 00:00:00 2001 From: juandon Date: Sat, 22 Mar 2003 20:05:50 +0000 Subject: [PATCH] - CONFIG_DIR support Changed files: aewm-home_etc.patch -> 1.1 --- aewm-home_etc.patch | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 aewm-home_etc.patch diff --git a/aewm-home_etc.patch b/aewm-home_etc.patch new file mode 100644 index 0000000..2ff3ec1 --- /dev/null +++ b/aewm-home_etc.patch @@ -0,0 +1,37 @@ +diff -Nru aewm-1.2.2/clients/lib/launch.c aewm-1.2.2.new/clients/lib/launch.c +--- aewm-1.2.2/clients/lib/launch.c Sat Nov 23 23:41:14 2002 ++++ aewm-1.2.2.new/clients/lib/launch.c Sat Mar 22 18:11:25 2003 +@@ -69,9 +69,13 @@ + { + char defrc_buf[BUF_SIZE]; + FILE *rc; +- ++ char *config_dir = getenv("CONFIG_DIR"); ++ + if (rcfile && (rc = fopen(rcfile, "r"))) goto opened; +- snprintf(defrc_buf, sizeof defrc_buf, "%s/.aewm/clientsrc", getenv("HOME")); ++ if (config_dir) ++ snprintf(defrc_buf, sizeof defrc_buf, "%s/aewm/clientsrc", config_dir); ++ else ++ snprintf(defrc_buf, sizeof defrc_buf, "%s/.aewm/clientsrc", getenv("HOME")); + if ((rc = fopen(defrc_buf, "r"))) goto opened; + if ((rc = fopen(DEF_RC, "r"))) goto opened; + +diff -Nru aewm-1.2.2/init.c aewm-1.2.2.new/init.c +--- aewm-1.2.2/init.c Sun Nov 24 00:02:51 2002 ++++ aewm-1.2.2.new/init.c Sat Mar 22 18:09:32 2003 +@@ -277,9 +277,13 @@ + { + char defrc_buf[BUF_SIZE]; + FILE *rc; ++ char *config_dir = getenv("CONFIG_DIR"); + + if (rcfile && (rc = fopen(rcfile, "r"))) goto opened; +- snprintf(defrc_buf, sizeof defrc_buf, "%s/.aewm/aewmrc", getenv("HOME")); ++ if (config_dir) ++ snprintf(defrc_buf, sizeof defrc_buf, "%s/aewm/aewmrc", config_dir); ++ else ++ snprintf(defrc_buf, sizeof defrc_buf, "%s/.aewm/aewmrc", getenv("HOME")); + if ((rc = fopen(defrc_buf, "r"))) goto opened; + if ((rc = fopen(DEF_RC, "r"))) goto opened; + -- 2.44.0