Changeset 3959:56b27f189c07 in roaraudio

Timestamp:

06/25/10 17:24:15 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

support for home-relative paths

File:

• roard/roard.c (modified) (3 diffs)

roard/roard.c

@@ -353 +353 @@
 
  // RoarAudio:
+ {"roar-usock",     ROAR_SOCKET_TYPE_UNIX,   0,                 "~/.roar",          ROAR_PROTO_ROARAUDIO, -1, NULL, NULL},
  {"roar-gsock",     ROAR_SOCKET_TYPE_UNIX,   0,                 "/tmp/roar",        ROAR_PROTO_ROARAUDIO, -1, NULL, NULL},
  {"roar-tcp",       ROAR_SOCKET_TYPE_TCP,    ROAR_DEFAULT_PORT, "localhost",        ROAR_PROTO_ROARAUDIO, -1, NULL, NULL},
@@ -418 +419 @@
    *port     = p->port;
 
-   strcpy(buf, p->sockaddr);
+   if ( p->type == ROAR_SOCKET_TYPE_UNIX && p->sockaddr[0] != '+' ) {
+    roar_env_render_path_r(buf, sizeof(buf), p->sockaddr);
+   } else {
+    strncpy(buf, p->sockaddr, sizeof(buf));
+   }
    *sockaddr = buf;
 
@@ -1194 +1199 @@
 #ifdef ROAR_HAVE_GETUID
  if ( getuid() != 0 && getenv("HOME") != NULL ) {
+/*
   snprintf(user_sock, 79, "%s/%s", (char*)getenv("HOME"), ROAR_DEFAULT_SOCK_USER);
+*/
+  roar_env_render_path_r(user_sock, sizeof(user_sock), "~/" ROAR_DEFAULT_SOCK_USER);
   sock_addr = user_sock;
+  ROAR_DBG("main(*): setting sock_addr='%s'", sock_addr);
  }
 #endif