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

Distinguished failure messages about write(2) and fsync(2)

Browse Source
This commit is contained in:
Thomas Schmitt 2011-11-16 09:44:59 +00:00
parent 303a2670be
commit 83e2d20322
2 changed files with 26 additions and 6 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 "2011.11.16.094244" #define Cdrskin_timestamP "2011.11.16.094436"

30
libburn/write.c
View File

@ -2089,6 +2089,9 @@ int burn_stdio_read_source(struct burn_source *source, char *buf, int bufsize,
int burn_stdio_write(int fd, char *buf, int count, struct burn_drive *d, int burn_stdio_write(int fd, char *buf, int count, struct burn_drive *d,
int flag) int flag)
{ {
int ret;
char *msg = NULL;
if (d->cancel) if (d->cancel)
return 0; return 0;
/* /*
@ -2096,15 +2099,23 @@ fprintf(stderr, "libburn_DEBUG: write(%d, %lX, %d)\n",
fd, (unsigned long) buf, count); fd, (unsigned long) buf, count);
*/ */
if (write(fd, buf, count) != count) { ret = write(fd, buf, count);
if (ret != count) {
BURN_ALLOC_MEM(msg, char, 160);
sprintf(msg,
"Cannot write desired amount of data. write(2) returned %d.",
ret);
libdax_msgs_submit(libdax_messenger, d->global_index, libdax_msgs_submit(libdax_messenger, d->global_index,
0x00020148, 0x00020148,
LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH, LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
"Cannot write desired amount of data", errno, 0); msg, errno, 0);
d->cancel = 1; d->cancel = 1;
return 0; return 0;
} }
return count; ex:;
BURN_FREE_MEM(msg);
return ret;
} }
@ -2169,6 +2180,7 @@ int burn_stdio_mmc_dummy_write(struct burn_drive *d, int start,
int burn_stdio_sync_cache(int fd, struct burn_drive *d, int flag) int burn_stdio_sync_cache(int fd, struct burn_drive *d, int flag)
{ {
int ret; int ret;
char *msg = NULL;
if (fd < 0) { if (fd < 0) {
libdax_msgs_submit(libdax_messenger, d->global_index, libdax_msgs_submit(libdax_messenger, d->global_index,
@ -2186,14 +2198,22 @@ int burn_stdio_sync_cache(int fd, struct burn_drive *d, int flag)
"syncing cache (stdio fsync)", 0, 0); "syncing cache (stdio fsync)", 0, 0);
ret = fsync(fd); ret = fsync(fd);
if (ret != 0 && errno == EIO) { if (ret != 0 && errno == EIO) {
BURN_ALLOC_MEM(msg, char, 160);
sprintf(msg,
"Cannot write desired amount of data. fsync(2) returned %d.",
ret);
libdax_msgs_submit(libdax_messenger, d->global_index, libdax_msgs_submit(libdax_messenger, d->global_index,
0x00020148, 0x00020148,
LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH, LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
"Cannot write desired amount of data", errno, 0); msg, errno, 0);
d->cancel = 1; d->cancel = 1;
return 0; return 0;
} }
return 1; ret = 1;
ex:;
BURN_FREE_MEM(msg);
return ret;
} }