fixups to get back to proper patch order

[elogind.git] / extras / name_cdrom.pl

diff --git a/extras/name_cdrom.pl b/extras/name_cdrom.pl
index 7a14e866a623884e246c3cef8982caace4978f2f..766f6f366a6ac756a5e50cf006f3c56bdcf1fbca 100644 (file)
--- a/extras/name_cdrom.pl
+++ b/extras/name_cdrom.pl
@@ -2,19 +2,17 @@
 
 # a horribly funny script that shows how flexible udev can really be
 # This is to be executed by udev with the following rules:
-# CALLOUT, BUS="ide", PROGRAM="name_cdrom.pl %M %m", ID="good*", NAME="%2c", SYMLINK="cdrom"
-# CALLOUT, BUS="scsi", PROGRAM="name_cdrom.pl %M %m", ID="good*", NAME="%2c", SYMLINK="cdrom"
-#
-# The scsi rule catches USB cdroms and ide-scsi devices.
-#
+# KERNEL="[hs]d[a-z]", PROGRAM="name_cdrom.pl %M %m", NAME="%c{1}", SYMLINK="cdrom"
 
-use CDDB_get qw( get_cddb );
+use strict;
+use warnings;
 
-my %config;
+use CDDB_get qw( get_cddb );
 
-$dev_node = "/tmp/cd_foo";
+my $dev_node = "/tmp/cd_foo";
 
 # following variables just need to be declared if different from defaults
+my %config;
 $config{CDDB_HOST}="freedb.freedb.org";                # set cddb host
 $config{CDDB_PORT}=8880;                       # set cddb port
 $config{CDDB_MODE}="cddb";                     # set cddb mode: cddb or http
@@ -23,8 +21,8 @@ $config{CD_DEVICE}="$dev_node";                       # set cd device
 # No user interaction, this is a automated script!
 $config{input}=0;
 
-$major = $ARGV[0];
-$minor = $ARGV[1];
+my $major = $ARGV[0];
+my $minor = $ARGV[1];
 
 # create our temp device node to read the cd info from
 unlink($dev_node);
@@ -38,11 +36,11 @@ my %cd=get_cddb(\%config);
 # remove the dev node we just created
 unlink($dev_node);
 
-# print out our cd name if we have found it
-unless(defined $cd{title}) {
-       print"bad unknown cdrom\n";
-} else {
+# print out our cd name if we have found it or skip rule by nonzero exit
+if (defined $cd{title}) {
        $cd{artist} =~ s/ /_/g;
        $cd{title} =~ s/ /_/g;
-       print "good $cd{artist}-$cd{title}\n";
+       print "$cd{artist}-$cd{title}\n";
+} else {
+       exit -1;
 }