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

Added debugging messages for drive recognition on Solaris

Browse Source
This commit is contained in:
Thomas Schmitt 2014-12-06 17:53:00 +00:00
parent 0b110821f6
commit 4670984dec
2 changed files with 69 additions and 12 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.11.26.164119" #define Cdrskin_timestamP "2014.12.06.175109"

79
libburn/sg-solaris.c
View File

@ -250,13 +250,14 @@ static int start_enum_cXtYdZs2(burn_drive_enumerator_t *idx, int flag)
static int next_enum_cXtYdZs2(burn_drive_enumerator_t *idx, static int next_enum_cXtYdZs2(burn_drive_enumerator_t *idx,
char adr[], int adr_size, int flag) char adr[], int adr_size, int flag)
{ {
int busno, tgtno, lunno, ret, fd = -1, volpath_size = 160; int busno, tgtno, lunno, ret, fd = -1, volpath_size = 160, os_errno;
char *volpath = NULL; char *volpath = NULL, *msg = NULL;
struct dirent *entry; struct dirent *entry;
struct dk_cinfo cinfo; struct dk_cinfo cinfo;
DIR *dir; DIR *dir;
BURN_ALLOC_MEM(volpath, char, volpath_size); BURN_ALLOC_MEM(volpath, char, volpath_size);
BURN_ALLOC_MEM(msg, char, 4096);
dir = idx->dir; dir = idx->dir;
while (1) { while (1) {
@ -282,25 +283,64 @@ static int next_enum_cXtYdZs2(burn_drive_enumerator_t *idx,
sprintf(volpath, "/dev/rdsk/%s", entry->d_name); sprintf(volpath, "/dev/rdsk/%s", entry->d_name);
if (burn_drive_is_banned(volpath)) if (burn_drive_is_banned(volpath))
continue;
fd = open(volpath, O_RDONLY | O_NDELAY);
if (fd < 0)
continue; continue;
fd = open(volpath, O_RDONLY | O_NDELAY);
if (fd < 0) {
os_errno = errno;
sprintf(msg, "Could not open '%s' , errno = %d",
volpath, os_errno);
libdax_msgs_submit(libdax_messenger, -1,
0x00000002,
LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH,
msg, os_errno, 0);
continue;
}
/* See man dkio */ /* See man dkio */
ret = ioctl(fd, DKIOCINFO, &cinfo); ret = ioctl(fd, DKIOCINFO, &cinfo);
close(fd); close(fd);
if (ret < 0) if (ret < 0) {
os_errno = errno;
sprintf(msg,
"ioctl(DKIOCINFO) failed on drive '%s', errno = %d",
volpath, os_errno);
libdax_msgs_submit(libdax_messenger, -1,
0x00000002,
LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH,
msg, os_errno, 0);
continue; continue;
if (cinfo.dki_ctype != DKC_CDROM) }
if (cinfo.dki_ctype != DKC_CDROM) {
sprintf(msg,
"ioctl(DKIOCINFO) classifies drive '%s' as dki_ctype %ld, not as DKC_CDROM = %ld",
volpath, (long int) cinfo.dki_ctype,
(long int) DKC_CDROM);
libdax_msgs_submit(libdax_messenger, -1,
0x00000002,
LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH,
msg, 0, 0);
continue; continue;
if (adr_size <= (int) strlen(volpath)) }
if (adr_size <= (int) strlen(volpath)) {
sprintf(msg,
"Device path '%s' too long. (Max. %d)",
volpath, adr_size - 1);
libdax_msgs_submit(libdax_messenger, -1,
0x00000002,
LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH,
msg, 0, 0);
{ret = -1; goto ex;} {ret = -1; goto ex;}
}
strcpy(adr, volpath); strcpy(adr, volpath);
sprintf(msg, "Accepted as valid drive '%s'", volpath);
libdax_msgs_submit(libdax_messenger, -1,
0x00000002,
LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH,
msg, 0, 0);
{ret = 1; goto ex;} {ret = 1; goto ex;}
} }
ret = 0; ret = 0;
ex:; ex:;
BURN_FREE_MEM(msg);
BURN_FREE_MEM(volpath); BURN_FREE_MEM(volpath);
return ret; return ret;
} }
@ -530,10 +570,27 @@ int sg_grab(struct burn_drive *d)
{ret = 0; goto ex;} {ret = 0; goto ex;}
} }
ret = ioctl(d->fd, DKIOCINFO, &cinfo); ret = ioctl(d->fd, DKIOCINFO, &cinfo);
if (ret < 0) if (ret < 0) {
os_errno = errno;
sprintf(msg, "ioctl(DKIOCINFO) failed on drive '%s'",
d->devname);
libdax_msgs_submit(libdax_messenger, d->global_index,
0x00000002,
LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH,
msg, os_errno, 0);
goto revoke; goto revoke;
if (cinfo.dki_ctype != DKC_CDROM) }
if (cinfo.dki_ctype != DKC_CDROM) {
sprintf(msg,
"ioctl(DKIOCINFO) classifies drive '%s' as dki_ctype %ld, not as DKC_CDROM = %ld",
d->devname, (long int) cinfo.dki_ctype,
(long int) DKC_CDROM);
libdax_msgs_submit(libdax_messenger, d->global_index,
0x00000002,
LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH,
msg, 0, 0);
goto revoke; goto revoke;
}
/* >>> obtain eventual locks */; /* >>> obtain eventual locks */;