Export the type of device from ata_id and scsi_id, also strip
leading and trailing whitespace and substitute consecutive
whitespace with a single underline char.
From: Hannes Reinecke <hare@suse.de>
Signed-off-by: Kay Sievers <kay.sievers@suse.de>
+ /* strip trailing whitespace */
len = strnlen(from, count);
while (isspace(from[len-1]))
len--;
len = strnlen(from, count);
while (isspace(from[len-1]))
len--;
+ /* strip leading whitespace */
i = 0;
while (isspace(from[i]) && (i < len))
i++;
j = 0;
while (i < len) {
i = 0;
while (isspace(from[i]) && (i < len))
i++;
j = 0;
while (i < len) {
- switch(from[i]) {
- case '/':
- case ' ':
+ /* substitute multiple whitespace */
+ if (isspace(from[i])) {
+ while (isspace(from[i]))
+ i++;
- break;
- default:
- to[j++] = from[i];
+ /* skip chars */
+ if (from[i] == '/') {
+ i++;
+ continue;
+ }
+ to[j++] = from[i++];
set_str(revision, id.fw_rev, 8);
if (export) {
set_str(revision, id.fw_rev, 8);
if (export) {
+ if ((id.config >> 8) & 0x80) {
+ /* This is an ATAPI device */
+ switch ((id.config >> 8) & 0x1f) {
+ case 0:
+ printf("ID_TYPE=cd\n");
+ break;
+ case 1:
+ printf("ID_TYPE=tape\n");
+ break;
+ case 5:
+ printf("ID_TYPE=cd\n");
+ break;
+ case 7:
+ printf("ID_TYPE=optical\n");
+ break;
+ default:
+ printf("ID_TYPE=generic\n");
+ break;
+ }
+ } else {
+ printf("ID_TYPE=disk\n");
+ }
printf("ID_MODEL=%s\n", model);
printf("ID_SERIAL=%s\n", serial);
printf("ID_REVISION=%s\n", revision);
printf("ID_MODEL=%s\n", model);
printf("ID_SERIAL=%s\n", serial);
printf("ID_REVISION=%s\n", revision);
static int export;
static char vendor_str[64];
static char model_str[64];
static int export;
static char vendor_str[64];
static char model_str[64];
+static char revision_str[16];
+static char type_str[16];
void log_message (int level, const char *format, ...)
{
void log_message (int level, const char *format, ...)
{
+ /* strip trailing whitespace */
len = strnlen(from, count);
while (isspace(from[len-1]))
len--;
len = strnlen(from, count);
while (isspace(from[len-1]))
len--;
+ /* strip leading whitespace */
i = 0;
while (isspace(from[i]) && (i < len))
i++;
j = 0;
while (i < len) {
i = 0;
while (isspace(from[i]) && (i < len))
i++;
j = 0;
while (i < len) {
- switch(from[i]) {
- case '/':
- case ' ':
+ /* substitute multiple whitespace */
+ if (isspace(from[i])) {
+ while (isspace(from[i]))
+ i++;
+ }
+ /* skip chars */
+ if (from[i] == '/') {
+ i++;
+ continue;
+ }
+ to[j++] = from[i++];
+ }
+ to[j] = '\0';
+}
+
+static void set_type(char *to, const char *from, int count)
+{
+ int type_num;
+ char *eptr;
+
+ type_num = strtoul(from, &eptr, 0);
+ if (eptr != from) {
+ switch (type_num) {
+ case 0:
+ sprintf(to, "disk");
+ break;
+ case 1:
+ sprintf(to, "tape");
+ break;
+ case 4:
+ sprintf(to, "optical");
+ break;
+ case 5:
+ sprintf(to, "cd");
+ break;
+ case 7:
+ sprintf(to, "optical");
+ break;
+ case 0xe:
+ sprintf(to, "disk");
+ break;
+ case 0xf:
+ sprintf(to, "optical");
+ sprintf(to, "generic");
+ break;
+ } else {
+ sprintf(to, "generic");
}
static int get_major_minor(struct sysfs_class_device *class_dev, int *maj,
}
static int get_major_minor(struct sysfs_class_device *class_dev, int *maj,
int retval;
int newargc;
char **newargv = NULL;
int retval;
int newargc;
char **newargv = NULL;
- struct sysfs_attribute *vendor, *model;
+ struct sysfs_attribute *vendor, *model, *type;
int option;
*good_bad = all_good;
int option;
*good_bad = all_good;
}
set_str(model_str, model->value, sizeof(model_str)-1);
}
set_str(model_str, model->value, sizeof(model_str)-1);
+ type = sysfs_get_device_attr(scsi_dev, "type");
+ if (!type) {
+ log_message(LOG_WARNING, "%s: cannot get type attribute\n",
+ scsi_dev->name);
+ return -1;
+ }
+ set_type(type_str, type->value, sizeof(type_str)-1);
+
+ type = sysfs_get_device_attr(scsi_dev, "rev");
+ if (!type) {
+ log_message(LOG_WARNING, "%s: cannot get type attribute\n",
+ scsi_dev->name);
+ return -1;
+ }
+ set_str(revision_str, type->value, sizeof(revision_str)-1);
+
retval = get_file_options(vendor->value, model->value, &newargc,
&newargv);
retval = get_file_options(vendor->value, model->value, &newargc,
&newargv);
static char serial_str[64];
printf("ID_VENDOR=%s\n", vendor_str);
printf("ID_MODEL=%s\n", model_str);
static char serial_str[64];
printf("ID_VENDOR=%s\n", vendor_str);
printf("ID_MODEL=%s\n", model_str);
+ printf("ID_REVISION=%s\n", revision_str);
set_str(serial_str, serial, sizeof(serial_str));
printf("ID_SERIAL=%s\n", serial_str);
set_str(serial_str, serial, sizeof(serial_str));
printf("ID_SERIAL=%s\n", serial_str);
+ printf("ID_TYPE=%s\n", type_str);
} else {
if (reformat_serial)
format_serial(serial);
} else {
if (reformat_serial)
format_serial(serial);
len = strlen(value);
while (len > 0 && isspace(value[len-1]))
value[--len] = '\0';
len = strlen(value);
while (len > 0 && isspace(value[len-1]))
value[--len] = '\0';
- dbg("removed %i trailing whitespace chars from '%s'", strlen(value)-len, value);
+ dbg("removed %zi trailing whitespace chars from '%s'", strlen(value)-len, value);
}
dbg("compare attribute '%s' value '%s' with '%s'", pair->name, value, pair->value);
}
dbg("compare attribute '%s' value '%s' with '%s'", pair->name, value, pair->value);
len += count;
if (len >= ressize-1) {
len += count;
if (len >= ressize-1) {
- err("ressize %d too short", ressize);
+ err("ressize %ld too short", (long)ressize);
if ((size_t)size > sizeof(buffer)-1)
size = sizeof(buffer)-1;
buffer[size] = '\0';
if ((size_t)size > sizeof(buffer)-1)
size = sizeof(buffer)-1;
buffer[size] = '\0';
- dbg("uevent_size=%i", size);
+ dbg("uevent_size=%li", (long)size);
/* start of event payload */
bufpos = strlen(buffer)+1;
/* start of event payload */
bufpos = strlen(buffer)+1;