libburnia/libburn
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avoiding to have two file descriptors open to the same stdio drive

Browse Source
This commit is contained in:
Thomas Schmitt 2014-02-07 18:08:28 +00:00
parent 6e4d1cc53e
commit 43e1daab23
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cdrskin/cdrskin_timestamp.h
View File

@ -1 +1 @@
#define Cdrskin_timestamP "2014.02.05.191839" #define Cdrskin_timestamP "2014.02.07.180650"

22
libburn/write.c
View File

@ -3151,6 +3151,7 @@ int burn_random_access_write(struct burn_drive *d, off_t byte_address,
char *data, off_t data_count, int flag) char *data, off_t data_count, int flag)
{ {
int alignment = 0, start, upto, chunksize, err, fd = -1, ret; int alignment = 0, start, upto, chunksize, err, fd = -1, ret;
int do_close = 0, getfl_ret;
char msg[81], *rpt; char msg[81], *rpt;
struct buffer *buf = NULL, *buffer_mem = d->buffer; struct buffer *buf = NULL, *buffer_mem = d->buffer;
@ -3223,10 +3224,25 @@ int burn_random_access_write(struct burn_drive *d, off_t byte_address,
"Drive is busy on attempt to write random access",0,0); "Drive is busy on attempt to write random access",0,0);
{ret = 0; goto ex;} {ret = 0; goto ex;}
} }
if(d->drive_role != 1) { if (d->drive_role != 1) {
if (d->stdio_fd >= 0) {
/* Avoid to have a read-only fd open */
getfl_ret = fcntl(d->stdio_fd, F_GETFL);
if (((O_RDWR | O_WRONLY | O_RDONLY) & getfl_ret) ==
O_RDONLY) {
close(d->stdio_fd);
d->stdio_fd = -1;
}
}
if (d->stdio_fd >= 0) {
/* Avoid to have two fds open */
fd = d->stdio_fd;
} else {
fd = burn_stdio_open_write(d, byte_address, 2048, 0); fd = burn_stdio_open_write(d, byte_address, 2048, 0);
if (fd == -1) if (fd == -1)
{ret = 0; goto ex;} {ret = 0; goto ex;}
do_close = 1;
}
} }
d->cancel = 0; d->cancel = 0;
d->busy = BURN_DRIVE_WRITING_SYNC; d->busy = BURN_DRIVE_WRITING_SYNC;
@ -3255,7 +3271,7 @@ int burn_random_access_write(struct burn_drive *d, off_t byte_address,
} }
if (err == BE_CANCELLED) { if (err == BE_CANCELLED) {
d->busy = BURN_DRIVE_IDLE; d->busy = BURN_DRIVE_IDLE;
if(fd >= 0) if(fd >= 0 && do_close)
close(fd); close(fd);
{ret = -(start * 2048 - byte_address); goto ex;} {ret = -(start * 2048 - byte_address); goto ex;}
} }
@ -3271,7 +3287,7 @@ int burn_random_access_write(struct burn_drive *d, off_t byte_address,
d->needs_sync_cache = 0; d->needs_sync_cache = 0;
} }
if(fd >= 0) if(fd >= 0 && do_close)
close(fd); close(fd);
d->buffer = buffer_mem; d->buffer = buffer_mem;
d->busy = BURN_DRIVE_IDLE; d->busy = BURN_DRIVE_IDLE;