bootctl: move toupper() implementation to string-util.h
We already have tolower() calls there, hence let's unify this at one place. Also, update the code to only use ASCII operations, so that we don't end up being locale dependant.
This commit is contained in:
parent
fdc1af0a8a
commit
846b8fc30d
|
@ -323,6 +323,14 @@ char ascii_tolower(char x) {
|
|||
return x;
|
||||
}
|
||||
|
||||
char ascii_toupper(char x) {
|
||||
|
||||
if (x >= 'a' && x <= 'z')
|
||||
return x - 'a' + 'A';
|
||||
|
||||
return x;
|
||||
}
|
||||
|
||||
char *ascii_strlower(char *t) {
|
||||
char *p;
|
||||
|
||||
|
@ -334,6 +342,17 @@ char *ascii_strlower(char *t) {
|
|||
return t;
|
||||
}
|
||||
|
||||
char *ascii_strupper(char *t) {
|
||||
char *p;
|
||||
|
||||
assert(t);
|
||||
|
||||
for (p = t; *p; p++)
|
||||
*p = ascii_toupper(*p);
|
||||
|
||||
return t;
|
||||
}
|
||||
|
||||
char *ascii_strlower_n(char *t, size_t n) {
|
||||
size_t i;
|
||||
|
||||
|
|
|
@ -137,6 +137,9 @@ char ascii_tolower(char x);
|
|||
char *ascii_strlower(char *s);
|
||||
char *ascii_strlower_n(char *s, size_t n);
|
||||
|
||||
char ascii_toupper(char x);
|
||||
char *ascii_strupper(char *s);
|
||||
|
||||
int ascii_strcasecmp_n(const char *a, const char *b, size_t n);
|
||||
int ascii_strcasecmp_nn(const char *a, size_t n, const char *b, size_t m);
|
||||
|
||||
|
|
|
@ -597,15 +597,6 @@ error:
|
|||
return r;
|
||||
}
|
||||
|
||||
static char* strupper(char *s) {
|
||||
char *p;
|
||||
|
||||
for (p = s; *p; p++)
|
||||
*p = toupper(*p);
|
||||
|
||||
return s;
|
||||
}
|
||||
|
||||
static int mkdir_one(const char *prefix, const char *suffix) {
|
||||
char *p;
|
||||
|
||||
|
@ -654,7 +645,7 @@ static int copy_one_file(const char *esp_path, const char *name, bool force) {
|
|||
|
||||
/* Create the EFI default boot loader name (specified for removable devices) */
|
||||
v = strjoina(esp_path, "/EFI/BOOT/BOOT", name + strlen("systemd-boot"));
|
||||
strupper(strrchr(v, '/') + 1);
|
||||
ascii_strupper(strrchr(v, '/') + 1);
|
||||
|
||||
k = copy_file(p, v, force);
|
||||
if (k < 0 && r == 0)
|
||||
|
|
Loading…
Reference in New Issue