Changeset 5754:b23d79c13370 in roaraudio for libroar
- Timestamp:
- 11/16/12 16:49:56 (11 years ago)
- Branch:
- default
- Phase:
- public
- Location:
- libroar
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
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};
Note: See TracChangeset
for help on using the changeset viewer.