*_id: fix zero length in set_str()

[elogind.git] / extras / ata_id / ata_id.c

diff --git a/extras/ata_id/ata_id.c b/extras/ata_id/ata_id.c
index 54c3c29feb071966cb17d0bec746543f01820252..9579db310593b5608493efd003808800f7265d8e 100644 (file)
--- a/extras/ata_id/ata_id.c
+++ b/extras/ata_id/ata_id.c
@@ -62,14 +62,13 @@ void log_message(int priority, const char *format, ...)
 }
 #endif
 
-static void set_str(char *to, const unsigned char *from, int count)
+static void set_str(char *to, const char *from, size_t count)
 {
-       int i, j;
-       int len;
+       size_t i, j, len;
 
        /* strip trailing whitespace */
        len = strnlen(from, count);
-       while (isspace(from[len-1]))
+       while (len && isspace(from[len-1]))
                len--;
 
        /* strip leading whitespace */
@@ -107,6 +106,8 @@ int main(int argc, char *argv[])
        int fd;
        int rc = 0;
 
+       logging_init("ata_id");
+
        for (i = 1 ; i < argc; i++) {
                char *arg = argv[i];
 
@@ -137,9 +138,9 @@ int main(int argc, char *argv[])
                goto close;
        }
 
-       set_str(model, id.model, 40);
-       set_str(serial, id.serial_no, 20);
-       set_str(revision, id.fw_rev, 8);
+       set_str(model, (char *) id.model, 40);
+       set_str(serial, (char *) id.serial_no, 20);
+       set_str(revision, (char *) id.fw_rev, 8);
 
        if (export) {
                if ((id.config >> 8) & 0x80) {
@@ -167,6 +168,7 @@ int main(int argc, char *argv[])
                printf("ID_MODEL=%s\n", model);
                printf("ID_SERIAL=%s\n", serial);
                printf("ID_REVISION=%s\n", revision);
+               printf("ID_BUS=ata\n");
        } else {
                if (serial[0] != '\0')
                        printf("%s_%s\n", model, serial);