add "Persistent Device Naming" rules file for disks

[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 e26cb6bd2dffb9b3879e404c88334e479a2b650a..ba40555a0b1040c3b41209ea8be484b81569a9b8 100644 (file)
--- a/extras/ata_id/ata_id.c
+++ b/extras/ata_id/ata_id.c
@@ -62,29 +62,34 @@ void log_message(int priority, const char *format, ...)
 }
 #endif
 
 }
 #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);
        len = strnlen(from, count);

-       while (isspace(from[len-1]))
+       while (len && isspace(from[len-1]))

                len--;
 
                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++;

                        to[j++] = '_';
                        to[j++] = '_';

-               default:
-                       to[j++] = from[i];

                }
                }

-               i++;
+               /* skip chars */
+               if (from[i] == '/') {
+                       i++;
+                       continue;
+               }
+               to[j++] = from[i++];

        }
        to[j] = '\0';
 }
        }
        to[j] = '\0';
 }


@@ -101,6 +106,8 @@ int main(int argc, char *argv[])
        int fd;
        int rc = 0;
 
        int fd;
        int rc = 0;
 

+       logging_init("ata_id");
+

        for (i = 1 ; i < argc; i++) {
                char *arg = argv[i];
 
        for (i = 1 ; i < argc; i++) {
                char *arg = argv[i];
 


@@ -115,10 +122,7 @@ int main(int argc, char *argv[])
                goto exit;
        }
 
                goto exit;
        }
 

-       fd = open(node, O_RDONLY);
-       if (fd < 0)
-               if (errno == ENOMEDIUM)
-                       fd = open(node, O_RDONLY|O_NONBLOCK);
+       fd = open(node, O_RDONLY|O_NONBLOCK);

        if (fd < 0) {
                err("unable to open '%s'", node);
                rc = 1;
        if (fd < 0) {
                err("unable to open '%s'", node);
                rc = 1;


@@ -131,16 +135,43 @@ int main(int argc, char *argv[])
                goto close;
        }
 
                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 (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);

-       } else
-               printf("%s_%s\n", model, serial);
+               printf("ID_BUS=ata\n");
+       } else {
+               if (serial[0] != '\0')
+                       printf("%s_%s\n", model, serial);
+               else
+                       printf("%s\n", model);
+       }

 
 close:
        close(fd);
 
 close:
        close(fd);