make: do not delete autotools generated file with distclean

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

diff --git a/extras/volume_id/lib/ufs.c b/extras/volume_id/lib/ufs.c
index d3960b1bec3754251651409faad9b5e278f739dd..0648b454d38819e0d92fe17064ecbdb00bb19c57 100644 (file)
--- a/extras/volume_id/lib/ufs.c
+++ b/extras/volume_id/lib/ufs.c
@@ -3,19 +3,24 @@
  *
  * Copyright (C) 2004 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>
@@ -24,7 +29,7 @@
 #include <ctype.h>
 
 #include "libvolume_id.h"
-#include "util.h"
+#include "libvolume_id-private.h"
 
 struct ufs_super_block {
        uint32_t        fs_link;
@@ -168,27 +173,27 @@ struct ufs_super_block {
 #define UFS_MAGIC_FEA                  0x00195612
 #define UFS_MAGIC_LFN                  0x00095014
 
-int volume_id_probe_ufs(struct volume_id *id, uint64_t off)
+int volume_id_probe_ufs(struct volume_id *id, uint64_t off, uint64_t size)
 {
        uint32_t magic;
        int i;
        struct ufs_super_block *ufs;
        int offsets[] = {0, 8, 64, 256, -1};
 
-       dbg("probing at offset 0x%llx", (unsigned long long) off);
+       info("probing at offset 0x%" PRIx64 "\n", off);
 
        for (i = 0; offsets[i] >= 0; i++) {     
                ufs = (struct ufs_super_block *) volume_id_get_buffer(id, off + (offsets[i] * 0x400), 0x800);
                if (ufs == NULL)
                        return -1;
 
-               dbg("offset 0x%x", offsets[i] * 0x400);
+               dbg("offset 0x%x\n", offsets[i] * 0x400);
                magic = be32_to_cpu(ufs->fs_magic);
                if ((magic == UFS_MAGIC) ||
                    (magic == UFS2_MAGIC) ||
                    (magic == UFS_MAGIC_FEA) ||
                    (magic == UFS_MAGIC_LFN)) {
-                       dbg("magic 0x%08x(be)", magic);
+                       dbg("magic 0x%08x(be)\n", magic);
                        goto found;
                }
                magic = le32_to_cpu(ufs->fs_magic);
@@ -196,7 +201,7 @@ int volume_id_probe_ufs(struct volume_id *id, uint64_t off)
                    (magic == UFS2_MAGIC) ||
                    (magic == UFS_MAGIC_FEA) ||
                    (magic == UFS_MAGIC_LFN)) {
-                       dbg("magic 0x%08x(le)", magic);
+                       dbg("magic 0x%08x(le)\n", magic);
                        goto found;
                }
        }
@@ -205,6 +210,18 @@ int volume_id_probe_ufs(struct volume_id *id, uint64_t off)
 found:
        volume_id_set_usage(id, VOLUME_ID_FILESYSTEM);
        id->type = "ufs";
+       switch (magic) {
+       case UFS_MAGIC:
+               strcpy(id->type_version, "1");
+               break;
+       case UFS2_MAGIC:
+               strcpy(id->type_version, "2");
+               volume_id_set_label_raw(id, ufs->fs_u11.fs_u2.fs_volname, 32);
+               volume_id_set_label_string(id, ufs->fs_u11.fs_u2.fs_volname, 32);
+               break;
+       default:
+               break;
+       }
 
        return 0;
 }