/* ---------------------------------------------------------------------------------------------------- */
-/* This code is from udev - will become public libudev API at some point */
-
-/* count of characters used to encode one unicode char */
-static int utf8_encoded_expected_len(const char *str)
-{
- unsigned char c = (unsigned char)str[0];
-
- if (c < 0x80)
- return 1;
- if ((c & 0xe0) == 0xc0)
- return 2;
- if ((c & 0xf0) == 0xe0)
- return 3;
- if ((c & 0xf8) == 0xf0)
- return 4;
- if ((c & 0xfc) == 0xf8)
- return 5;
- if ((c & 0xfe) == 0xfc)
- return 6;
- return 0;
-}
-
-/* decode one unicode char */
-static int utf8_encoded_to_unichar(const char *str)
-{
- int unichar;
- int len;
- int i;
-
- len = utf8_encoded_expected_len(str);
- switch (len) {
- case 1:
- return (int)str[0];
- case 2:
- unichar = str[0] & 0x1f;
- break;
- case 3:
- unichar = (int)str[0] & 0x0f;
- break;
- case 4:
- unichar = (int)str[0] & 0x07;
- break;
- case 5:
- unichar = (int)str[0] & 0x03;
- break;
- case 6:
- unichar = (int)str[0] & 0x01;
- break;
- default:
- return -1;
- }
-
- for (i = 1; i < len; i++) {
- if (((int)str[i] & 0xc0) != 0x80)
- return -1;
- unichar <<= 6;
- unichar |= (int)str[i] & 0x3f;
- }
-
- return unichar;
-}
-
-/* expected size used to encode one unicode char */
-static int utf8_unichar_to_encoded_len(int unichar)
-{
- if (unichar < 0x80)
- return 1;
- if (unichar < 0x800)
- return 2;
- if (unichar < 0x10000)
- return 3;
- if (unichar < 0x200000)
- return 4;
- if (unichar < 0x4000000)
- return 5;
- return 6;
-}
-
-/* check if unicode char has a valid numeric range */
-static int utf8_unichar_valid_range(int unichar)
-{
- if (unichar > 0x10ffff)
- return 0;
- if ((unichar & 0xfffff800) == 0xd800)
- return 0;
- if ((unichar > 0xfdcf) && (unichar < 0xfdf0))
- return 0;
- if ((unichar & 0xffff) == 0xffff)
- return 0;
- return 1;
-}
-
-/* validate one encoded unicode char and return its length */
-static int utf8_encoded_valid_unichar(const char *str)
-{
- int len;
- int unichar;
- int i;
-
- len = utf8_encoded_expected_len(str);
- if (len == 0)
- return -1;
-
- /* ascii is valid */
- if (len == 1)
- return 1;
-
- /* check if expected encoded chars are available */
- for (i = 0; i < len; i++)
- if ((str[i] & 0x80) != 0x80)
- return -1;
-
- unichar = utf8_encoded_to_unichar(str);
-
- /* check if encoded length matches encoded value */
- if (utf8_unichar_to_encoded_len(unichar) != len)
- return -1;
-
- /* check if value has valid range */
- if (!utf8_unichar_valid_range(unichar))
- return -1;
-
- return len;
-}
-
-static int is_whitelisted(char c, const char *white)
-{
- if ((c >= '0' && c <= '9') ||
- (c >= 'A' && c <= 'Z') ||
- (c >= 'a' && c <= 'z') ||
- strchr("#+-.:=@_", c) != NULL ||
- (white != NULL && strchr(white, c) != NULL))
- return 1;
- return 0;
-}
-
-/**
- * _udev_util_encode_string:
- * @str: input string to be encoded
- * @str_enc: output string to store the encoded input string
- * @len: maximum size of the output 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: 0 if the entire string was copied, non-zero otherwise.
- */
-static int
-_udev_util_encode_string(const char *str, char *str_enc, size_t len)
-{
- size_t i, j;
-
- if (str == NULL || str_enc == NULL)
- return -1;
-
- for (i = 0, j = 0; str[i] != '\0'; i++) {
- int seqlen;
-
- seqlen = utf8_encoded_valid_unichar(&str[i]);
- if (seqlen > 1) {
- if (len-j < (size_t)seqlen)
- goto err;
- memcpy(&str_enc[j], &str[i], seqlen);
- j += seqlen;
- i += (seqlen-1);
- } else if (str[i] == '\\' || !is_whitelisted(str[i], NULL)) {
- if (len-j < 4)
- goto err;
- sprintf(&str_enc[j], "\\x%02x", (unsigned char) str[i]);
- j += 4;
- } else {
- if (len-j < 1)
- goto err;
- str_enc[j] = str[i];
- j++;
- }
- }
- if (len-j < 1)
- goto err;
- str_enc[j] = '\0';
- return 0;
-err:
- return -1;
-}
-
-/* ---------------------------------------------------------------------------------------------------- */
-
static vg_t
find_vg_for_pv_uuid (lvm_t lvm_ctx,
const gchar *pv_uuid,
g_print ("UDISKS_LVM2_PV_VG_EXTENT_COUNT=%" G_GUINT64_FORMAT "\n", lvm_vg_get_extent_count (vg));
g_print ("UDISKS_LVM2_PV_VG_SEQNUM=%" G_GUINT64_FORMAT "\n", lvm_vg_get_seqno (vg));
- /* then print the PV UUIDs that is part of the VG */
+ /* First we print the PVs that is part of the VG. We need this information
+ * because not all PVs may be available.
+ *
+ * The format used is a space-separated list of list of key value
+ * pairs separated by a semicolon. Since no value can contain
+ * the semicolon character we don't need to worry about escaping
+ * anything
+ *
+ * The following keys are recognized:
+ *
+ * uuid: the UUID of the PV
+ * size: the size of the PV (TODO: pending liblvm addition)
+ * allocated_size: the allocated size of the PV (TODO: pending liblvm addition)
+ *
+ * Here's an example of a string with this information
+ *
+ */
pvs = lvm_vg_list_pvs (vg);
if (pvs != NULL)
{
uuid = lvm_pv_get_uuid (pv);
if (uuid != NULL)
{
- g_string_append_printf (str, "uuid=%s ", uuid);
+ g_string_append_printf (str, "uuid=%s", uuid);
+ g_string_append_c (str, ' ');
dm_free (uuid);
}
}
/* Then print the LVs that is part of the VG - we need this because
* of the fact that LVs can be activated/deactivated independent of
- * each other... the format used is a space-separated list of list
- * of key value pairs separated by a semicolon. Each value is
- * escaped using _udev_util_encode_string() [1].
+ * each other.
*
- * [1] : udev_util_encode_string() and the corresponding decode
- * routine will be part of libudev at some point
+ * The format used is a space-separated list of list of key value
+ * pairs separated by a semicolon. Since no value can contain
+ * the semicolon character we don't need to worry about escaping
+ * anything
*
* The following keys are recognized:
*
gboolean is_active;
guint64 size;
lv_t lv = lv_list->lv;
- gchar buf[256];
uuid = lvm_lv_get_uuid (lv);
name = lvm_lv_get_name (lv);
if (uuid != NULL && name != NULL)
{
- _udev_util_encode_string (name, buf, sizeof (buf));
- g_string_append_printf (str, "name=%s;", buf);
- _udev_util_encode_string (uuid, buf, sizeof (buf));
- g_string_append_printf (str, "uuid=%s;", buf);
+ g_string_append_printf (str, "name=%s", name);
+ g_string_append_c (str, ';');
+ g_string_append_printf (str, "uuid=%s", uuid);
+ g_string_append_c (str, ';');
g_string_append_printf (str, "size=%" G_GUINT64_FORMAT ";", size);
- g_string_append_printf (str, "active=%d ", is_active);
+ g_string_append_c (str, ';');
+ g_string_append_printf (str, "active=%d", is_active);
+ g_string_append_c (str, ' ');
}
if (uuid != NULL)
projects / platform / upstream / udisks2.git / commitdiff