Changeset 5838:52ca1a88734e in roaraudio for libroar/config.c

Timestamp:

01/07/13 02:36:01 (11 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

handle setting of server name in connection object in a better way. also added new command "servername" to roarctl to debug this a bit. This is one little step needed by ##337

File:

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

libroar/config.c

@@ -36 +36 @@
 #include "libroar.h"
 
+#define LEN_AUTHFILE 1024
+
 static struct roar_libroar_config_codec *
            roar_libroar_config_codec_get_conf(int32_t codec, int create, struct roar_libroar_config * config);
@@ -43 +45 @@
  static struct roar_libroar_config config;
  static int    inited = 0;
- static char   authfile[1024];
+ static char   authfile[LEN_AUTHFILE];
  const  char * home = roar_env_get_home(0);
 
@@ -102 +104 @@
   config->codecs.num = 0;
  }
+
+ if ( config->x11.display != NULL )
+  roar_mm_free(config->x11.display);
+ config->x11.display = NULL;
+
+ if ( config->daemonimage != NULL )
+  roar_mm_free(config->daemonimage);
+ config->daemonimage = NULL;
 
  return 0;
@@ -308 +318 @@
     roar_libroar_set_server(v);
   } else if ( !strcmp(k, "set-authfile") ) {
-   strncpy(config->authfile, v, 1023);
-   config->authfile[1023] = 0;
+   strncpy(config->authfile, v, LEN_AUTHFILE-1);
+   config->authfile[LEN_AUTHFILE-1] = 0;
   } else if ( !strcmp(k, "x11-display") ) {
-   config->x11.display = v;
+   if ( config->x11.display != NULL )
+    roar_mm_free(config->x11.display);
+   config->x11.display = roar_mm_strdup(v);
   } else if ( !strcmp(k, "daemonimage") ) {
-   config->daemonimage = v;
+   if ( config->daemonimage != NULL )
+    roar_mm_free(config->daemonimage);
+   config->daemonimage = roar_mm_strdup(v);
   } else if ( !strcmp(k, "serverflags") ) {
    if ( !strcmp(v, "nonblock") ) {