Changeset 5754:b23d79c13370 in roaraudio for libroarpulse/util.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:

• libroarpulse/util.c (modified) (3 diffs)

libroarpulse/util.c

@@ -73 +73 @@
 /** Return the current username in the specified string buffer. */
 char *pa_get_user_name(char *s, size_t l) {
- char * user = NULL;
+ const char * user = NULL;
 
  if ( s == NULL ) {
@@ -82 +82 @@
 
  if ( user == NULL )
-  user = getenv("USER");
+  user = roar_env_get("USER");
  if ( user == NULL )
-  user = getenv("LOGNAME");
+  user = roar_env_get("LOGNAME");
  if ( user == NULL )
-  user = getenv("USERNAME");
+  user = roar_env_get("USERNAME");
 
 #ifdef ROAR_HAVE_GETUID
@@ -126 +126 @@
 /** Return the home directory of the current user */
 char *pa_get_home_dir(char *s, size_t l) {
- char * home = getenv("HOME");
-
- if ( home == NULL )
+ if ( roar_env_render_path_r(s, l, "~/") == -1 )
   return NULL;
-
- strncpy(s, home, l);
-
- s[l-1] = 0;
 
  return s;