scsi_id: we don't use DEVPATH env var anymore, update man page

[elogind.git] / extras / volume_id / lib / volume_id.c

diff --git a/extras/volume_id/lib/volume_id.c b/extras/volume_id/lib/volume_id.c
index 7c68fb1ef9fdb42cb77c2e3164982949a4ad2a36..8f22509ca6be6ab718780dda3e4c428c4cbc0a9a 100644 (file)
--- a/extras/volume_id/lib/volume_id.c
+++ b/extras/volume_id/lib/volume_id.c
@@ -3,19 +3,24 @@
  *
  * Copyright (C) 2005-2007 Kay Sievers <kay.sievers@vrfy.org>
  *
- *     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.
+ * 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, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE 1
 #endif
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -26,7 +31,7 @@
 #include <sys/stat.h>
 
 #include "libvolume_id.h"
-#include "util.h"
+#include "libvolume_id-private.h"
 
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 
@@ -70,11 +75,15 @@ static const struct prober prober_filesystem[] = {
        { volume_id_probe_hpfs, { "hpfs", } },
        { volume_id_probe_sysv, { "sysv", "xenix", } },
        { volume_id_probe_minix, { "minix",  } },
+       { volume_id_probe_gfs, { "gfs", } },
+       { volume_id_probe_gfs2, { "gfs2", } },
        { volume_id_probe_ocfs1, { "ocfs1", } },
        { volume_id_probe_ocfs2, { "ocfs2", } },
        { volume_id_probe_vxfs, { "vxfs", } },
        { volume_id_probe_squashfs, { "squashfs", } },
        { volume_id_probe_netware, { "netware", } },
+       { volume_id_probe_oracleasm, { "oracleasm", } },
+       { volume_id_probe_btrfs, { "btrfs", } },
 };
 
 /* the user can overwrite this log function */
@@ -358,8 +367,7 @@ int volume_id_probe_raid(struct volume_id *id, uint64_t off, uint64_t size)
        if (!device_is_readable(id, off))
                return -1;
 
-       info("probing at offset 0x%llx, size 0x%llx",
-           (unsigned long long) off, (unsigned long long) size);
+       info("probing at offset 0x%" PRIx64 ", size 0x%" PRIx64 "\n", off, size);
 
        for (i = 0; i < ARRAY_SIZE(prober_raid); i++)
                if (prober_raid[i].prober(id, off, size) == 0)
@@ -392,8 +400,7 @@ int volume_id_probe_filesystem(struct volume_id *id, uint64_t off, uint64_t size
        if (!device_is_readable(id, off))
                return -1;
 
-       info("probing at offset 0x%llx, size 0x%llx",
-           (unsigned long long) off, (unsigned long long) size);
+       info("probing at offset 0x%" PRIx64 ", size 0x%" PRIx64 "\n", off, size);
 
        for (i = 0; i < ARRAY_SIZE(prober_filesystem); i++)
                if (prober_filesystem[i].prober(id, off, size) == 0)
@@ -476,37 +483,15 @@ struct volume_id *volume_id_open_fd(int fd)
 {
        struct volume_id *id;
 
-       id = malloc(sizeof(struct volume_id));
+       id = calloc(1, sizeof(struct volume_id));
        if (id == NULL)
                return NULL;
-       memset(id, 0x00, sizeof(struct volume_id));
 
        id->fd = fd;
 
        return id;
 }
 
-struct volume_id *volume_id_open_node(const char *path)
-{
-       struct volume_id *id;
-       int fd;
-
-       fd = open(path, O_RDONLY);
-       if (fd < 0) {
-               dbg("unable to open '%s'", path);
-               return NULL;
-       }
-
-       id = volume_id_open_fd(fd);
-       if (id == NULL)
-               return NULL;
-
-       /* close fd on device close */
-       id->fd_close = 1;
-
-       return id;
-}
-
 /**
  * volume_id_close:
  * @id: Probing context.
@@ -518,9 +503,6 @@ void volume_id_close(struct volume_id *id)
        if (id == NULL)
                return;
 
-       if (id->fd_close != 0)
-               close(id->fd);
-
        volume_id_free_buffer(id);
 
        free(id);