diff options
-rw-r--r-- | sys/geom/part/g_part_apm.c | 9 | ||||
-rw-r--r-- | sys/geom/part/g_part_gpt.c | 11 | ||||
-rw-r--r-- | sys/geom/part/g_part_pc98.c | 4 |
3 files changed, 16 insertions, 8 deletions
diff --git a/sys/geom/part/g_part_apm.c b/sys/geom/part/g_part_apm.c index 66c0295..bb79e56 100644 --- a/sys/geom/part/g_part_apm.c +++ b/sys/geom/part/g_part_apm.c @@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$"); #include <sys/systm.h> #include <sys/sysctl.h> #include <geom/geom.h> +#include <geom/geom_int.h> #include <geom/part/g_part.h> #include "g_part_if.h" @@ -310,10 +311,14 @@ g_part_apm_dumpconf(struct g_part_table *table, struct g_part_entry *baseentry, /* confxml: partition entry information */ strncpy(u.name, entry->ent.ent_name, APM_ENT_NAMELEN); u.name[APM_ENT_NAMELEN] = '\0'; - sbuf_printf(sb, "%s<label>%s</label>\n", indent, u.name); + sbuf_printf(sb, "%s<label>", indent); + g_conf_printf_escaped(sb, "%s", u.name); + sbuf_printf(sb, "</label>\n"); strncpy(u.type, entry->ent.ent_type, APM_ENT_TYPELEN); u.type[APM_ENT_TYPELEN] = '\0'; - sbuf_printf(sb, "%s<rawtype>%s</rawtype>\n", indent, u.type); + sbuf_printf(sb, "%s<rawtype>", indent); + g_conf_printf_escaped(sb, "%s", u.type); + sbuf_printf(sb, "</rawtype>\n"); } else { /* confxml: scheme information */ } diff --git a/sys/geom/part/g_part_gpt.c b/sys/geom/part/g_part_gpt.c index 49d3d3f..b6b38ca 100644 --- a/sys/geom/part/g_part_gpt.c +++ b/sys/geom/part/g_part_gpt.c @@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$"); #include <sys/sysctl.h> #include <sys/uuid.h> #include <geom/geom.h> +#include <geom/geom_int.h> #include <geom/part/g_part.h> #include "g_part_if.h" @@ -1253,16 +1254,16 @@ g_gpt_printf_utf16(struct sbuf *sb, uint16_t *str, size_t len) /* Write the Unicode character in UTF-8 */ if (ch < 0x80) - sbuf_printf(sb, "%c", ch); + g_conf_printf_escaped(sb, "%c", ch); else if (ch < 0x800) - sbuf_printf(sb, "%c%c", 0xc0 | (ch >> 6), + g_conf_printf_escaped(sb, "%c%c", 0xc0 | (ch >> 6), 0x80 | (ch & 0x3f)); else if (ch < 0x10000) - sbuf_printf(sb, "%c%c%c", 0xe0 | (ch >> 12), + g_conf_printf_escaped(sb, "%c%c%c", 0xe0 | (ch >> 12), 0x80 | ((ch >> 6) & 0x3f), 0x80 | (ch & 0x3f)); else if (ch < 0x200000) - sbuf_printf(sb, "%c%c%c%c", 0xf0 | (ch >> 18), - 0x80 | ((ch >> 12) & 0x3f), + g_conf_printf_escaped(sb, "%c%c%c%c", 0xf0 | + (ch >> 18), 0x80 | ((ch >> 12) & 0x3f), 0x80 | ((ch >> 6) & 0x3f), 0x80 | (ch & 0x3f)); } } diff --git a/sys/geom/part/g_part_pc98.c b/sys/geom/part/g_part_pc98.c index 07d6a62..2012d2b 100644 --- a/sys/geom/part/g_part_pc98.c +++ b/sys/geom/part/g_part_pc98.c @@ -300,7 +300,9 @@ g_part_pc98_dumpconf(struct g_part_table *table, sbuf_printf(sb, " xs PC98 xt %u sn %s", type, name); } else { /* confxml: partition entry information */ - sbuf_printf(sb, "%s<label>%s</label>\n", indent, name); + sbuf_printf(sb, "%s<label>", indent); + g_conf_printf_escaped(sb, "%s", name); + sbuf_printf(sb, "</label>\n"); if (entry->ent.dp_mid & PC98_MID_BOOTABLE) sbuf_printf(sb, "%s<attrib>bootable</attrib>\n", indent); |