diff options
| author | Karel Zak <kzak@redhat.com> | 2025-04-01 17:45:01 +0200 |
|---|---|---|
| committer | Karel Zak <kzak@redhat.com> | 2025-04-02 11:06:17 +0200 |
| commit | 8ec0c305e9f6ab904119201a13873faedb30da57 (patch) | |
| tree | 4e24c6929c18b76114a35f9389e74e7c7b639194 /libfdisk/src/script.c | |
| parent | 7eb663503c77d739f2cc80d78ee9d380b11b6eb9 (diff) | |
| download | util-linux-8ec0c305e9f6ab904119201a13873faedb30da57.tar.gz | |
libfdisk: avoid strcasecmp() for ASCII-only strings
Use cctype.h for locale-independent string comparison and to avoid
tricky string conversions like in tr_TR locales.
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'libfdisk/src/script.c')
| -rw-r--r-- | libfdisk/src/script.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/libfdisk/src/script.c b/libfdisk/src/script.c index 652b14ed3c..6bb642f021 100644 --- a/libfdisk/src/script.c +++ b/libfdisk/src/script.c @@ -1,4 +1,5 @@ +#include "cctype.h" #include "fdiskP.h" #include "strutils.h" #include "carefulputc.h" @@ -239,7 +240,7 @@ static struct fdisk_scriptheader *script_get_header(struct fdisk_script *dp, list_for_each(p, &dp->headers) { struct fdisk_scriptheader *fi = list_entry(p, struct fdisk_scriptheader, headers); - if (strcasecmp(fi->name, name) == 0) + if (c_strcasecmp(fi->name, name) == 0) return fi; } @@ -1165,41 +1166,41 @@ static int parse_line_nameval(struct fdisk_script *dp, char *s) DBG(SCRIPT, ul_debugobj(dp, " parsing '%s'", p)); p = (char *) skip_blank(p); - if (!strncasecmp(p, "start=", 6)) { + if (!c_strncasecmp(p, "start=", 6)) { p += 6; rc = parse_start_value(dp, pa, &p); - } else if (!strncasecmp(p, "size=", 5)) { + } else if (!c_strncasecmp(p, "size=", 5)) { p += 5; rc = parse_size_value(dp, pa, &p); - } else if (!strncasecmp(p, "bootable", 8)) { + } else if (!c_strncasecmp(p, "bootable", 8)) { /* we use next_token() to skip possible extra space */ char *tk = next_token(&p); - if (tk && strcasecmp(tk, "bootable") == 0) + if (tk && c_strcasecmp(tk, "bootable") == 0) pa->boot = 1; else rc = -EINVAL; - } else if (!strncasecmp(p, "attrs=", 6)) { + } else if (!c_strncasecmp(p, "attrs=", 6)) { p += 6; free(pa->attrs); rc = next_string(&p, &pa->attrs); - } else if (!strncasecmp(p, "uuid=", 5)) { + } else if (!c_strncasecmp(p, "uuid=", 5)) { p += 5; free(pa->uuid); rc = next_string(&p, &pa->uuid); - } else if (!strncasecmp(p, "name=", 5)) { + } else if (!c_strncasecmp(p, "name=", 5)) { p += 5; free(pa->name); rc = next_string(&p, &pa->name); if (!rc) unhexmangle_string(pa->name); - } else if (!strncasecmp(p, "type=", 5) || - !strncasecmp(p, "Id=", 3)) { /* backward compatibility */ + } else if (!c_strncasecmp(p, "type=", 5) || + !c_strncasecmp(p, "Id=", 3)) { /* backward compatibility */ char *type = NULL; fdisk_unref_parttype(pa->type); |