system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-07-01 07:34:28 +00:00
Code Issues Projects Releases Wiki Activity

string-util: modernize first_word a bit

Browse Source
This commit is contained in:
Mike Yuan 2024-06-05 16:54:29 +02:00
parent 58aec56d84
commit c1bf0571c0
No known key found for this signature in database
GPG Key ID: 417471C0A40F58B3
1 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/basic/string-util.c
View File

@ -24,37 +24,26 @@
#include "utf8.h"
char* first_word(const char *s, const char *word) {
size_t sl, wl;
const char *p;
assert(s);
assert(word);
/* Checks if the string starts with the specified word, either
* followed by NUL or by whitespace. Returns a pointer to the
* NUL or the first character after the whitespace. */
/* Checks if the string starts with the specified word, either followed by NUL or by whitespace.
* Returns a pointer to the NUL or the first character after the whitespace. */
sl = strlen(s);
wl = strlen(word);
if (sl < wl)
return NULL;
if (wl == 0)
if (isempty(word))
return (char*) s;
if (memcmp(s, word, wl) != 0)
const char *p = startswith(s, word);
if (!p)
return NULL;
p = s + wl;
if (*p == 0)
if (*p == '\0')
return (char*) p;
if (!strchr(WHITESPACE, *p))
const char *nw = skip_leading_chars(p, WHITESPACE);
if (p == nw)
return NULL;
p += strspn(p, WHITESPACE);
return (char*) p;
return (char*) nw;
}
char *strnappend(const char *s, const char *suffix, size_t b) {