update modules to https://trac.osgeo.org/grass/changeset/63830

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@63831 15284696-431f-4ddb-bdfa-cd5b030d7da7

db/drivers/dbf/db.c

@@ -69,8 +69,8 @@ int db__driver_open_database(dbHandle * handle)
 	    if (tokens[n][0] == '$') {
 		G_strchg(tokens[n], '$', ' ');
 		G_chop(tokens[n]);
-		strcat(db.name, G__getenv(tokens[n]));
-		G_debug(3, "   -> %s", G__getenv(tokens[n]));
+		strcat(db.name, G_getenv_nofatal(tokens[n]));
+		G_debug(3, "   -> %s", G_getenv_nofatal(tokens[n]));
 	    }
 	    else
 		strcat(db.name, tokens[n]);

db/drivers/mysql/replace.c

@@ -49,8 +49,8 @@ int replace_variables(char *in, char **datadir, char **database)
 	    if (tokens[n][0] == '$') {
 		G_strchg(tokens[n], '$', ' ');
 		G_chop(tokens[n]);
-		strcat(tmp, G__getenv(tokens[n]));
-		G_debug(3, "   -> %s", G__getenv(tokens[n]));
+		strcat(tmp, G_getenv_nofatal(tokens[n]));
+		G_debug(3, "   -> %s", G_getenv_nofatal(tokens[n]));
 	    }
 	    else {
 		strcat(tmp, tokens[n]);

db/drivers/sqlite/db.c

@@ -67,8 +67,8 @@ int db__driver_open_database(dbHandle * handle)
 	    if (tokens[n][0] == '$') {
 		G_strchg(tokens[n], '$', ' ');
 		G_chop(tokens[n]);
-		strcat(name2, G__getenv(tokens[n]));
-		G_debug(3, "   -> %s", G__getenv(tokens[n]));
+		strcat(name2, G_getenv_nofatal(tokens[n]));
+		G_debug(3, "   -> %s", G_getenv_nofatal(tokens[n]));
 	    }
 	    else {
 		strcat(name2, tokens[n]);

display/d.mon/list.c

@@ -62,7 +62,7 @@ int check_mon(const char *name)
     
     env_name = NULL;
     G_asprintf(&env_name, "MONITOR_%s_ENVFILE", G_store_upper(name));
-    str = G__getenv(env_name);
+    str = G_getenv_nofatal(env_name);
     if (!str)
 	return FALSE;
     
@@ -79,7 +79,7 @@ void list_cmd(const char *name, FILE *fd_out)
 
     cmd_name = NULL;
     G_asprintf(&cmd_name, "MONITOR_%s_CMDFILE", G_store_upper(name));
-    cmd_value = G__getenv(cmd_name);
+    cmd_value = G_getenv_nofatal(cmd_name);
     if (!cmd_value)
 	G_fatal_error(_("Command file not found"));
     

display/d.mon/main.c

@@ -149,7 +149,7 @@ int main(int argc, char *argv[])
     if (selected_flag->answer || release_flag->answer || cmd_flag->answer) {
 	if (list_flag->answer)
 	    G_warning(_("Flag -%c ignored"), list_flag->key);
-	mon = G__getenv("MONITOR");
+	mon = G_getenv_nofatal("MONITOR");
 	if (mon) {
 	    if (selected_flag->answer) {
 		G_verbose_message(_("Currently selected monitor:"));

display/d.mon/select.c

@@ -9,7 +9,7 @@ int select_mon(const char *name)
     char **list;
     int   i, n, found;
 
-    curr_mon = G__getenv("MONITOR");
+    curr_mon = G_getenv_nofatal("MONITOR");
     if (G_strcasecmp(name, curr_mon) == 0) {
 	G_warning(_("Monitor <%s> is already selected"), name);
 	return 0;

display/d.mon/start.c

@@ -117,7 +117,7 @@ int start_mon(const char *name, const char *output, int select,
     if (check_mon(name)) {
         const char *curr_mon;
 
-        curr_mon = G__getenv("MONITOR");
+        curr_mon = G_getenv_nofatal("MONITOR");
 	if (select && (!curr_mon || strcmp(curr_mon, name) != 0))
 	    G_setenv("MONITOR", name);
 

display/d.mon/stop.c

@@ -32,7 +32,7 @@ int stop(const char *name)
     env_name = NULL;
     G_asprintf(&env_name, "MONITOR_%s_ENVFILE", G_store_upper(name));
     
-    env_file = G__getenv(env_name);
+    env_file = G_getenv_nofatal(env_name);
     if (!env_file)
 	G_warning(_("Env file not found"));
     
@@ -49,7 +49,7 @@ int stop_wx(const char *name)
     env_name = NULL;
     G_asprintf(&env_name, "MONITOR_%s_PID", G_store_upper(name));
     
-    pid = G__getenv(env_name);
+    pid = G_getenv_nofatal(env_name);
     if (!pid) {
 	clean_env(name);
 	G_fatal_error(_("PID file not found"));

general/g.gisenv/main.c

@@ -117,7 +117,7 @@ int main(int argc, char *argv[])
 	    quote = !isatty(fileno(stdout));
 	
 	for (n = 0; (name = G_get_env_name(n)); n++) {
-	    value = (char *)G__getenv(name);
+	    value = (char *)G_getenv_nofatal(name);
 	    if (value) {
 		if (!quote)
 		    fprintf(stdout, "%s=%s\n", name, value);

general/g.gui/main.c

@@ -84,7 +84,7 @@ int main(int argc, char *argv[])
     if (nolaunch->answer && !update->answer)
 	update->answer = TRUE;
     
-    gui_type_env = G__getenv("GUI");
+    gui_type_env = G_getenv_nofatal("GUI");
 
     if (!type->answer) {
 	if (gui_type_env && strcmp(gui_type_env, "text")) {

general/g.mapset/main.c

@@ -98,9 +98,9 @@ int main(int argc, char *argv[])
 	exit(EXIT_FAILURE);
 
     /* Store original values */
-    gisdbase_old = G__getenv("GISDBASE");
-    location_old = G__getenv("LOCATION_NAME");
-    mapset_old = G__getenv("MAPSET");
+    gisdbase_old = G_getenv_nofatal("GISDBASE");
+    location_old = G_getenv_nofatal("LOCATION_NAME");
+    mapset_old = G_getenv_nofatal("MAPSET");
 
     if (flag.curr->answer) {
 	fprintf(stdout, "%s\n", mapset_old);
@@ -125,8 +125,8 @@ int main(int argc, char *argv[])
 	char **ms;
 	int nmapsets;
 
-	G__setenv("LOCATION_NAME", location_new);
-	G__setenv("GISDBASE", gisdbase_new);
+	G_setenv_nogisrc("LOCATION_NAME", location_new);
+	G_setenv_nogisrc("GISDBASE", gisdbase_new);
 
 	ms = G_get_available_mapsets();
 

imagery/i.find/main.c

@@ -70,8 +70,8 @@ int main(int argc, char *argv[])
      */
     tempfile = G_tempfile();
 
-    G__setenv("LOCATION_NAME", argv[1]);
-    G__setenv("MAPSET", argv[2]);
+    G_setenv_nogisrc("LOCATION_NAME", argv[1]);
+    G_setenv_nogisrc("MAPSET", argv[2]);
 
     for (n = 3; n < argc; n += 2) {
 	FILE *fd;

imagery/i.ortho.photo/i.ortho.elev/main.c

@@ -122,11 +122,11 @@ int main(int argc, char *argv[])
 
 
     G_create_alt_env();
-    G__setenv("LOCATION_NAME", location);
+    G_setenv_nogisrc("LOCATION_NAME", location);
 
     stat = G__mapset_permissions(mapset);
     if (stat > 0) {
-	G__setenv("MAPSET", mapset);
+	G_setenv_nogisrc("MAPSET", mapset);
 	G_create_alt_search_path();
 	G_switch_env();
 	G_switch_search_path();
@@ -156,7 +156,7 @@ int main(int argc, char *argv[])
 	    }
 
 	    I_get_group_elev(group, elev_layer, mapset_elev, tl, math_exp, units, nd);
-	    overwrite = G__getenv("OVERWRITE") != NULL;
+	    overwrite = G_getenv_nofatal("OVERWRITE") != NULL;
 	    
 	    if (!overwrite && *elev_layer) {
 		G_warning(_("Elevation for group <%s> is already set to <%s>"),

imagery/i.ortho.photo/i.ortho.rectify/env.c

@@ -34,9 +34,9 @@ int select_target_env(void)
 int show_env(void)
 {
     fprintf(stderr, "env(%d) switch to LOCATION %s, MAPSET %s\n", which_env,
-	    G__getenv("LOCATION_NAME") ==
-	    NULL ? "?" : G__getenv("LOCATION_NAME"),
-	    G__getenv("MAPSET") == NULL ? "?" : G__getenv("MAPSET"));
+	    G_getenv_nofatal("LOCATION_NAME") ==
+	    NULL ? "?" : G_getenv_nofatal("LOCATION_NAME"),
+	    G_getenv_nofatal("MAPSET") == NULL ? "?" : G_getenv_nofatal("MAPSET"));
     G_sleep(2);
 
     return 0;

imagery/i.ortho.photo/i.ortho.rectify/target.c

@@ -20,10 +20,10 @@ int get_target(char *group)
 	goto error;
     }
     select_target_env();
-    G__setenv("LOCATION_NAME", location);
+    G_setenv_nogisrc("LOCATION_NAME", location);
     stat = G__mapset_permissions(mapset);
     if (stat > 0) {
-	G__setenv("MAPSET", mapset);
+	G_setenv_nogisrc("MAPSET", mapset);
 	G_get_window(&target_window);
 	select_current_env();
 	return 1;

imagery/i.rectify/env.c

@@ -33,9 +33,9 @@ int select_target_env(void)
 int show_env(void)
 {
     fprintf(stderr, "env(%d) switch to LOCATION %s, MAPSET %s\n", which_env,
-	    G__getenv("LOCATION_NAME") ==
-	    NULL ? "?" : G__getenv("LOCATION_NAME"),
-	    G__getenv("MAPSET") == NULL ? "?" : G__getenv("MAPSET"));
+	    G_getenv_nofatal("LOCATION_NAME") ==
+	    NULL ? "?" : G_getenv_nofatal("LOCATION_NAME"),
+	    G_getenv_nofatal("MAPSET") == NULL ? "?" : G_getenv_nofatal("MAPSET"));
     G_sleep(2);
 
     return 0;

imagery/i.rectify/target.c

@@ -21,10 +21,10 @@ int get_target(char *group)
 	goto error;
     }
     select_target_env();
-    G__setenv("LOCATION_NAME", location);
+    G_setenv_nogisrc("LOCATION_NAME", location);
     stat = G__mapset_permissions(mapset);
     if (stat > 0) {
-	G__setenv("MAPSET", mapset);
+	G_setenv_nogisrc("MAPSET", mapset);
 	G_get_window(&target_window);
 	select_current_env();
 	return 1;

raster/r.in.gdal/main.c

@@ -649,7 +649,7 @@ int main(int argc, char *argv[])
 		
 		/* does the target location exist? */
 		G_create_alt_env();
-		G__setenv("LOCATION_NAME", parm.target->answer);
+		G_setenv_nogisrc("LOCATION_NAME", parm.target->answer);
 		sprintf(target_mapset, "PERMANENT");	/* must exist */
 
 		if (G__mapset_permissions(target_mapset) == -1) {
@@ -822,7 +822,7 @@ static void SetupReprojector(const char *pszSrcWKT, const char *pszDstLoc,
 
     /* Change to user defined target location for GCPs transformation */
     G_create_alt_env();
-    G__setenv("LOCATION_NAME", (char *)pszDstLoc);
+    G_setenv_nogisrc("LOCATION_NAME", (char *)pszDstLoc);
     sprintf(target_mapset, "PERMANENT");	/* to find PROJ_INFO */
 
     permissions = G__mapset_permissions(target_mapset);

raster/r.proj/main.c

@@ -278,8 +278,8 @@ int main(int argc, char **argv)
 
     /* Change the location           */
     G_create_alt_env();
-    G__setenv("GISDBASE", indbase->answer ? indbase->answer : G_gisdbase());
-    G__setenv("LOCATION_NAME", inlocation->answer);
+    G_setenv_nogisrc("GISDBASE", indbase->answer ? indbase->answer : G_gisdbase());
+    G_setenv_nogisrc("LOCATION_NAME", inlocation->answer);
 
     permissions = G__mapset_permissions(setname);
     if (permissions < 0)	/* can't access mapset       */
@@ -294,8 +294,8 @@ int main(int argc, char **argv)
 	char **list;
 	G_verbose_message(_("Checking location <%s> mapset <%s>"),
 			  inlocation->answer, setname);
-	list = G_list(G_ELEMENT_RASTER, G__getenv("GISDBASE"),
-		      G__getenv("LOCATION_NAME"), setname);
+	list = G_list(G_ELEMENT_RASTER, G_getenv_nofatal("GISDBASE"),
+		      G_getenv_nofatal("LOCATION_NAME"), setname);
 	for (i = 0; list[i]; i++) {
 	    fprintf(stdout, "%s\n", list[i]);
 	}

vector/v.lidar.correction/main.c

@@ -144,10 +144,10 @@ int main(int argc, char *argv[])
     HighThresh = atof(Thresh_A_opt->answer);
     LowThresh = atof(Thresh_B_opt->answer);
 
-    if (!(db = G__getenv2("DB_DATABASE", G_VAR_MAPSET)))
+    if (!(db = G_getenv_nofatal2("DB_DATABASE", G_VAR_MAPSET)))
 	G_fatal_error(_("Unable to read name of database"));
 
-    if (!(dvr = G__getenv2("DB_DRIVER", G_VAR_MAPSET)))
+    if (!(dvr = G_getenv_nofatal2("DB_DRIVER", G_VAR_MAPSET)))
 	G_fatal_error(_("Unable to read name of driver"));
 
     /* Setting auxiliar table's name */

vector/v.lidar.edgedetection/main.c

@@ -165,10 +165,10 @@ int main(int argc, char *argv[])
     grad_L = grad_L * grad_L;
     grad_H = grad_H * grad_H;
 
-    if (!(db = G__getenv2("DB_DATABASE", G_VAR_MAPSET)))
+    if (!(db = G_getenv_nofatal2("DB_DATABASE", G_VAR_MAPSET)))
 	G_fatal_error(_("Unable to read name of database"));
 
-    if (!(dvr = G__getenv2("DB_DRIVER", G_VAR_MAPSET)))
+    if (!(dvr = G_getenv_nofatal2("DB_DRIVER", G_VAR_MAPSET)))
 	G_fatal_error(_("Unable to read name of driver"));
 
     /* Setting auxiliar table's name */

vector/v.net.salesman/main.c

@@ -223,7 +223,7 @@ int main(int argc, char **argv)
     Clist = Vect_new_cat_list();
     Vect_str_to_cat_list(term_opt->answer, Clist);
 
-    dstr = G__getenv("DEBUG");
+    dstr = G_getenv_nofatal("DEBUG");
 
     if (dstr != NULL)
 	debug_level = atoi(dstr);

vector/v.outlier/main.c

@@ -142,10 +142,10 @@ int main(int argc, char *argv[])
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
 
-    if (!(db = G__getenv2("DB_DATABASE", G_VAR_MAPSET)))
+    if (!(db = G_getenv_nofatal2("DB_DATABASE", G_VAR_MAPSET)))
 	G_fatal_error(_("Unable to read name of database"));
 
-    if (!(dvr = G__getenv2("DB_DRIVER", G_VAR_MAPSET)))
+    if (!(dvr = G_getenv_nofatal2("DB_DRIVER", G_VAR_MAPSET)))
 	G_fatal_error(_("Unable to read name of driver"));
 
     stepN = atof(stepN_opt->answer);

vector/v.proj/main.c

@@ -180,8 +180,8 @@ int main(int argc, char *argv[])
     /* Change the location here and then come back */
 
     select_target_env();
-    G__setenv("GISDBASE", gbase);
-    G__setenv("LOCATION_NAME", iloc_name);
+    G_setenv_nogisrc("GISDBASE", gbase);
+    G_setenv_nogisrc("LOCATION_NAME", iloc_name);
     stat = G__mapset_permissions(iset_name);
     
     if (stat >= 0) {		/* yes, we can access the mapset */
@@ -191,8 +191,8 @@ int main(int argc, char *argv[])
 	    char **list;
 	    G_verbose_message(_("Checking location <%s> mapset <%s>"),
 			      iloc_name, iset_name);
-	    list = G_list(G_ELEMENT_VECTOR, G__getenv("GISDBASE"),
-			  G__getenv("LOCATION_NAME"), iset_name);
+	    list = G_list(G_ELEMENT_VECTOR, G_getenv_nofatal("GISDBASE"),
+			  G_getenv_nofatal("LOCATION_NAME"), iset_name);
 	    if (list[0]) {
 		for (i = 0; list[i]; i++) {
 		    fprintf(stdout, "%s\n", list[i]);
@@ -209,7 +209,7 @@ int main(int argc, char *argv[])
 	    G_fatal_error(_("Required parameter <%s> not set"), mapopt->key);
 	}
 
-	G__setenv("MAPSET", iset_name);
+	G_setenv_nogisrc("MAPSET", iset_name);
 	/* Make sure map is available */
 	mapset = G_find_vector2(map_name, iset_name);
 	if (mapset == NULL)

vector/v.rectify/env.c

@@ -36,9 +36,9 @@ int select_target_env(void)
 int show_env(void)
 {
     fprintf(stderr, "env(%d) switch to LOCATION %s, MAPSET %s\n", which_env,
-	    G__getenv("LOCATION_NAME") ==
-	    NULL ? "?" : G__getenv("LOCATION_NAME"),
-	    G__getenv("MAPSET") == NULL ? "?" : G__getenv("MAPSET"));
+	    G_getenv_nofatal("LOCATION_NAME") ==
+	    NULL ? "?" : G_getenv_nofatal("LOCATION_NAME"),
+	    G_getenv_nofatal("MAPSET") == NULL ? "?" : G_getenv_nofatal("MAPSET"));
     G_sleep(2);
 
     return 0;

vector/v.rectify/target.c

@@ -30,10 +30,10 @@ int get_target(char *group)
 	goto error;
     }
     select_target_env();
-    G__setenv("LOCATION_NAME", location);
+    G_setenv_nogisrc("LOCATION_NAME", location);
     stat = G__mapset_permissions(mapset);
     if (stat > 0) {
-	G__setenv("MAPSET", mapset);
+	G_setenv_nogisrc("MAPSET", mapset);
 	select_current_env();
 	return 1;
     }