Changeset 5895:2bcffab4cd73 in roaraudio for libroar/socket.c

Timestamp:

04/14/13 13:38:03 (11 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Moved away from roar_libroar_get_path_static()

File:

• libroar/socket.c (modified) (2 diffs)

libroar/socket.c

@@ -1107 +1107 @@
  const char * proxy_addr = roar_env_get("ssh_proxy");
  char * sep;
+ char * bin_ssh;
  char   cmd[1024] = {0}, rcmd[1024] = {0};
  int    proxy_port = 22;
@@ -1164 +1165 @@
  ROAR_DBG("roar_socket_open_ssh(*): proxy_port=%i, user='%s', proxy_addr='%s'", proxy_port, user, proxy_addr);
  ROAR_DBG("roar_socket_open_ssh(*): rcmd: %s", rcmd);
- snprintf(cmd, 1023, "%s -p %i -l '%s' '%s' '%s'", roar_libroar_get_path_static("bin-ssh"), proxy_port, user, proxy_addr, rcmd);
+ bin_ssh = roar_libroar_get_path("bin-ssh", 0, NULL, NULL);
+ if ( bin_ssh == NULL )
+  return -1;
+
+ snprintf(cmd, 1023, "%s -p %i -l '%s' '%s' '%s'", bin_ssh, proxy_port, user, proxy_addr, rcmd);
  cmd[1023] = 0;
+
+ roar_mm_free(bin_ssh);