mirror of
https://github.com/cesanta/mongoose.git
synced 2026-10-28 12:30:58 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8eceacc0d3 |
No files matched your search
+6
-1
@@ -2968,7 +2968,12 @@ size_t mg_vxprintf(void (*out)(char, void *), void *param, const char *fmt,
|
||||
n++;
|
||||
} else if (c == 's') {
|
||||
char *p = va_arg(*ap, char *);
|
||||
if (pr == ~0U) pr = p == NULL ? 0 : strlen(p);
|
||||
if (p != NULL && pr != ~0U) {
|
||||
for (j = 0; j < pr && p[j] != '\0'; j++) ; // portable strnlen()
|
||||
pr = j;
|
||||
} else {
|
||||
pr = p == NULL ? 0 : strlen(p);
|
||||
}
|
||||
for (j = 0; !minus && pr < w && j + pr < w; j++)
|
||||
n += scpy(out, param, &pad, 1);
|
||||
n += scpy(out, param, p, pr);
|
||||
|
||||
@@ -214,7 +214,12 @@ size_t mg_vxprintf(void (*out)(char, void *), void *param, const char *fmt,
|
||||
n++;
|
||||
} else if (c == 's') {
|
||||
char *p = va_arg(*ap, char *);
|
||||
if (pr == ~0U) pr = p == NULL ? 0 : strlen(p);
|
||||
if (p != NULL && pr != ~0U) {
|
||||
for (j = 0; j < pr && p[j] != '\0'; j++) ; // portable strnlen()
|
||||
pr = j;
|
||||
} else {
|
||||
pr = p == NULL ? 0 : strlen(p);
|
||||
}
|
||||
for (j = 0; !minus && pr < w && j + pr < w; j++)
|
||||
n += scpy(out, param, &pad, 1);
|
||||
n += scpy(out, param, p, pr);
|
||||
|
||||
@@ -2399,10 +2399,15 @@ static void test_str(void) {
|
||||
ASSERT(sn("%.*s", 1, "ab"));
|
||||
ASSERT(sn("%.1s", "ab"));
|
||||
ASSERT(sn("%.99s", "a"));
|
||||
ASSERT(sn("%10.8s", "abc"));
|
||||
ASSERT(sn("%-6.4s", "ab"));
|
||||
ASSERT(sn("%5.1s", ""));
|
||||
ASSERT(sn("%11s", "a"));
|
||||
ASSERT(sn("%s", "a\0b"));
|
||||
ASSERT(sn("%2s", "a"));
|
||||
ASSERT(sn("%.*s", 3, "a\0b"));
|
||||
ASSERT(mg_snprintf(NULL, 0, "%.8s", (char *) NULL) == 0);
|
||||
ASSERT(mg_snprintf(NULL, 0, "%8.4s", (char *) NULL) == 8);
|
||||
ASSERT(sn("%d", 7));
|
||||
ASSERT(sn("%d", 123));
|
||||
#if MG_ARCH == MG_ARCH_UNIX
|
||||
|
||||
Reference in new issue
Block a user