--- xcdroast-0.98alpha14/src/io.c 2003-05-29 23:14:42.000000000 +1000 +++ xcdroast-0.98alpha14-patched/src/io.c 2003-08-10 11:35:54.000000000 +1000 @@ -5507,7 +5507,11 @@ } /* build command line */ - get_wrap_path_cdrecord(tmp3); + if (curset.isProDVD) { + get_wrap_path("CDRECORDPRODVD", tmp3); + } else { + get_wrap_path("CDRECORD", tmp3); + } g_snprintf(line,MAXLINE,"%s %s -atip 2>&1", tmp3,tmp); @@ -5517,6 +5521,11 @@ if ((fpin = popen(line,"r")) == NULL) { g_error("popen error\n"); } + + /* syntax for dvd-atip is different */ + if (is_dvdwriter(curset.writer_devnr)) { + found_atip = 1; + } errcount = 0; for (;;) { @@ -6605,7 +6614,7 @@ read_output_ctrl = 4; } /* check Medium error/buffer underrun */ - if (strncmp(tmp2,"Input/output error",18)) { + if (strncmp(tmp2,"Input/output error",18) == 0) { read_output_ctrl = 5; } } @@ -9879,9 +9888,12 @@ if (strcmp(ver,"") == 0) { p = strstr(vline,"Cdrecord"); if (p != NULL) { - p = strtok(p+9, " "); + p = strtok(p+7, " "); if (p != NULL) { - strcpy(ver,p); + p = strtok(NULL, " "); + if (p) { + strcpy(ver,p); + } } } }