diff options
author | Aleksey Veresov <aleksey@veresov.pro> | 2020-02-06 11:27:59 +0300 |
---|---|---|
committer | Aleksey Veresov <aleksey@veresov.pro> | 2020-02-06 11:27:59 +0300 |
commit | fca83975899b01c62ede4258f175346b7039be3d (patch) | |
tree | 37c2bb8faf95de1252a97942a68183f795eb82a0 /src/inner_multipart.c | |
parent | 8ef310a22a54dca7a80947f83f03bc296ab298dd (diff) | |
parent | 746c3f3076fe5994f08d729aa1b958465231b0c8 (diff) | |
download | magi-fca83975899b01c62ede4258f175346b7039be3d.tar magi-fca83975899b01c62ede4258f175346b7039be3d.tar.xz magi-fca83975899b01c62ede4258f175346b7039be3d.zip |
Merge branch 'master' into test
Diffstat (limited to 'src/inner_multipart.c')
-rw-r--r-- | src/inner_multipart.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/inner_multipart.c b/src/inner_multipart.c index 65252e5..0187f7c 100644 --- a/src/inner_multipart.c +++ b/src/inner_multipart.c @@ -2,8 +2,8 @@ #include "inner_multipart.h" #include "error.h" +#include "inner_tools.h" #include "param.h" -#include "utils.h" #include <ctype.h> #include <stdio.h> #include <stdlib.h> @@ -74,9 +74,9 @@ static char * extract_filename(char * n) n += strspn(n, " \t") + 1; if (*n == '"') { ++n; - return magi_str_create_copy(n, strchr(n, '"')); + return magi_str_create_copy(n, n - strchr(n, '"')); } else { - return magi_str_create_copy(n, n + strcspn(n, " \t")); + return magi_str_create_copy(n, strcspn(n, " \t")); } } @@ -89,12 +89,12 @@ static int content_disposition(struct automata * a) n += strspn(n, " \t") + 1; if (*n == '"') { ++n; - a->param.name = magi_str_create_copy(n, strchr(n, '"')); + a->param.name = magi_str_create_copy(n, n - strchr(n, '"')); if (!a->param.name || !*a->param.name) { return 0; } } else { - a->param.name = magi_str_create_copy(n, n + strcspn(n, " \t")); + a->param.name = magi_str_create_copy(n, strcspn(n, " \t")); if (!a->param.name || !is_str_token(a->param.name)) { return 0; } |