From 785af9fedcfd2ca69d98f3f874c529b38ae998a3 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Mon, 24 Sep 2007 06:24:02 +0000 Subject: [PATCH] Added forgotten handling of "sdtio:" with burn_drive_equals_adr() --- libburn/trunk/cdrskin/cdrskin_timestamp.h | 2 +- libburn/trunk/libburn/drive.c | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/libburn/trunk/cdrskin/cdrskin_timestamp.h b/libburn/trunk/cdrskin/cdrskin_timestamp.h index 7536db84..35f4cf26 100644 --- a/libburn/trunk/cdrskin/cdrskin_timestamp.h +++ b/libburn/trunk/cdrskin/cdrskin_timestamp.h @@ -1 +1 @@ -#define Cdrskin_timestamP "2007.09.23.163529" +#define Cdrskin_timestamP "2007.09.24.062354" diff --git a/libburn/trunk/libburn/drive.c b/libburn/trunk/libburn/drive.c index 86328d64..95c04b9d 100644 --- a/libburn/trunk/libburn/drive.c +++ b/libburn/trunk/libburn/drive.c @@ -1240,7 +1240,7 @@ int burn_drive_scan_and_grab(struct burn_drive_info *drive_infos[], char* adr, return -1; } - if(strncmp(adr, "stdio:", 6) == 0) { + if (strncmp(adr, "stdio:", 6) == 0) { ret = burn_drive_grab_dummy(drive_infos, adr + 6); return ret; } @@ -2230,10 +2230,10 @@ static int burn__split_path(char *adr, char **dpt, char **npt) /* ts A70923 : API */ -int burn_drive_equals_adr(struct burn_drive *d1, char *adr2, int role2) +int burn_drive_equals_adr(struct burn_drive *d1, char *adr2_in, int role2) { struct stat stbuf1, stbuf2; - char adr1[BURN_DRIVE_ADR_LEN]; + char adr1[BURN_DRIVE_ADR_LEN], *adr2 = adr2_in; char conv_adr1[BURN_DRIVE_ADR_LEN], conv_adr2[BURN_DRIVE_ADR_LEN]; char *npt1, *dpt1, *npt2, *dpt2; int role1, stat_ret1, stat_ret2, conv_ret2; @@ -2242,6 +2242,10 @@ int burn_drive_equals_adr(struct burn_drive *d1, char *adr2, int role2) burn_drive_d_get_adr(d1, adr1); stat_ret1 = stat(adr1, &stbuf1); + if (strncmp(adr2, "stdio:", 6) == 0) { + adr2+= 6; + role2 = (!!adr2[0]) * 2; + } if (strlen(adr2) >= BURN_DRIVE_ADR_LEN) return -1; stat_ret2 = stat(adr2, &stbuf2);