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

libroar/cdrom.c

@@ -53 +53 @@
  pid_t pid;
  int fh[2];
+ char * bin_cdparanoia = NULL, * dev_stdin = NULL;
+ int err;
 
  ROAR_DBG("roar_cdrom_run_cdparanoia(cdrom=%i, data=%i, track=%i, pos='%s') = ?", cdrom, data, track, pos);
@@ -91 +93 @@
  close(fh[1]);
 
- execl(roar_libroar_get_path_static("bin-cdparanoia"), roar_libroar_get_path_static("bin-cdparanoia"), "--force-cdrom-device", roar_libroar_get_path_static("dev-stdin"), "-q",
+ bin_cdparanoia = roar_libroar_get_path("bin-cdparanoia", 0, NULL, NULL);
+ if ( bin_cdparanoia == NULL )
+  return -1;
+ dev_stdin = roar_libroar_get_path("dev-stdin", 0, NULL, NULL);
+ if ( dev_stdin == NULL ) {
+  err = roar_error;
+  roar_mm_free(bin_cdparanoia);
+  roar_error = err;
+  return -1;
+ }
+ execl(bin_cdparanoia, bin_cdparanoia, "--force-cdrom-device", dev_stdin, "-q",
                 ROAR_CDROM_CDPARANOIA_OUTPUTFORMAT, pos, "-", NULL);
+
+ roar_mm_free(bin_cdparanoia);
+ roar_mm_free(dev_stdin);
 
  ROAR_CDROM_ERROR_NORETURN("We are still alive after exec()!, very bad!, error was: %s", strerror(errno));