Lab
/
libuhttpd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix bug: format number abnormal on some platform 

Signed-off-by: Jianhui Zhao <zhaojh329@gmail.com>
main^2
Jianhui Zhao 2021-01-06 01:43:05 +08:00
parent de6bd1bf92
commit e7f5ca114c
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/file.c
View File

@ -43,7 +43,7 @@
static const char *file_mktag(struct stat *s, char *buf, int len) static const char *file_mktag(struct stat *s, char *buf, int len)
{ {
snprintf(buf, len, "\"%" PRIx64 "-%" PRIx64 "-%" PRIx64 "\"", snprintf(buf, len, "\"%" PRIx64 "-%" PRIx64 "-%" PRIx64 "\"",
(uint64_t)s->st_ino, s->st_size, (uint64_t)s->st_mtime); (uint64_t)s->st_ino, (uint64_t)s->st_size, (uint64_t)s->st_mtime);
return buf; return buf;
} }
@ -166,6 +166,8 @@ static bool file_range(struct uh_connection *conn, size_t size, size_t *start, s
*start = 0; *start = 0;
*end = size - 1; *end = size - 1;
uh_log_info("%lu - %lu\n", *start, *end);
if (!hdr.p) { if (!hdr.p) {
*ranged = false; *ranged = false;
return true; return true;
@ -236,7 +238,7 @@ err:
conn->send_status_line(conn, HTTP_STATUS_RANGE_NOT_SATISFIABLE, "Content-Type: text/plain\r\nConnection: close\r\n"); conn->send_status_line(conn, HTTP_STATUS_RANGE_NOT_SATISFIABLE, "Content-Type: text/plain\r\nConnection: close\r\n");
conn->printf(conn, "Content-Length: %d\r\n", content_length); conn->printf(conn, "Content-Length: %d\r\n", content_length);
conn->printf(conn, "Content-Range: bytes */%" PRIu64 "\r\n", size); conn->printf(conn, "Content-Range: bytes */%zu\r\n", size);
conn->send(conn, "\r\n", 2); conn->send(conn, "\r\n", 2);
@ -329,10 +331,10 @@ void serve_file(struct uh_connection *conn)
mime = file_mime_lookup(fullpath); mime = file_mime_lookup(fullpath);
conn->printf(conn, "Content-Type: %s\r\n", mime); conn->printf(conn, "Content-Type: %s\r\n", mime);
conn->printf(conn, "Content-Length: %" PRIu64 "\r\n", end - start + 1); conn->printf(conn, "Content-Length: %zu\r\n", end - start + 1);
if (ranged) if (ranged)
conn->printf(conn, "Content-Range: bytes %" PRIu64 "-%" PRIu64 "/%" PRIu64 "\r\n", start, end, st.st_size); conn->printf(conn, "Content-Range: bytes %zu-%zu/%zu\r\n", start, end, st.st_size);
else else
file_if_gzip(conn, fullpath, mime); file_if_gzip(conn, fullpath, mime);