{ 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_log_fn_t volume_id_log_fn = default_log;
/**
- * volume_id_get_label:
+ * volume_id_get_prober_by_type:
* @type: Type string.
*
* Lookup the probing function for a specific type.
return 1;
}
+static int needs_encoding(const char c)
+{
+ if ((c >= '0' && c <= '9') ||
+ (c >= 'A' && c <= 'Z') ||
+ (c >= 'a' && c <= 'z') ||
+ strchr(ALLOWED_CHARS, c))
+ return 0;
+ return 1;
+}
+
+/**
+ * volume_id_encode_string:
+ * @str: Input string to be encoded.
+ * @str_enc: Target string to store the encoded input.
+ * @len: Location to store the encoded string. The target string,
+ * which may be four times as long as the input string.
+ *
+ * Encode all potentially unsafe characters of a string to the
+ * corresponding hex value prefixed by '\x'.
+ *
+ * Returns: 1 if the entire string was copied, 0 otherwise.
+ **/
+int volume_id_encode_string(const char *str, char *str_enc, size_t len)
+{
+ size_t i, j;
+
+ if (str == NULL || str_enc == NULL || len == 0)
+ return 0;
+
+ str_enc[0] = '\0';
+ for (i = 0, j = 0; str[i] != '\0'; i++) {
+ int seqlen;
+
+ seqlen = volume_id_utf8_encoded_valid_unichar(&str[i]);
+ if (seqlen > 1) {
+ memcpy(&str_enc[j], &str[i], seqlen);
+ j += seqlen;
+ i += (seqlen-1);
+ } else if (str[i] == '\\' || needs_encoding(str[i])) {
+ sprintf(&str_enc[j], "\\x%02x", (unsigned char) str[i]);
+ j += 4;
+ } else {
+ str_enc[j] = str[i];
+ j++;
+ }
+ if (j+3 >= len)
+ goto err;
+ }
+ str_enc[j] = '\0';
+ return 1;
+err:
+ return 0;
+}
+
+/* run only once into a timeout for unreadable devices */
+static int device_is_readable(struct volume_id *id, uint64_t off)
+{
+ if (volume_id_get_buffer(id, off, 0x200) != NULL)
+ return 1;
+ return 0;
+}
+
/**
* volume_id_probe_raid:
* @id: Probing context.
if (id == NULL)
return -EINVAL;
- info("probing at offset 0x%llx, size 0x%llx",
+ if (!device_is_readable(id, off))
+ return -1;
+
+ info("probing at offset 0x%llx, size 0x%llx\n",
(unsigned long long) off, (unsigned long long) size);
for (i = 0; i < ARRAY_SIZE(prober_raid); i++)
if (id == NULL)
return -EINVAL;
- info("probing at offset 0x%llx, size 0x%llx",
+ if (!device_is_readable(id, off))
+ return -1;
+
+ info("probing at offset 0x%llx, size 0x%llx\n",
(unsigned long long) off, (unsigned long long) size);
for (i = 0; i < ARRAY_SIZE(prober_filesystem); i++)
if (id == NULL)
return -EINVAL;
+ if (!device_is_readable(id, off))
+ return -1;
+
/* probe for raid first, because fs probes may be successful on raid members */
if (volume_id_probe_raid(id, off, size) == 0)
return 0;
fd = open(path, O_RDONLY);
if (fd < 0) {
- dbg("unable to open '%s'", path);
+ dbg("unable to open '%s'\n", path);
return NULL;
}