From: juandon <witekfl@pld-linux.org>
Date: Mon, 7 Apr 2003 12:21:34 +0000 (+0000)
Subject: - s/CONFIG_DIR/ETC_DIR/
X-Git-Tag: auto/ac/bzflag-1_10_4_20040125-1~12
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fbzflag.git;a=commitdiff_plain;h=2a9edff94341fa2f0be712d0c14694021bb7cd4d

- s/CONFIG_DIR/ETC_DIR/
- s/home_etc/etc_dir/

Changed files:
    bzflag-etc_dir.patch -> 1.1
---

diff --git a/bzflag-etc_dir.patch b/bzflag-etc_dir.patch
new file mode 100644
index 0000000..abcb435
--- /dev/null
+++ b/bzflag-etc_dir.patch
@@ -0,0 +1,78 @@
+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")) {