volume_id: use glibc's byteswap

[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..a97cc284cc515765ba111ccaf67ad993d0c82d7e 100644 (file)
--- a/extras/ata_id/ata_id.c
+++ b/extras/ata_id/ata_id.c
@@ -3,19 +3,9 @@
  *
  * Copyright (C) 2005 Kay Sievers <kay.sievers@vrfy.org>
  *
- *     This library is free software; you can redistribute it and/or
- *     modify it under the terms of the GNU Lesser General Public
- *     License as published by the Free Software Foundation; either
- *     version 2.1 of the License, or (at your option) any later version.
- *
- *     This library is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- *     Lesser General Public License for more details.
- *
- *     You should have received a copy of the GNU Lesser General Public
- *     License along with this library; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *     This program is free software; you can redistribute it and/or modify it
+ *     under the terms of the GNU General Public License as published by the
+ *     Free Software Foundation version 2 of the License.
  */
 
 #ifndef _GNU_SOURCE
@@ -62,14 +52,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 +96,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];
 
@@ -121,10 +112,7 @@ int main(int argc, char *argv[])
                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;
@@ -137,9 +125,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 +155,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);