Changeset 5754:b23d79c13370 in roaraudio
- Timestamp:
- 11/16/12 16:49:56 (11 years ago)
- Branch:
- default
- Phase:
- public
- Files:
-
- 18 edited
Legend:
- Unmodified
- Added
- Removed
-
include/libroar/pinentry.h
r5381 r5754 49 49 }; 50 50 51 int roar_pinentry_open (struct roar_pinentry * pe, int flags, c har * display, char * tty,char * term);51 int roar_pinentry_open (struct roar_pinentry * pe, int flags, const char * display, const char * tty, const char * term); 52 52 int roar_pinentry_simple_open(struct roar_pinentry * pe); 53 53 int roar_pinentry_close(struct roar_pinentry * pe); -
libroar/basic.c
r5745 r5754 69 69 // we keep this step to be compatible with older versions. 70 70 if ( daemonimage == NULL || *daemonimage == 0 ) { 71 daemonimage = getenv("ROAR_DAEMONIMAGE");71 daemonimage = roar_env_get("ROAR_DAEMONIMAGE"); 72 72 if ( daemonimage != NULL ) { 73 73 ROAR_WARN("_start_server(*): Usage of $ROAR_DAEMONIMAGE is obsolete. Use ROAR_OPTIONS=daemonimage:..."); … … 275 275 #if defined(ROAR_HAVE_UNIX) 276 276 char user_sock[128]; 277 c har * roar_server;277 const char * roar_server; 278 278 #endif 279 279 #if defined(ROAR_HAVE_LIBSLP) || !defined(ROAR_TARGET_MICROCONTROLLER) … … 309 309 310 310 if ( server == NULL || *server == 0 ) 311 server = getenv("ROAR_SERVER");311 server = roar_env_get("ROAR_SERVER"); 312 312 313 313 #ifdef ROAR_HAVE_LIBX11 … … 344 344 #ifdef ROAR_HAVE_UNIX 345 345 #ifndef ROAR_TARGET_MICROCONTROLLER 346 roar_server = getenv("HOME");346 roar_server = roar_env_get("HOME"); 347 347 #else 348 348 roar_server = NULL; -
libroar/config.c
r5747 r5754 76 76 struct roar_libroar_config * config = roar_libroar_get_config_ptr(); 77 77 static int inited = 0; 78 char * next; 78 const char * next; 79 char * buf; 79 80 80 81 if ( !inited ) { 81 82 inited++; // we do this early so we can use ROAR_{DBG,INFO,WARN,ERR}() in roar_libroar_config_parse(). 82 83 83 next = getenv("ROAR_OPTIONS");84 next = roar_env_get("ROAR_OPTIONS"); 84 85 85 86 if ( next != NULL ) { 86 roar_libroar_config_parse(next, " "); 87 if ( (buf = roar_mm_strdup(next)) != NULL ) { 88 roar_libroar_config_parse(buf, " "); 89 roar_mm_free(buf); 90 } 87 91 } 88 92 } -
libroar/enumdev.c
r5381 r5754 115 115 _add(new); 116 116 117 new = getenv("ROAR_SERVER");117 new = roar_env_get("ROAR_SERVER"); 118 118 _add(new); 119 119 … … 126 126 #endif 127 127 128 new = getenv("SSH_CLIENT");128 new = roar_env_get("SSH_CLIENT"); 129 129 if ( new == NULL ) 130 new = getenv("SSH_CONNECTION");130 new = roar_env_get("SSH_CONNECTION"); 131 131 132 132 if ( new != NULL ) { -
libroar/env.c
r5752 r5754 86 86 87 87 const char * roar_env_get_home(int level) { 88 const char * home = getenv("HOME");88 const char * home = roar_env_get("HOME"); 89 89 90 90 (void)level; -
libroar/file.c
r5381 r5754 86 86 const char * k; 87 87 88 if ( (k = getenv("CDDA_DEVICE")) != NULL )88 if ( (k = roar_env_get("CDDA_DEVICE")) != NULL ) 89 89 return k; 90 90 -
libroar/pinentry.c
r5619 r5754 45 45 #endif 46 46 47 int roar_pinentry_open (struct roar_pinentry * pe, int flags, c har * display, char * tty,char * term) {47 int roar_pinentry_open (struct roar_pinentry * pe, int flags, const char * display, const char * tty, const char * term) { 48 48 #ifdef _CAN_OPERATE 49 49 int in[2], out[2]; … … 57 57 58 58 if ( display == NULL ) 59 display = getenv("DISPLAY");59 display = roar_env_get("DISPLAY"); 60 60 61 61 if ( display == NULL ) … … 73 73 74 74 if ( term == NULL ) 75 term = getenv("TERM");75 term = roar_env_get("TERM"); 76 76 77 77 if ( term == NULL ) -
libroar/socket.c
r5745 r5754 401 401 402 402 int roar_socket_connect (int type, const char * host, int port) { 403 c har * proxy_type = getenv("ROAR_PROXY");403 const char * proxy_type = roar_env_get("ROAR_PROXY"); 404 404 405 405 ROAR_DBG("roar_socket_connect(host='%s', port=%i) = ?", host, port); … … 874 874 int proxy_port = -1; 875 875 char proxy_host[ROAR_SOCKET_MAX_HOSTNAMELEN]; 876 c har * proxy_addr = NULL;876 const char * proxy_addr = NULL; 877 877 int i; 878 878 int fh = -1; 879 c har * user = NULL, * pw = NULL, * opts = NULL;879 const char * user = NULL, * pw = NULL, * opts = NULL; 880 880 char * sep; 881 881 int no_fh = 0; … … 895 895 896 896 if ( user == NULL ) 897 user = getenv("USER");897 user = roar_env_get("USER"); 898 898 899 899 // TODO: change this so we support listen() proxys (ssh -R) … … 902 902 903 903 if ( !strncmp(proxy_type, "socks", 5) ) { 904 proxy_addr = getenv("socks_proxy");904 proxy_addr = roar_env_get("socks_proxy"); 905 905 906 906 proxy_port = 9050; // TOR's default port … … 908 908 proxy_port = 8080; 909 909 910 if ( (proxy_addr = getenv("http_proxy")) == NULL )911 proxy_addr = getenv("https_proxy");910 if ( (proxy_addr = roar_env_get("http_proxy")) == NULL ) 911 proxy_addr = roar_env_get("https_proxy"); 912 912 913 913 if ( proxy_addr == NULL ) … … 918 918 } else if ( !strncmp(proxy_type, "ssh", 3) ) { 919 919 proxy_port = 22; 920 proxy_addr = getenv("ssh_proxy");920 proxy_addr = roar_env_get("ssh_proxy"); 921 921 no_fh = 1; 922 922 } … … 1105 1105 #ifdef ROAR_HAVE_BIN_SSH 1106 1106 static int roar_socket_open_ssh (int mode, int fh, const char * host, int port, const char * user, const char * pw, const char * opts) { 1107 c har * proxy_addr = getenv("ssh_proxy");1107 const char * proxy_addr = roar_env_get("ssh_proxy"); 1108 1108 char * sep; 1109 1109 char cmd[1024] = {0}, rcmd[1024] = {0}; -
libroaresd/esdbasic.c
r5381 r5754 49 49 50 50 if ( host == NULL ) 51 host = getenv("ESPEAKER");51 host = roar_env_get("ESPEAKER"); 52 52 53 53 if ( roar_simple_connect(&con, (char*) host, NULL) == -1 ) { -
libroaross/libroaross.c
r5543 r5754 382 382 } 383 383 384 static struct session * _open_session (c har * server,char * name) {384 static struct session * _open_session (const char * server, const char * name) { 385 385 struct session * ses = &_session; 386 int new_session = getenv("ROAR_OSS_NEW_SESSION") == NULL ? 0 : 1;386 int new_session = roar_env_get("ROAR_OSS_NEW_SESSION") == NULL ? 0 : 1; 387 387 388 388 ROAR_DBG("_open_session(server='%s', name='%s') = ?", server, name); … … 400 400 401 401 if ( name == NULL ) 402 name = getenv("ROAR_OSS_CLIENT_NAME");402 name = roar_env_get("ROAR_OSS_CLIENT_NAME"); 403 403 404 404 if ( name == NULL ) … … 415 415 416 416 if ( !new_session ) { 417 if ( getenv("ROAR_OSS_KEEP_SESSION") != NULL )417 if ( roar_env_get("ROAR_OSS_KEEP_SESSION") != NULL ) 418 418 ses->refc++; 419 419 } -
libroarpulse/libroarpulse.c
r5381 r5754 124 124 125 125 if ( server == NULL ) 126 server = getenv("PULSE_SERVER");126 server = roar_env_get("PULSE_SERVER"); 127 127 128 128 if ( server == NULL ) { -
libroarpulse/util.c
r5381 r5754 73 73 /** Return the current username in the specified string buffer. */ 74 74 char *pa_get_user_name(char *s, size_t l) { 75 c har * user = NULL;75 const char * user = NULL; 76 76 77 77 if ( s == NULL ) { … … 82 82 83 83 if ( user == NULL ) 84 user = getenv("USER");84 user = roar_env_get("USER"); 85 85 if ( user == NULL ) 86 user = getenv("LOGNAME");86 user = roar_env_get("LOGNAME"); 87 87 if ( user == NULL ) 88 user = getenv("USERNAME");88 user = roar_env_get("USERNAME"); 89 89 90 90 #ifdef ROAR_HAVE_GETUID … … 126 126 /** Return the home directory of the current user */ 127 127 char *pa_get_home_dir(char *s, size_t l) { 128 char * home = getenv("HOME"); 129 130 if ( home == NULL ) 128 if ( roar_env_render_path_r(s, l, "~/") == -1 ) 131 129 return NULL; 132 133 strncpy(s, home, l);134 135 s[l-1] = 0;136 130 137 131 return s; -
libroarrsound/libroarrsound.c
r5381 r5754 244 244 245 245 static int libroarrsound_connect (struct libroarrsound * self) { 246 c har * host;246 const char * host; 247 247 248 248 if ( self->flags & LIBROARRSOUND_FLAGS_CONNECTED ) … … 252 252 253 253 if ( host == NULL ) 254 host = getenv("RSD_SERVER");254 host = roar_env_get("RSD_SERVER"); 255 255 256 256 // FIXME: we currently ignore the port. :( -
libroarsndio/libroarsndio.c
r5381 r5754 142 142 if ( name == NULL ) { 143 143 if ( is_midi ) { 144 name = getenv("MIDIDEVICE");144 name = roar_env_get("MIDIDEVICE"); 145 145 } else { 146 name = getenv("AUDIODEVICE");146 name = roar_env_get("AUDIODEVICE"); 147 147 } 148 148 } -
roarclients/roarmonhttp.c
r5536 r5754 239 239 int i; 240 240 const char * k, * v; 241 const char * qs; 242 char * qs_buf; 241 243 char * c; 242 244 char * sp0 = NULL, * sp1 = NULL; … … 292 294 } 293 295 294 c = getenv("QUERY_STRING"); 296 qs = roar_env_get("QUERY_STRING"); 297 if ( qs == NULL ) 298 qs = ""; 299 c = qs_buf = roar_mm_strdup(qs); 295 300 if ( c == NULL ) 296 c = "";301 return 1; 297 302 298 303 c = roar_mm_strtok_r(c, "&", &sp0); … … 336 341 } 337 342 343 roar_mm_free(qs_buf); 344 338 345 if ( roar_simple_connect(&con, server, "roarmonhttp") == -1 ) { 339 346 return 10; -
roard/driver_dmx.c
r5708 r5754 32 32 struct roar_vio_calls * vio; 33 33 int err; 34 const char * dev = device; 34 35 35 36 if ( roar_vio_dstr_init_defaults(&def, ROAR_VIO_DEF_TYPE_NONE, O_WRONLY, 0644) == -1 ) … … 42 43 43 44 if ( fh == -1 ) { 44 if ( dev ice== NULL )45 dev ice = getenv("DMX");45 if ( dev == NULL ) 46 dev = roar_env_get("DMX"); 46 47 47 if ( dev ice== NULL )48 dev ice= "/dev/dmx";48 if ( dev == NULL ) 49 dev = "/dev/dmx"; 49 50 50 if ( roar_vio_open_dstr(vio, dev ice, &def, 1) == -1 ) {51 if ( roar_vio_open_dstr(vio, dev, &def, 1) == -1 ) { 51 52 err = roar_error; 52 53 roar_mm_free(vio); -
roard/include/roard.h
r5740 r5754 162 162 163 163 #ifdef ROAR_SUPPORT_LISTEN 164 int get_listen(struct roard_listen ** sock, c har *** sockname);165 int add_listen (c har * addr, int port, int sock_type, char * user, char * group, int proto, int dir, struct roar_audio_info * info);164 int get_listen(struct roard_listen ** sock, const char *** sockname); 165 int add_listen (const char * addr, int port, int sock_type, char * user, char * group, int proto, int dir, struct roar_audio_info * info); 166 166 #endif 167 167 -
roard/roard.c
r5662 r5754 88 88 89 89 #ifdef ROAR_SUPPORT_LISTEN 90 static c har * server[ROAR_MAX_LISTEN_SOCKETS];90 static const char * server[ROAR_MAX_LISTEN_SOCKETS]; 91 91 #endif 92 92 … … 561 561 } 562 562 563 int get_listen(struct roard_listen ** sock, c har *** sockname) {563 int get_listen(struct roard_listen ** sock, const char *** sockname) { 564 564 int i; 565 565 … … 786 786 787 787 int get_listen_profile (const char * name, 788 int * port, c har ** sockaddr, int * type,788 int * port, const char ** sockaddr, int * type, 789 789 int * proto, 790 790 int * dir, struct roar_audio_info * info) { … … 798 798 799 799 if ( p->type == ROAR_SOCKET_TYPE_UNIX && p->sockaddr[0] != '+' ) { 800 roar_env_render_path_r(buf, sizeof(buf), p->sockaddr); 800 if ( roar_env_render_path_r(buf, sizeof(buf), p->sockaddr) == -1 ) 801 continue; 801 802 } else { 802 803 strncpy(buf, p->sockaddr, sizeof(buf)); … … 822 823 #endif 823 824 824 int add_listen (c har * addr, int port, int sock_type, char * user, char * group, int proto, int dir, struct roar_audio_info * info) {825 int add_listen (const char * addr, int port, int sock_type, char * user, char * group, int proto, int dir, struct roar_audio_info * info) { 825 826 #if defined(ROAR_HAVE_SETGID) && defined(ROAR_HAVE_IO_POSIX) 826 827 struct group * grp = NULL; … … 861 862 #ifdef ROAR_HAVE_UNIX 862 863 if ( *addr == '/' ) { 863 if ( (env_roar_proxy_backup = getenv("ROAR_PROXY")) != NULL ) {864 if ( (env_roar_proxy_backup = (char*)roar_env_get("ROAR_PROXY")) != NULL ) { 864 865 env_roar_proxy_backup = roar_mm_strdup(env_roar_proxy_backup); 865 866 unsetenv("ROAR_PROXY"); … … 1214 1215 // X11: 1215 1216 #ifdef ROAR_HAVE_LIBX11 1216 int register_x11 (int unreg, c har * sockname) {1217 int register_x11 (int unreg, const char * sockname) { 1217 1218 struct roar_x11_connection * x11con = NULL; 1218 1219 int ret = 0; … … 1252 1253 } 1253 1254 1254 int register_slp (int unreg, c har * sockname) {1255 int register_slp (int unreg, const char * sockname) { 1255 1256 #ifdef ROAR_HAVE_LIBSLP 1256 1257 static int regged = 0; 1257 static c har * sn = NULL;1258 static const char * sn = NULL; 1258 1259 SLPError err; 1259 1260 SLPError callbackerr; … … 1437 1438 #ifdef ROAR_SUPPORT_LISTEN 1438 1439 int port = ROAR_DEFAULT_PORT; 1439 c har * sock_addr = NULL;1440 const char * sock_addr = NULL; 1440 1441 int sock_proto = ROAR_PROTO_ROARAUDIO; 1441 1442 int sock_dir = -1; … … 1449 1450 int s_prim = 0; 1450 1451 #endif 1451 char * o_drv = getenv("ROAR_DRIVER");1452 char * o_dev = getenv("ROAR_DEVICE");1452 char * o_drv = NULL; 1453 char * o_dev = NULL; 1453 1454 char * o_opts = NULL; 1454 1455 int o_prim = 0; … … 1508 1509 ROAR_DBG("main(*): starting roard..."); 1509 1510 1511 // NOTE: those to lions can generate a memory leak. The OS will clean that up on exit. 1512 if ( roar_env_get("ROAR_DRIVER") != NULL ) 1513 o_drv = roar_mm_strdup(roar_env_get("ROAR_DRIVER")); 1514 if ( roar_env_get("ROAR_DEVICE") != NULL ) 1515 o_dev = roar_mm_strdup(roar_env_get("ROAR_DEVICE")); 1516 1510 1517 g_standby = 0; 1511 1518 g_autostandby = 0; … … 1603 1610 1604 1611 #ifdef ROAR_HAVE_GETUID 1605 if ( getuid() != 0 && getenv("HOME") != NULL ) {1612 if ( getuid() != 0 && roar_env_get("HOME") != NULL ) { 1606 1613 /* 1607 1614 snprintf(user_sock, 79, "%s/%s", (char*)getenv("HOME"), ROAR_DEFAULT_SOCK_USER); 1608 1615 */ 1609 roar_env_render_path_r(user_sock, sizeof(user_sock), "~/" ROAR_DEFAULT_SOCK_USER); 1616 if ( roar_env_render_path_r(user_sock, sizeof(user_sock), "~/" ROAR_DEFAULT_SOCK_USER) == -1 ) { 1617 strncpy(user_sock, "/NX-SOCK", sizeof(user_sock)); 1618 } 1610 1619 sock_addr = user_sock; 1611 1620 ROAR_DBG("main(*): setting sock_addr='%s'", sock_addr); … … 1613 1622 #endif 1614 1623 1615 if ( getenv("ROAR_SERVER") != NULL )1616 sock_addr = getenv("ROAR_SERVER");1624 if ( roar_env_get("ROAR_SERVER") != NULL ) 1625 sock_addr = roar_env_get("ROAR_SERVER"); 1617 1626 #endif 1618 1627
Note: See TracChangeset
for help on using the changeset viewer.