Changeset 5832:f0b38d5ea016 in roaraudio for libroar/basic.c

Timestamp:

01/06/13 16:15:56 (11 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added roar_libroar_get_path_static() and make use of it

File:

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

libroar/basic.c

@@ -108 +108 @@
      dup2(socks[1], ROAR_STDIN );
      dup2(socks[1], ROAR_STDOUT);
-     execl("/bin/sh", "/bin/sh", "-c", daemonimage, (_LIBROAR_GOOD_CAST char*)NULL);
+     execl(roar_libroar_get_path_static("bin-sh"), roar_libroar_get_path_static("bin-sh"), "-c", daemonimage, (_LIBROAR_GOOD_CAST char*)NULL);
      execlp("sh", "sh", "-c", daemonimage, (_LIBROAR_GOOD_CAST char*)NULL);
     break;
@@ -321 +321 @@
 
 #if !defined(ROAR_TARGET_WIN32) && !defined(ROAR_TARGET_MICROCONTROLLER)
- if ( (server == NULL || *server == 0) && (i = readlink("/etc/roarserver", user_sock, sizeof(user_sock)-1)) != -1 ) {
+ if ( (server == NULL || *server == 0) && (i = readlink(roar_libroar_get_path_static("sysconf-roarserver"), user_sock, sizeof(user_sock)-1)) != -1 ) {
    user_sock[i] = 0;
    server = user_sock;
@@ -352 +352 @@
 #if !defined(ROAR_TARGET_WIN32) && !defined(ROAR_TARGET_MICROCONTROLLER)
    if ( (pwd = getpwuid(getuid())) == NULL ) {
-    roar_server = "/NX-HOME-DIR";
+    roar_server = roar_libroar_get_path_static("dir-nx-home");
    } else {
     roar_server = pwd->pw_dir;