#include <scsi/scsi.h>
#include <scsi/sg.h>
#include <linux/types.h>
-/* #include <linux/bsg.h> */
-#include "bsg.h"
+#include <linux/bsg.h>
#include "libudev.h"
#include "libudev-private.h"
int code;
int sense_class;
int sense_key;
- int descriptor_format;
int asc, ascq;
#ifdef DUMP_SENSE
char out_buffer[256];
return -1;
}
if ((code == 0x0) || (code == 0x1)) {
- descriptor_format = 0;
sense_key = sense_buffer[2] & 0xf;
if (s < 14) {
/*
asc = sense_buffer[12];
ascq = sense_buffer[13];
} else if ((code == 0x2) || (code == 0x3)) {
- descriptor_format = 1;
sense_key = sense_buffer[1] & 0xf;
asc = sense_buffer[2];
ascq = sense_buffer[3];
/* serial has been memset to zero before */
j = strlen(serial); /* j = 1; */
- for (i = 0; i < page_83[3]; ++i) {
+ for (i = 0; (i < page_83[3]) && (j < max_len-3); ++i) {
serial[j++] = hex_str[(page_83[4+i] & 0xf0) >> 4];
serial[j++] = hex_str[ page_83[4+i] & 0x0f];
}
- strcpy(serial_short, serial);
+ serial[max_len-1] = 0;
+ strncpy(serial_short, serial, max_len-1);
return 0;
}