Changeset 5895:2bcffab4cd73 in roaraudio for libroar/vio_cmd.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/vio_cmd.c (modified) (5 diffs)

libroar/vio_cmd.c

@@ -141 +141 @@
 int roar_vio_cmd_fork(struct roar_vio_cmd_child * child) {
  int in[2], out[2];
+ char * bin_sh;
 
  if ( child == NULL )
@@ -185 +186 @@
      ROAR_U_EXIT(1);
 
-    execlp(roar_libroar_get_path_static("bin-sh"), roar_libroar_get_path_static("bin-sh"), "-c", child->cmd, (_LIBROAR_GOOD_CAST char*)NULL);
+    bin_sh = roar_libroar_get_path("bin-sh", 0, NULL, NULL);
+    if ( bin_sh == NULL )
+     ROAR_U_EXIT(1);
+
+    execlp(bin_sh, bin_sh, "-c", child->cmd, (_LIBROAR_GOOD_CAST char*)NULL);
+
+    roar_mm_free(bin_sh);
 
     ROAR_U_EXIT(1);
@@ -621 +628 @@
  char command[1024];
  char para[1024] = {0};
+ char * bin_gpg;
  int pwpipe[2];
  int ret;
+ int err;
 
 /*
@@ -640 +649 @@
   strncat(para, "--textmode ", 16);
 
+ bin_gpg = roar_libroar_get_path("bin-gpg", 0, NULL, NULL);
+ if ( bin_gpg == NULL )
+  return -1;
+
  if ( pw != NULL ) {
-  if ( pipe(pwpipe) == -1 )
+  if ( pipe(pwpipe) == -1 ) {
+   err = roar_error;
+   roar_mm_free(bin_gpg);
+   roar_error = err;
    return -1;
-
-  snprintf(command, 1024, "%s --batch --no-verbose --quiet --passphrase-repeat 0 --passphrase-fd %i %s %s", roar_libroar_get_path_static("bin-gpg"), pwpipe[0], para, opts);
+  }
+
+  snprintf(command, 1024, "%s --batch --no-verbose --quiet --passphrase-repeat 0 --passphrase-fd %i %s %s", bin_gpg, pwpipe[0], para, opts);
 
   write(pwpipe[1], pw, strlen(pw));
@@ -650 +667 @@
   close(pwpipe[1]);
  } else {
-  snprintf(command, 1024, "%s --no-verbose --quiet %s %s", roar_libroar_get_path_static("bin-gpg"), para, opts);
- }
+  snprintf(command, 1024, "%s --no-verbose --quiet %s %s", bin_gpg, para, opts);
+ }
+
+ roar_mm_free(bin_gpg);
 
  if ( wronly ) {