Changeset 5754:b23d79c13370 in roaraudio for libroar/basic.c

Timestamp:

11/16/12 16:49:56 (11 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

avoid getenv() and use more portable roar_env_get(). Also improved security as we enfore const now on bufferes obtained from the env.

File:

• libroar/basic.c (modified) (4 diffs)

libroar/basic.c

@@ -69 +69 @@
  // we keep this step to be compatible with older versions.
  if ( daemonimage == NULL || *daemonimage == 0 ) {
-  daemonimage = getenv("ROAR_DAEMONIMAGE");
+  daemonimage = roar_env_get("ROAR_DAEMONIMAGE");
   if ( daemonimage != NULL ) {
    ROAR_WARN("_start_server(*): Usage of $ROAR_DAEMONIMAGE is obsolete. Use ROAR_OPTIONS=daemonimage:...");
@@ -275 +275 @@
 #if defined(ROAR_HAVE_UNIX)
  char user_sock[128];
- char * roar_server;
+ const char * roar_server;
 #endif
 #if defined(ROAR_HAVE_LIBSLP) || !defined(ROAR_TARGET_MICROCONTROLLER)
@@ -309 +309 @@
 
  if ( server == NULL || *server == 0 )
-  server = getenv("ROAR_SERVER");
+  server = roar_env_get("ROAR_SERVER");
 
 #ifdef ROAR_HAVE_LIBX11
@@ -344 +344 @@
 #ifdef ROAR_HAVE_UNIX
 #ifndef ROAR_TARGET_MICROCONTROLLER
-  roar_server = getenv("HOME");
+  roar_server = roar_env_get("HOME");
 #else
   roar_server = NULL;