udevd: clarify worker exit status

[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 92387e50775632b38cd15732e62b416bb725a5c7..cb4a1a1f075b4a0587f7e953ba29e57ee2fde401 100644 (file)
--- a/extras/ata_id/ata_id.c
+++ b/extras/ata_id/ata_id.c
@@ -486,8 +486,6 @@ int main(int argc, char *argv[])
                        printf("Usage: ata_id [--export] [--help] <device>\n"
                               "  --export    print values as environment keys\n"
                               "  --help      print this help text\n\n");
-               default:
-                       rc = 1;
                        goto exit;
                }
        }
@@ -584,8 +582,12 @@ int main(int argc, char *argv[])
                printf("ID_MODEL=%s\n", model);
                printf("ID_MODEL_ENC=%s\n", model_enc);
                printf("ID_REVISION=%s\n", revision);
-               printf("ID_SERIAL=%s_%s\n", model, serial);
-               printf("ID_SERIAL_SHORT=%s\n", serial);
+               if (serial[0] != '\0') {
+                       printf("ID_SERIAL=%s_%s\n", model, serial);
+                       printf("ID_SERIAL_SHORT=%s\n", serial);
+               } else {
+                       printf("ID_SERIAL=%s\n", model);
+               }
 
                if (id.command_set_1 & (1<<5)) {
                        printf ("ID_ATA_WRITE_CACHE=1\n");