X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Fconf-input.c;h=b890295d99742025c5fecbe69c89544770d6c86d;hb=4d9bc7b7d4159cc0c59e608d64a1289b1ac3b45a;hp=a625630a4f9b46731ea7d2a95970389f36904e7a;hpb=8f01c7e5788479a93d75bca01f4e47013f0fba67;p=libucw.git

diff --git a/lib/conf-input.c b/lib/conf-input.c
index a625630a..b890295d 100644
--- a/lib/conf-input.c
+++ b/lib/conf-input.c
@@ -284,6 +284,11 @@ error:
 #endif
 char *cf_def_file = DEFAULT_CONFIG;
 
+#ifndef ENV_VAR_CONFIG
+#define ENV_VAR_CONFIG NULL
+#endif
+char *cf_env_file = ENV_VAR_CONFIG;
+
 static uns postpone_commit;			// only for cf_getopt()
 static uns everything_committed;		// after the 1st load, this flag is set on
 
@@ -381,13 +386,13 @@ load_default(void)
 {
   if (cf_def_file)
     {
-      char *env = getenv("SH_CONFIG");
-      if (env)
+      char *env;
+      if (cf_env_file && (env = getenv(cf_env_file)))
         {
 	  if (cf_load(env))
 	    die("Cannot load config file %s", env);
 	}
-      if (cf_load(cf_def_file))
+      else if (cf_load(cf_def_file))
         die("Cannot load default config %s", cf_def_file);
     }
 }