Changeset 5752:ec433a3a02b8 in roaraudio

Timestamp:

11/16/12 13:45:29 (11 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Improved env API

Files:

• ChangeLog (modified) (1 diff)
• include/libroar/env.h (modified) (1 diff)
• libroar/env.c (modified) (2 diffs)

ChangeLog

@@ -9 +9 @@
         * Allow RAT builds on systems with full linkage.
         * Provide a more common interface for path config.
+        * Improved env API.
 
 v. 1.0beta7 - Tue Oct 23 2012 23:28 CEST

include/libroar/env.h

@@ -40 +40 @@
 
 int roar_env_set(struct roar_keyval * keyval);
+const char * roar_env_get(const char * key);
 const char * roar_env_get_home(int level);
-int roar_env_get_home_r(int level, char * str, size_t len);
+int roar_env_get_home_r(int level, char * str, size_t len) _LIBROAR_ATTR_DEPRECATED;
 
 int roar_env_render_path_r(char * out, size_t len, const char * inpath);

libroar/env.c

@@ -37 +37 @@
 
 int roar_env_set(struct roar_keyval * keyval) {
+#if defined(ROAR_HAVE_PUTENV) && !defined(ROAR_HAVE_SETENV)
+ size_t len;
+ char * str;
+#endif
+
+ if ( keyval == NULL || keyval->key == NULL ) {
+  roar_err_set(ROAR_ERROR_FAULT);
+  return -1;
+ }
+
 #ifdef ROAR_HAVE_SETENV
  return setenv(keyval->key, keyval->value, 1);
 #elif defined(ROAR_HAVE_PUTENV)
- size_t len;
- char * str;
-
  len = strlen(keyval->key) + strlen(keyval->value) + 2;
 
@@ -54 +61 @@
  return putenv(str) == 0 ? 0 : -1;
 #else
+ roar_strap(ROAR_TRAP_GROUP_LIBROAR, "env_set.not-implemented");
+ roar_err_set(ROAR_ERROR_NOSYS);
  return -1;
 #endif
+}
+
+const char * roar_env_get(const char * key) {
+ const char * ret;
+
+ if ( key == NULL ) {
+  roar_err_set(ROAR_ERROR_FAULT);
+  return NULL;
+ }
+
+ roar_err_clear_all();
+ ret = getenv(key);
+ roar_err_update();
+
+ if ( ret == NULL && roar_error == ROAR_ERROR_NONE )
+  roar_err_set(ROAR_ERROR_NOENT);
+
+ return ret;
 }