faraphel/chrony
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

util: add function to split string into words

Browse source
This commit is contained in:
Miroslav Lichvar 2020-04-09 09:59:39 +02:00
parent d3f4292968
commit d603426389
3 changed files with 69 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
test/unit/util.c
View file

@ -30,7 +30,7 @@ void test_unit(void) {
Timespec tspec; Timespec tspec;
Float f; Float f;
int i, j, c; int i, j, c;
char buf[16], *s; char buf[16], *s, *words[3];
uid_t uid; uid_t uid;
gid_t gid; gid_t gid;
struct stat st; struct stat st;
@ -333,4 +333,37 @@ void test_unit(void) {
TEST_CHECK(UTI_BytesToHex("\xAB\x12\x34\x56\x78\x00\x01", 7, buf, 14) == 0); TEST_CHECK(UTI_BytesToHex("\xAB\x12\x34\x56\x78\x00\x01", 7, buf, 14) == 0);
TEST_CHECK(UTI_BytesToHex("\xAB\x12\x34\x56\x78\x00\x01", 7, buf, 15) == 1); TEST_CHECK(UTI_BytesToHex("\xAB\x12\x34\x56\x78\x00\x01", 7, buf, 15) == 1);
TEST_CHECK(strcmp(buf, "AB123456780001") == 0); TEST_CHECK(strcmp(buf, "AB123456780001") == 0);
TEST_CHECK(snprintf(buf, sizeof (buf), "%s", "") < sizeof (buf));
TEST_CHECK(UTI_SplitString(buf, words, 3) == 0);
TEST_CHECK(!words[0]);
TEST_CHECK(snprintf(buf, sizeof (buf), "%s", " ") < sizeof (buf));
TEST_CHECK(UTI_SplitString(buf, words, 3) == 0);
TEST_CHECK(!words[0]);
TEST_CHECK(snprintf(buf, sizeof (buf), "%s", "a \n ") < sizeof (buf));
TEST_CHECK(UTI_SplitString(buf, words, 3) == 1);
TEST_CHECK(words[0] == buf + 0);
TEST_CHECK(strcmp(words[0], "a") == 0);
TEST_CHECK(snprintf(buf, sizeof (buf), "%s", " a ") < sizeof (buf));
TEST_CHECK(UTI_SplitString(buf, words, 3) == 1);
TEST_CHECK(words[0] == buf + 2);
TEST_CHECK(strcmp(words[0], "a") == 0);
TEST_CHECK(snprintf(buf, sizeof (buf), "%s", " \n a") < sizeof (buf));
TEST_CHECK(UTI_SplitString(buf, words, 3) == 1);
TEST_CHECK(words[0] == buf + 4);
TEST_CHECK(strcmp(words[0], "a") == 0);
TEST_CHECK(snprintf(buf, sizeof (buf), "%s", "a b") < sizeof (buf));
TEST_CHECK(UTI_SplitString(buf, words, 1) == 2);
TEST_CHECK(snprintf(buf, sizeof (buf), "%s", "a b") < sizeof (buf));
TEST_CHECK(UTI_SplitString(buf, words, 2) == 2);
TEST_CHECK(words[0] == buf + 0);
TEST_CHECK(words[1] == buf + 4);
TEST_CHECK(strcmp(words[0], "a") == 0);
TEST_CHECK(strcmp(words[1], "b") == 0);
TEST_CHECK(snprintf(buf, sizeof (buf), "%s", " a b ") < sizeof (buf));
TEST_CHECK(UTI_SplitString(buf, words, 3) == 2);
TEST_CHECK(words[0] == buf + 1);
TEST_CHECK(words[1] == buf + 3);
TEST_CHECK(strcmp(words[0], "a") == 0);
TEST_CHECK(strcmp(words[1], "b") == 0);
} }

30
util.c
View file

@ -1402,3 +1402,33 @@ UTI_HexToBytes(const char *hex, void *buf, unsigned int len)
return *hex == '\0' ? i : 0; return *hex == '\0' ? i : 0;
} }
/* ================================================== */
int
UTI_SplitString(char *string, char **words, int max_saved_words)
{
char *s = string;
int i;
for (i = 0; i < max_saved_words; i++)
words[i] = NULL;
for (i = 0; ; i++) {
/* Zero white-space characters before the word */
while (*s != '\0' && isspace((unsigned char)*s))
*s++ = '\0';
if (*s == '\0')
break;
if (i < max_saved_words)
words[i] = s;
/* Find the next word */
while (*s != '\0' && !isspace((unsigned char)*s))
s++;
}
return i;
}

5
util.h
View file

@ -220,6 +220,11 @@ extern int UTI_BytesToHex(const void *buf, unsigned int buf_len, char *hex, unsi
is supported. */ is supported. */
extern unsigned int UTI_HexToBytes(const char *hex, void *buf, unsigned int len); extern unsigned int UTI_HexToBytes(const char *hex, void *buf, unsigned int len);
/* Split a string into words separated by whitespace characters. It returns
the number of words found in the string, but saves only up to the specified
number of pointers to the words. */
extern int UTI_SplitString(char *string, char **words, int max_saved_words);
/* Macros to get maximum and minimum of two values */ /* Macros to get maximum and minimum of two values */
#ifdef MAX #ifdef MAX
#undef MAX #undef MAX