summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorThomas Guyot-Sionnest <dermoth@aei.ca>2014-01-25 03:35:46 -0500
committerThomas Guyot-Sionnest <dermoth@aei.ca>2014-01-25 03:35:46 -0500
commit4caf4ce4fe3a0f08f129a4537c4173d1e6b6d752 (patch)
treeed4c1482197646b980467d86fb3fc89a3bb57bd1 /lib
parent0b9b300f856d021b56950030f4e6053d84bc77c8 (diff)
downloadmonitoring-plugins-4caf4ce.tar.gz
Rename ENV variable, keep backward compatibility
Rename NAGIOS_PLUGIN_STATE_DIRECTORY to MP_STATE_DIRECTORY
Diffstat (limited to 'lib')
-rw-r--r--lib/tests/test_utils.c6
-rw-r--r--lib/utils_base.c6
2 files changed, 9 insertions, 3 deletions
diff --git a/lib/tests/test_utils.c b/lib/tests/test_utils.c
index 7a1a1fa1..12252f48 100644
--- a/lib/tests/test_utils.c
+++ b/lib/tests/test_utils.c
@@ -304,15 +304,15 @@ main (int argc, char **argv)
304 temp_string = (char *) _np_state_generate_key(); 304 temp_string = (char *) _np_state_generate_key();
305 ok(!strcmp(temp_string, "94b5e17bf5abf51cb15aff5f69b96f2f8dac5ecd"), "Got based on expected argv" ); 305 ok(!strcmp(temp_string, "94b5e17bf5abf51cb15aff5f69b96f2f8dac5ecd"), "Got based on expected argv" );
306 306
307 unsetenv("NAGIOS_PLUGIN_STATE_DIRECTORY"); 307 unsetenv("MP_STATE_DIRECTORY");
308 temp_string = (char *) _np_state_calculate_location_prefix(); 308 temp_string = (char *) _np_state_calculate_location_prefix();
309 ok(!strcmp(temp_string, NP_STATE_DIR_PREFIX), "Got default directory" ); 309 ok(!strcmp(temp_string, NP_STATE_DIR_PREFIX), "Got default directory" );
310 310
311 setenv("NAGIOS_PLUGIN_STATE_DIRECTORY", "", 1); 311 setenv("MP_STATE_DIRECTORY", "", 1);
312 temp_string = (char *) _np_state_calculate_location_prefix(); 312 temp_string = (char *) _np_state_calculate_location_prefix();
313 ok(!strcmp(temp_string, NP_STATE_DIR_PREFIX), "Got default directory even with empty string" ); 313 ok(!strcmp(temp_string, NP_STATE_DIR_PREFIX), "Got default directory even with empty string" );
314 314
315 setenv("NAGIOS_PLUGIN_STATE_DIRECTORY", "/usr/local/nagios/var", 1); 315 setenv("MP_STATE_DIRECTORY", "/usr/local/nagios/var", 1);
316 temp_string = (char *) _np_state_calculate_location_prefix(); 316 temp_string = (char *) _np_state_calculate_location_prefix();
317 ok(!strcmp(temp_string, "/usr/local/nagios/var"), "Got default directory" ); 317 ok(!strcmp(temp_string, "/usr/local/nagios/var"), "Got default directory" );
318 318
diff --git a/lib/utils_base.c b/lib/utils_base.c
index 57d01e27..304b732b 100644
--- a/lib/utils_base.c
+++ b/lib/utils_base.c
@@ -415,9 +415,15 @@ void _cleanup_state_data() {
415char* _np_state_calculate_location_prefix(){ 415char* _np_state_calculate_location_prefix(){
416 char *env_dir; 416 char *env_dir;
417 417
418 /* FIXME: Undocumented */
419 env_dir = getenv("MP_STATE_DIRECTORY");
420 if(env_dir && env_dir[0] != '\0')
421 return env_dir;
422 /* This is the former ENV, for backward-compatibility */
418 env_dir = getenv("NAGIOS_PLUGIN_STATE_DIRECTORY"); 423 env_dir = getenv("NAGIOS_PLUGIN_STATE_DIRECTORY");
419 if(env_dir && env_dir[0] != '\0') 424 if(env_dir && env_dir[0] != '\0')
420 return env_dir; 425 return env_dir;
426
421 return NP_STATE_DIR_PREFIX; 427 return NP_STATE_DIR_PREFIX;
422} 428}
423 429