[packages/bvi.git] / bvi-home_etc.patch

diff -Nru bvi-1.3.1/io.c bvi-1.3.1.new/io.c
--- bvi-1.3.1/io.c	Tue Dec 25 13:37:38 2001
+++ bvi-1.3.1.new/io.c	Sun Mar 23 19:07:37 2003
@@ -264,7 +264,8 @@
 {
 	char    *initstr;
 	char    rcpath[MAXCMD];
-
+	char	*config_dir = getenv("CONFIG_DIR");
+	
 	terminal = getenv("TERM");
 	shell = getenv("SHELL");
 	if (shell == NULL || *shell == '\0')
@@ -275,9 +276,15 @@
 		return;
 	}
 	
-	strncpy(rcpath, getenv("HOME"), MAXCMD - 8);
-	rcpath[MAXCMD - 8] = '\0';
-	strcat(rcpath, "/.bvirc");
+	if (config_dir) {
+		strncpy(rcpath, config_dir, MAXCMD - 7);
+		rcpath[MAXCMD - 7] = '\0';
+		strcat(rcpath, "/bvirc");
+	} else {
+		strncpy(rcpath, getenv("HOME"), MAXCMD - 8);
+		rcpath[MAXCMD - 8] = '\0';
+		strcat(rcpath, "/.bvirc");
+	}
 	if (stat(rcpath, &buf) == 0) {
 		if (buf.st_uid == getuid()) read_rc(rcpath);
 	}
Commit	Line	Data
c2bcfd1f	1	diff -Nru bvi-1.3.1/io.c bvi-1.3.1.new/io.c
	2	--- bvi-1.3.1/io.c Tue Dec 25 13:37:38 2001
	3	+++ bvi-1.3.1.new/io.c Sun Mar 23 19:07:37 2003
	4	@@ -264,7 +264,8 @@
	5	{
	6	char *initstr;
	7	char rcpath[MAXCMD];
	8	-
	9	+ char *config_dir = getenv("CONFIG_DIR");
	10	+
	11	terminal = getenv("TERM");
	12	shell = getenv("SHELL");
	13	if (shell == NULL \|\| *shell == '\0')
	14	@@ -275,9 +276,15 @@
	15	return;
	16	}
	17
	18	- strncpy(rcpath, getenv("HOME"), MAXCMD - 8);
	19	- rcpath[MAXCMD - 8] = '\0';
	20	- strcat(rcpath, "/.bvirc");
	21	+ if (config_dir) {
	22	+ strncpy(rcpath, config_dir, MAXCMD - 7);
	23	+ rcpath[MAXCMD - 7] = '\0';
	24	+ strcat(rcpath, "/bvirc");
	25	+ } else {
	26	+ strncpy(rcpath, getenv("HOME"), MAXCMD - 8);
	27	+ rcpath[MAXCMD - 8] = '\0';
	28	+ strcat(rcpath, "/.bvirc");
	29	+ }
	30	if (stat(rcpath, &buf) == 0) {
	31	if (buf.st_uid == getuid()) read_rc(rcpath);
	32	}