claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Handle error reporting with null source correctly.

Browse Source
This commit is contained in:
rocky
2004-05-31 12:19:35 +00:00
parent 22fd14048f
commit 59a3a3af4e
1 changed files with 51 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/cd-info.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: cd-info.c,v 1.64 2004/05/31 04:00:54 rocky Exp $ $Id: cd-info.c,v 1.65 2004/05/31 12:19:35 rocky Exp $
Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com> Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
Copyright (C) 1996, 1997, 1998 Gerd Knorr <kraxel@bytesex.org> Copyright (C) 1996, 1997, 1998 Gerd Knorr <kraxel@bytesex.org>
@@ -798,51 +798,87 @@ main(int argc, const char *argv[])
case IMAGE_AUTO: case IMAGE_AUTO:
cdio = cdio_open_am (source_name, DRIVER_UNKNOWN, opts.access_mode); cdio = cdio_open_am (source_name, DRIVER_UNKNOWN, opts.access_mode);
if (cdio==NULL) { if (cdio==NULL) {
err_exit("%s: Error in automatically selecting driver for input %s\n", if (source_name) {
program_name, source_name); err_exit("%s: Error in automatically selecting driver for input %s.\n",
program_name, source_name);
} else {
err_exit("%s: Error in automatically selecting driver.\n",
program_name);
}
} }
break; break;
case IMAGE_DEVICE: case IMAGE_DEVICE:
cdio = cdio_open_am (source_name, DRIVER_DEVICE, opts.access_mode); cdio = cdio_open_am (source_name, DRIVER_DEVICE, opts.access_mode);
if (cdio==NULL) { if (cdio==NULL) {
err_exit("%s: Error in automatically selecting CD-image driver for input %s\n", if (source_name) {
err_exit("%s: Error in automatically selecting CD-image driver for input %s\n",
program_name, source_name); program_name, source_name);
} else {
err_exit("%s: Error in automatically selecting CD-image driver.\n",
program_name);
}
} }
break; break;
case IMAGE_BIN: case IMAGE_BIN:
cdio = cdio_open_am (source_name, DRIVER_BINCUE, opts.access_mode); cdio = cdio_open_am (source_name, DRIVER_BINCUE, opts.access_mode);
if (cdio==NULL) { if (cdio==NULL) {
err_exit("%s: Error in opening bin/cue for input %s\n", if (source_name) {
program_name, source_name); err_exit("%s: Error in opening bin/cue for input %s\n",
program_name, source_name);
} else {
err_exit("%s: Error in opening bin/cue for unspecified input.\n",
program_name);
}
} }
break; break;
case IMAGE_CUE: case IMAGE_CUE:
cdio = cdio_open_cue(source_name); cdio = cdio_open_cue(source_name);
if (cdio==NULL) { if (cdio==NULL) {
err_exit("%s: Error in opening cue/bin with input %s\n", if (source_name) {
program_name, source_name); err_exit("%s: Error in opening cue/bin with input %s\n",
program_name, source_name);
} else {
err_exit("%s: Error in opening cue/bin for unspeicified input.\n",
program_name);
}
} }
break; break;
case IMAGE_NRG: case IMAGE_NRG:
cdio = cdio_open_am (source_name, DRIVER_NRG, opts.access_mode); cdio = cdio_open_am (source_name, DRIVER_NRG, opts.access_mode);
if (cdio==NULL) { if (cdio==NULL) {
err_exit("%s: Error in opening NRG with input %s\n", if (source_name) {
program_name, source_name); err_exit("%s: Error in opening NRG with input %s\n",
program_name, source_name);
} else {
err_exit("%s: Error in opening NRG for unspecified input.\n",
program_name);
}
} }
break; break;
case IMAGE_CDRDAO: case IMAGE_CDRDAO:
cdio = cdio_open_am (source_name, DRIVER_CDRDAO, opts.access_mode); cdio = cdio_open_am (source_name, DRIVER_CDRDAO, opts.access_mode);
if (cdio==NULL) { if (cdio==NULL) {
err_exit("%s: Error in opening TOC with input %s\n", if (source_name) {
program_name, source_name); err_exit("%s: Error in opening TOC with input %s.\n",
} program_name, source_name);
} else {
err_exit("%s: Error in opening TOC for unspecified input.\n",
program_name);
}
}
break; break;
} }
if (cdio==NULL) { if (cdio==NULL) {
err_exit("%s: Error in opening device driver for input %s\n", if (source_name) {
program_name, source_name); err_exit("%s: Error in opening device driver for input %s.\n",
program_name, source_name);
} else {
err_exit("%s: Error in opening device driver for unspecified input.\n",
program_name);
}
} }
if (source_name==NULL) { if (source_name==NULL) {