CD Reading working?

1 files changed, 11 insertions, 2 deletions

diff --git a/cd-tool.cpp b/cd-tool.cpp
index 9f10eaa..8a6b9c7 100644
--- a/cd-tool.cpp
+++ b/cd-tool.cpp
@@ -27,6 +27,7 @@
 #include <unistd.h>
 #include "Input.h"
 #include "Output.h"
+#include "cdreader.h"
 #include "cdutils.h"
 #include "generic.h"
 
@@ -57,7 +58,7 @@ void showhelp(void) {
 "\n");
 }
 
-int main(int argc, char ** argv) {
+int Main(int argc, char ** argv) {
     int type = GUESS, c, size, force = 0, sector;
     Handle * iso_r, * iso_w = 0;
     char * ppf = 0, * iso_name = 0, * arg1 = 0, * arg2 = 0, * f;
@@ -97,7 +98,7 @@ int main(int argc, char ** argv) {
 	exit(-1);
     }
     
-    iso_r = new Input(iso_name);
+    iso_r = new cdreader(iso_name);
     
     get_iso_infos(iso_r);
     
@@ -293,3 +294,11 @@ int main(int argc, char ** argv) {
     exit(0);
 }
 
+int main(int argc, char ** argv) {
+    try {
+	Main(argc, argv);
+    }
+    catch (GeneralException e) {
+	fprintf(stderr, "%s\n", e.GetMsg());
+    }
+}