mirror of
https://github.com/cesanta/mongoose.git
synced 2026-11-08 16:11:18 +00:00
Handle minus in the fmt spec
This commit is contained in:
Sergey Lyubka committed
1 parent
54f75889fa
commit
313ac34e59
10 files changed
+272
-216
No files matched your search
@@ -146,103 +146,6 @@ bool mg_commalist(struct mg_str *s, struct mg_str *k, struct mg_str *v) {
|
||||
return off > 0;
|
||||
}
|
||||
|
||||
size_t mg_lld(char *buf, int64_t val, bool is_signed, bool is_hex) {
|
||||
const char *letters = "0123456789abcdef";
|
||||
uint64_t v = (uint64_t) val;
|
||||
size_t s = 0, n, i;
|
||||
if (is_signed && val < 0) buf[s++] = '-', v = (uint64_t) (-val);
|
||||
// This loop prints a number in reverse order. I guess this is because we
|
||||
// write numbers from right to left: least significant digit comes last.
|
||||
// Maybe because we use Arabic numbers, and Arabs write RTL?
|
||||
if (is_hex) {
|
||||
for (n = 0; v; v >>= 4) buf[s + n++] = letters[v & 15];
|
||||
} else {
|
||||
for (n = 0; v; v /= 10) buf[s + n++] = letters[v % 10];
|
||||
}
|
||||
// Reverse a string
|
||||
for (i = 0; i < n / 2; i++) {
|
||||
char t = buf[s + i];
|
||||
buf[s + i] = buf[s + n - i - 1], buf[s + n - i - 1] = t;
|
||||
}
|
||||
if (val == 0) buf[n++] = '0'; // Handle special case
|
||||
return n + s;
|
||||
}
|
||||
|
||||
static size_t mg_copys(char *buf, size_t len, size_t n, char *p, size_t k) {
|
||||
size_t j = 0;
|
||||
for (j = 0; j < k && p[j]; j++)
|
||||
if (j + n < len) buf[n + j] = p[j];
|
||||
return j;
|
||||
}
|
||||
|
||||
size_t mg_vsnprintf(char *buf, size_t len, const char *fmt, va_list ap) {
|
||||
size_t i = 0, n = 0;
|
||||
while (fmt[i] != '\0') {
|
||||
if (fmt[i] == '%') {
|
||||
size_t j, k, x = 0, is_long = 0, w = 0 /* width */, pr = 0 /* prec */;
|
||||
char pad = ' ', c = fmt[++i];
|
||||
if (c == '#') x++, c = fmt[++i];
|
||||
if (c == '0') pad = '0', c = fmt[++i];
|
||||
while (isdigit(c)) w *= 10, w += (size_t) (c - '0'), c = fmt[++i];
|
||||
if (c == '.') {
|
||||
c = fmt[++i];
|
||||
if (c == '*') {
|
||||
pr = (size_t) va_arg(ap, int);
|
||||
c = fmt[++i];
|
||||
} else {
|
||||
while (isdigit(c)) pr *= 10, pr += (size_t) (c - '0'), c = fmt[++i];
|
||||
}
|
||||
}
|
||||
while (c == 'h') c = fmt[++i]; // Treat h and hh as int
|
||||
if (c == 'l') {
|
||||
is_long++, c = fmt[++i];
|
||||
if (c == 'l') is_long++, c = fmt[++i];
|
||||
}
|
||||
if (c == 'p') x = 1, is_long = 1;
|
||||
if (c == 'd' || c == 'u' || c == 'x' || c == 'X' || c == 'p') {
|
||||
bool s = (c == 'd'), h = (c == 'x' || c == 'X' || c == 'p');
|
||||
char tmp[30];
|
||||
if (is_long == 2) {
|
||||
int64_t v = va_arg(ap, int64_t);
|
||||
k = mg_lld(tmp, v, s, h);
|
||||
} else if (is_long == 1) {
|
||||
long v = va_arg(ap, long);
|
||||
k = mg_lld(tmp, s ? (int64_t) v : (int64_t) (unsigned long) v, s, h);
|
||||
} else {
|
||||
int v = va_arg(ap, int);
|
||||
k = mg_lld(tmp, s ? (int64_t) v : (int64_t) (unsigned) v, s, h);
|
||||
}
|
||||
for (j = 0; k < w && j + k < w; j++)
|
||||
mg_copys(buf, len, n, &pad, 1), n++;
|
||||
if (x) mg_copys(buf, len, n, (char *) "0x", 2), n += 2;
|
||||
mg_copys(buf, len, n, tmp, k);
|
||||
n += k;
|
||||
} else if (c == 'c') {
|
||||
int p = va_arg(ap, int);
|
||||
if (n < len) buf[n] = (char) p;
|
||||
n++;
|
||||
} else if (c == 's') {
|
||||
char *p = va_arg(ap, char *);
|
||||
if (pr == 0) pr = p == NULL ? 0 : strlen(p);
|
||||
for (j = 0; pr < w && j + pr < w; j++)
|
||||
mg_copys(buf, len, n, &pad, 1), n++;
|
||||
n += mg_copys(buf, len, n, p, pr);
|
||||
} else if (c == '%') {
|
||||
if (n < len) buf[n] = '%';
|
||||
n++;
|
||||
} else {
|
||||
abort(); // Unsupported format specifier
|
||||
}
|
||||
i++;
|
||||
} else {
|
||||
if (n < len) buf[n] = fmt[i];
|
||||
n++, i++;
|
||||
}
|
||||
}
|
||||
if (n < len) buf[n] = '\0';
|
||||
return n;
|
||||
}
|
||||
|
||||
size_t mg_snprintf(char *buf, size_t len, const char *fmt, ...) {
|
||||
va_list ap;
|
||||
size_t n;
|
||||
@@ -354,3 +257,108 @@ int64_t mg_to64(struct mg_str str) {
|
||||
}
|
||||
return result * neg;
|
||||
}
|
||||
|
||||
size_t mg_lld(char *buf, int64_t val, bool is_signed, bool is_hex) {
|
||||
const char *letters = "0123456789abcdef";
|
||||
uint64_t v = (uint64_t) val;
|
||||
size_t s = 0, n, i;
|
||||
if (is_signed && val < 0) buf[s++] = '-', v = (uint64_t) (-val);
|
||||
// This loop prints a number in reverse order. I guess this is because we
|
||||
// write numbers from right to left: least significant digit comes last.
|
||||
// Maybe because we use Arabic numbers, and Arabs write RTL?
|
||||
if (is_hex) {
|
||||
for (n = 0; v; v >>= 4) buf[s + n++] = letters[v & 15];
|
||||
} else {
|
||||
for (n = 0; v; v /= 10) buf[s + n++] = letters[v % 10];
|
||||
}
|
||||
// Reverse a string
|
||||
for (i = 0; i < n / 2; i++) {
|
||||
char t = buf[s + i];
|
||||
buf[s + i] = buf[s + n - i - 1], buf[s + n - i - 1] = t;
|
||||
}
|
||||
if (val == 0) buf[n++] = '0'; // Handle special case
|
||||
return n + s;
|
||||
}
|
||||
|
||||
static size_t mg_copys(char *buf, size_t len, size_t n, char *p, size_t k) {
|
||||
size_t j = 0;
|
||||
for (j = 0; j < k && p[j]; j++)
|
||||
if (j + n < len) buf[n + j] = p[j];
|
||||
return j;
|
||||
}
|
||||
|
||||
size_t mg_vsnprintf(char *buf, size_t len, const char *fmt, va_list ap) {
|
||||
size_t i = 0, n = 0;
|
||||
while (fmt[i] != '\0') {
|
||||
if (fmt[i] == '%') {
|
||||
size_t j, k, x = 0, is_long = 0, w = 0 /* width */, pr = 0 /* prec */;
|
||||
char pad = ' ', minus = 0, c = fmt[++i];
|
||||
if (c == '#') x++, c = fmt[++i];
|
||||
if (c == '-') minus++, c = fmt[++i];
|
||||
if (c == '0') pad = '0', c = fmt[++i];
|
||||
while (isdigit(c)) w *= 10, w += (size_t) (c - '0'), c = fmt[++i];
|
||||
if (c == '.') {
|
||||
c = fmt[++i];
|
||||
if (c == '*') {
|
||||
pr = (size_t) va_arg(ap, int);
|
||||
c = fmt[++i];
|
||||
} else {
|
||||
while (isdigit(c)) pr *= 10, pr += (size_t) (c - '0'), c = fmt[++i];
|
||||
}
|
||||
}
|
||||
while (c == 'h') c = fmt[++i]; // Treat h and hh as int
|
||||
if (c == 'l') {
|
||||
is_long++, c = fmt[++i];
|
||||
if (c == 'l') is_long++, c = fmt[++i];
|
||||
}
|
||||
if (c == 'p') x = 1, is_long = 1;
|
||||
if (c == 'd' || c == 'u' || c == 'x' || c == 'X' || c == 'p') {
|
||||
bool s = (c == 'd'), h = (c == 'x' || c == 'X' || c == 'p');
|
||||
char tmp[30];
|
||||
size_t xl = x ? 2 : 0;
|
||||
if (is_long == 2) {
|
||||
int64_t v = va_arg(ap, int64_t);
|
||||
k = mg_lld(tmp, v, s, h);
|
||||
} else if (is_long == 1) {
|
||||
long v = va_arg(ap, long);
|
||||
k = mg_lld(tmp, s ? (int64_t) v : (int64_t) (unsigned long) v, s, h);
|
||||
} else {
|
||||
int v = va_arg(ap, int);
|
||||
k = mg_lld(tmp, s ? (int64_t) v : (int64_t) (unsigned) v, s, h);
|
||||
}
|
||||
for (j = 0; j < xl && w > 0; j++) w--;
|
||||
for (j = 0; pad == ' ' && !minus && k < w && j + k < w; j++)
|
||||
n += mg_copys(buf, len, n, &pad, 1);
|
||||
n += mg_copys(buf, len, n, (char *) "0x", xl);
|
||||
for (j = 0; pad == '0' && k < w && j + k < w; j++)
|
||||
n += mg_copys(buf, len, n, &pad, 1);
|
||||
n += mg_copys(buf, len, n, tmp, k);
|
||||
for (j = 0; pad == ' ' && minus && k < w && j + k < w; j++)
|
||||
n += mg_copys(buf, len, n, &pad, 1);
|
||||
} else if (c == 'c') {
|
||||
int p = va_arg(ap, int);
|
||||
if (n < len) buf[n] = (char) p;
|
||||
n++;
|
||||
} else if (c == 's') {
|
||||
char *p = va_arg(ap, char *);
|
||||
if (pr == 0) pr = p == NULL ? 0 : strlen(p);
|
||||
for (j = 0; !minus && pr < w && j + pr < w; j++)
|
||||
n += mg_copys(buf, len, n, &pad, 1);
|
||||
n += mg_copys(buf, len, n, p, pr);
|
||||
for (j = 0; minus && pr < w && j + pr < w; j++)
|
||||
n += mg_copys(buf, len, n, &pad, 1);
|
||||
} else if (c == '%') {
|
||||
if (n < len) buf[n] = '%';
|
||||
n++;
|
||||
} else {
|
||||
abort(); // Unsupported format specifier
|
||||
}
|
||||
i++;
|
||||
} else {
|
||||
if (n < len) buf[n] = fmt[i];
|
||||
n++, i++;
|
||||
}
|
||||
}
|
||||
if (n < len) buf[n] = '\0';
|
||||
return n;
|
||||
}
|
||||
Reference in new issue
Block a user