X-Git-Url: https://diplodocus.org/git/flac-archive/blobdiff_plain/edc038965868bb01232f8a16f4926dff28e29862..d5d85722f4fb0fc6ca61102b397aa51a96bddcc6:/flac2mp3

diff --git a/flac2mp3 b/flac2mp3
index abd8984..17452bf 100755
--- a/flac2mp3
+++ b/flac2mp3
@@ -22,8 +22,28 @@ and DATE tags.
 use strict;
 use warnings;
 
+use POSIX ':sys_wait_h';
 use Pod::Usage;
 
+sub run_or_die {
+    my $command = shift;
+    my $status;
+
+    $status = system($command);
+
+    if (WIFEXITED($status)) {
+        if (($status = WEXITSTATUS($status)) != 0) {
+            die("$command exited with status $status");
+        }
+    } elsif (WIFSIGNALED($status)) {
+        die("$command killed with signal ", WTERMSIG($status));
+    } elsif (WIFSTOPPED($status)) {
+        die("$command stopped with signal ", WSTOPSIG($status));
+    } else {
+        die("Major horkage on system($command): \$? = $? \$! = $!");
+    }
+}
+
 sub tformat {
     return sprintf('%02d:%02d.%02d', @_);
 }
@@ -85,7 +105,7 @@ sub get_tags {
             $album = $value;
         } elsif (/^DATE=/) {
             $date = $value;
-        } elsif (/TITLE=/) {
+        } elsif (/TITLE/) {
             push(@titles, $value);
         }
     }
@@ -109,15 +129,16 @@ sub flac2mp3 {
     # any single quotes in the filename by closing the quote ('),
     # putting an escaped quote (\'), and then reopening the quote (').
     for ($fn, $title, $artist, $album, $date) {
-        s/'/'\\''/;
+        s/'/'\\''/g;
     }
 
     $outfile = sprintf("$artist ($album) \%02s $title.mp3", $track);
     $outfile =~ s/\//_/g;
 
     $until_arg ||= '';
-    # XXX
-    system("flac -cd $skip_arg $until_arg '$fn' | lame --preset standard --tt '$title' --ta '$artist' --tl '$album' --ty '$date' --tn $track - '$outfile'");
+    run_or_die(join(' ', "flac -cd $skip_arg $until_arg '$fn'",
+                    " | lame --preset standard --tt '$title' --ta '$artist'",
+                    " --tl '$album' --ty '$date' --tn $track - '$outfile'"));
 }
 
 MAIN: {