From fd56cef4ee70015a944161ada0faa969da40434c Mon Sep 17 00:00:00 2001
From: David Pfitzner <dwp@mso.anu.edu.au>
Date: Tue, 16 Feb 1999 10:44:10 +0000
Subject: [PATCH] Reverted to cvs revision 1.8, since 1.9 was checked in by
 mistake, and the 1.10 fix caused segfault if FREECIV_DATADIR is set.

[[originally from CVS; cvs2svn created svn r1040]]
---
 common/shared.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/common/shared.c b/common/shared.c
index c65c2e622c..298d37a814 100644
--- a/common/shared.c
+++ b/common/shared.c
@@ -356,17 +356,15 @@ only supply one filename at a time.
 ***************************************************************************/
 char *datafilename(char *filename)
 {
-  static const char* datadir=0;
+  static char* datadir=0;
   static char  realfile[512];
   if(!datadir) {
-    char *tmp;
-    if((tmp = getenv("FREECIV_DATADIR"))) {
+    if((datadir = getenv("FREECIV_DATADIR"))) {
       int i;
       for(i=strlen(datadir)-1; i>=0 && isspace((int)datadir[i]); i--)
-	tmp[i] = '\0';
-      if(tmp[i] == '/')
-	tmp[i] = '\0';
-      datadir = tmp;
+	datadir[i] = '\0';
+      if(datadir[i] == '/')
+	datadir[i] = '\0';
     } else {
       datadir = FREECIV_DATADIR; /* correct if not 'data' is the default */
     };