[packages/bzflag.git] / bzflag-etc_dir.patch

diff -Nru bzflag-1.7g0/src/bzflag/bzflag.cxx bzflag-1.7g0.new/src/bzflag/bzflag.cxx
--- bzflag-1.7g0/src/bzflag/bzflag.cxx	Thu Dec  5 17:22:44 2002
+++ bzflag-1.7g0.new/src/bzflag/bzflag.cxx	Sun Mar 23 19:21:11 2003
@@ -117,12 +117,18 @@
 #if !defined(_WIN32) & !defined(macintosh)
 
   BzfString name;
-  struct passwd* pwent = getpwuid(getuid());
-  if (pwent && pwent->pw_dir) {
-    name += BzfString(pwent->pw_dir);
-    name += "/";
+  char *etc_dir = getenv("ETC_DIR");
+  if (etc_dir != NULL) {
+    name += BzfString(etc_dir);
+    name += "/bzflag";
+  } else {
+    struct passwd* pwent = getpwuid(getuid());
+    if (pwent && pwent->pw_dir) {
+      name += BzfString(pwent->pw_dir);
+      name += "/";
+    }
+    name += ".bzflag";
   }
-  name += ".bzflag";
 
   // add in hostname on UNIX
   if (getenv("HOST")) {
@@ -168,12 +174,18 @@
 static BzfString	getConfigFileName2()
 {
   BzfString name;
-  struct passwd* pwent = getpwuid(getuid());
-  if (pwent && pwent->pw_dir) {
-    name += BzfString(pwent->pw_dir);
-    name += "/";
+  const char *etc_dir = getenv("ETC_DIR");
+  if (etc_dir) {
+    name += BzfString(etc_dir);
+    name += "/bzflag";
+  } else {
+    struct passwd* pwent = getpwuid(getuid());
+    if (pwent && pwent->pw_dir) {
+      name += BzfString(pwent->pw_dir);
+      name += "/";
+    }
+    name += ".bzflag";
   }
-  name += ".bzflag";
   return name;
 }
 #endif
diff -Nru bzflag-1.7g0/src/bzflag/playing.cxx bzflag-1.7g0.new/src/bzflag/playing.cxx
--- bzflag-1.7g0/src/bzflag/playing.cxx	Sat Dec  7 08:25:08 2002
+++ bzflag-1.7g0.new/src/bzflag/playing.cxx	Sun Mar 23 19:23:20 2003
@@ -3419,12 +3419,18 @@
   return "";
 #else
   BzfString name;
-  struct passwd *pwent = getpwuid(getuid());
-  if (pwent && pwent->pw_dir) {
-    name += BzfString(pwent->pw_dir);
-    name += "/";
+  const char *etc_dir = getenv("ETC_DIR");
+  if (etc_dir) {
+    name += BzfString(etc_dir);
+    name += "/bzflag-cache";
+  } else {
+    struct passwd *pwent = getpwuid(getuid());
+    if (pwent && pwent->pw_dir) {
+      name += BzfString(pwent->pw_dir);
+      name += "/";
+    }
+    name += ".bzflag-cache";
   }
-  name += ".bzflag-cache";
 
   // add in hostname on UNIX
   if (getenv("HOST")) {
Commit	Line	Data
2a9edff9	1	diff -Nru bzflag-1.7g0/src/bzflag/bzflag.cxx bzflag-1.7g0.new/src/bzflag/bzflag.cxx
	2	--- bzflag-1.7g0/src/bzflag/bzflag.cxx Thu Dec 5 17:22:44 2002
	3	+++ bzflag-1.7g0.new/src/bzflag/bzflag.cxx Sun Mar 23 19:21:11 2003
	4	@@ -117,12 +117,18 @@
	5	#if !defined(_WIN32) & !defined(macintosh)
	6
	7	BzfString name;
	8	- struct passwd* pwent = getpwuid(getuid());
	9	- if (pwent && pwent->pw_dir) {
	10	- name += BzfString(pwent->pw_dir);
	11	- name += "/";
	12	+ char *etc_dir = getenv("ETC_DIR");
	13	+ if (etc_dir != NULL) {
	14	+ name += BzfString(etc_dir);
	15	+ name += "/bzflag";
	16	+ } else {
	17	+ struct passwd* pwent = getpwuid(getuid());
	18	+ if (pwent && pwent->pw_dir) {
	19	+ name += BzfString(pwent->pw_dir);
	20	+ name += "/";
	21	+ }
	22	+ name += ".bzflag";
	23	}
	24	- name += ".bzflag";
	25
	26	// add in hostname on UNIX
	27	if (getenv("HOST")) {
	28	@@ -168,12 +174,18 @@
	29	static BzfString getConfigFileName2()
	30	{
	31	BzfString name;
	32	- struct passwd* pwent = getpwuid(getuid());
	33	- if (pwent && pwent->pw_dir) {
	34	- name += BzfString(pwent->pw_dir);
	35	- name += "/";
	36	+ const char *etc_dir = getenv("ETC_DIR");
	37	+ if (etc_dir) {
	38	+ name += BzfString(etc_dir);
	39	+ name += "/bzflag";
	40	+ } else {
	41	+ struct passwd* pwent = getpwuid(getuid());
	42	+ if (pwent && pwent->pw_dir) {
	43	+ name += BzfString(pwent->pw_dir);
	44	+ name += "/";
	45	+ }
	46	+ name += ".bzflag";
	47	}
	48	- name += ".bzflag";
	49	return name;
	50	}
	51	#endif
	52	diff -Nru bzflag-1.7g0/src/bzflag/playing.cxx bzflag-1.7g0.new/src/bzflag/playing.cxx
	53	--- bzflag-1.7g0/src/bzflag/playing.cxx Sat Dec 7 08:25:08 2002
	54	+++ bzflag-1.7g0.new/src/bzflag/playing.cxx Sun Mar 23 19:23:20 2003
	55	@@ -3419,12 +3419,18 @@
	56	return "";
	57	#else
	58	BzfString name;
	59	- struct passwd *pwent = getpwuid(getuid());
	60	- if (pwent && pwent->pw_dir) {
	61	- name += BzfString(pwent->pw_dir);
	62	- name += "/";
	63	+ const char *etc_dir = getenv("ETC_DIR");
	64	+ if (etc_dir) {
65	+ name += BzfString(etc_dir);
66	+ name += "/bzflag-cache";
67	+ } else {
68	+ struct passwd *pwent = getpwuid(getuid());
69	+ if (pwent && pwent->pw_dir) {
70	+ name += BzfString(pwent->pw_dir);
71	+ name += "/";
72	+ }
73	+ name += ".bzflag-cache";
74	}
75	- name += ".bzflag-cache";
76
77	// add in hostname on UNIX
78	if (getenv("HOST")) {