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

Bug fix: Early SCSI commands from sg-linux.c were not logged

Browse Source
This commit is contained in:
Thomas Schmitt 2020-04-15 20:52:05 +02:00
parent b57c05c874
commit 799175019b
2 changed files with 11 additions and 3 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 "2019.11.25.091234" #define Cdrskin_timestamP "2020.04.15.185125"

12
libburn/sg-linux.c
View File

@ -383,11 +383,16 @@ static int sg_exchange_scd_for_sr(char *fname, int flag)
/* This is an early stage version of scsi_log_cmd. /* This is an early stage version of scsi_log_cmd.
>>> It will become obsolete when the /tmp file handler is moved into >>> It will become obsolete when the /tmp file handler is moved into
>>> scsi_log_command(). >>> scsi_log_command().
@param flag bit0= data direction is FROM_DRIVE
*/ */
static int sgio_log_cmd(unsigned char *cmd, int cmd_len, FILE *fp_in, int flag) static int sgio_log_cmd(unsigned char *cmd, int cmd_len, FILE *fp_in, int flag)
{ {
FILE *fp = fp_in; FILE *fp = fp_in;
int ret = 0; int ret = 0;
int data_dir = NO_TRANSFER;
if (flag & 1)
data_dir = FROM_DRIVE;
/* >>> ts B11110 : move this into scsi_log_command() */ /* >>> ts B11110 : move this into scsi_log_command() */
if (fp == NULL && (burn_sg_log_scsi & 1)) { if (fp == NULL && (burn_sg_log_scsi & 1)) {
@ -398,10 +403,13 @@ static int sgio_log_cmd(unsigned char *cmd, int cmd_len, FILE *fp_in, int flag)
} }
if (fp != NULL) if (fp != NULL)
ret = scsi_log_command(cmd, cmd_len, NO_TRANSFER, NULL, 0, ret = scsi_log_command(cmd, cmd_len, data_dir, NULL, 0,
fp, flag); fp, flag);
if (fp_in == NULL && fp != NULL) if (fp_in == NULL && fp != NULL)
fclose(fp); fclose(fp);
if (fp == stderr || !(burn_sg_log_scsi & 2))
return ret;
ret = scsi_log_command(cmd, cmd_len, data_dir, NULL, 0, stderr, 0);
return ret; return ret;
} }
@ -473,7 +481,7 @@ static int sgio_inquiry_cd_drive(int fd, char *fname)
s.dxfer_len = 36; s.dxfer_len = 36;
s.usr_ptr = NULL; s.usr_ptr = NULL;
sgio_log_cmd(s.cmdp, s.cmd_len, NULL, 0); sgio_log_cmd(s.cmdp, s.cmd_len, NULL, 1);
c_start_time = burn_get_time(0); c_start_time = burn_get_time(0);
ret = ioctl(fd, SG_IO, &s); ret = ioctl(fd, SG_IO, &s);