summaryrefslogtreecommitdiff
path: root/src/tc-string.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2020-09-10 18:47:17 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2020-09-10 18:47:17 +0200
commitec66c414866572fcd77a5bf7e4a444e84d8aa804 (patch)
tree50b95bea4fdc18396e581506369bd7d67bcc438b /src/tc-string.c
parent41aba5755c9fa6082aec99c4fec6c571f8e5062a (diff)
parent4fbd529e776527e548b343a82e14d1cb7eb30764 (diff)
Merge branch 'release/experimental/3.25-1_exp1' into masterexperimental/3.25-1_exp1
Diffstat (limited to 'src/tc-string.c')
-rw-r--r--src/tc-string.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/src/tc-string.c b/src/tc-string.c
index 112a845..6e85f66 100644
--- a/src/tc-string.c
+++ b/src/tc-string.c
@@ -160,8 +160,8 @@ static void t_split(void)
memcpy(t2, t1, sizeof(t1));
a0 = HX_split(t1, ":", &f0, 0);
- a1 = HX_split4(t1, ":", &f1, 0);
- f2 = HX_split5(t2, ":", ARRAY_SIZE(a2), a2);
+ a1 = HX_split_inplace(t1, ":", &f1, 0);
+ f2 = HX_split_fixed(t2, ":", ARRAY_SIZE(a2), a2);
/* complete allocation */
printf("HX_split1: a0[%p]:", a0);
@@ -170,7 +170,7 @@ static void t_split(void)
printf("\n");
/* array allocated */
- printf("HX_split4: a1[%p]:", a1);
+ printf("HX_split_inplace: a1[%p]:", a1);
for (wp = a1; *wp != NULL; ++wp)
printf(" %s[%p]", *wp, *wp);
printf("\n");
@@ -202,6 +202,8 @@ extern char *f_strlcpy_mem(char *, const char *, size_t);
EXPORT_SYMBOL char *f_strlcpy_str(char *d, const char *s, size_t n)
{
+ if (n == 0)
+ return d;
strncpy(d, s, n);
d[n-1] = '\0';
return d;
@@ -279,6 +281,13 @@ static void t_strlcpy(void)
}
}
+static void t_strlcpy2(void)
+{
+ char a[3] = {49, 49, 49};
+ HX_strlcpy(&a[1], &a[1], 0);
+ assert(a[0] == 49 && a[0] == a[1] && a[1] == a[2]);
+}
+
int main(int argc, const char **argv)
{
hxmc_t *tx = NULL;
@@ -308,6 +317,7 @@ int main(int argc, const char **argv)
t_split();
t_split2();
t_strlcpy();
+ t_strlcpy2();
HXmc_free(tx);
HX_exit();
return EXIT_SUCCESS;