diff options
Diffstat (limited to 'usr.sbin/cdcontrol/cdcontrol.c')
| -rw-r--r-- | usr.sbin/cdcontrol/cdcontrol.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/usr.sbin/cdcontrol/cdcontrol.c b/usr.sbin/cdcontrol/cdcontrol.c index c22bad3..94ae357 100644 --- a/usr.sbin/cdcontrol/cdcontrol.c +++ b/usr.sbin/cdcontrol/cdcontrol.c @@ -176,14 +176,6 @@ int main (int argc, char **argv) int cmd; char *arg; - cdname = use_cdrom_instead("MUSIC_CD"); - if (! cdname) - cdname = use_cdrom_instead("CD_DRIVE"); - if (! cdname) - cdname = use_cdrom_instead("DISC"); - if (! cdname) - cdname = use_cdrom_instead("CDPLAY"); - for (;;) { switch (getopt (argc, argv, "svhf:")) { case EOF: @@ -213,6 +205,15 @@ int main (int argc, char **argv) cdname = getenv("CDROM"); } + if (! cdname) + cdname = use_cdrom_instead("MUSIC_CD"); + if (! cdname) + cdname = use_cdrom_instead("CD_DRIVE"); + if (! cdname) + cdname = use_cdrom_instead("DISC"); + if (! cdname) + cdname = use_cdrom_instead("CDPLAY"); + if (! cdname) { cdname = DEFAULT_CD_DRIVE; warnx("no CD device name specified, defaulting to %s", cdname); |
