diff options
author | Po-Chuan Hsieh <sunpoet@sunpoet.net> | 2019-03-30 19:11:57 +0000 |
---|---|---|
committer | Daniel Gustafsson <daniel@yesql.se> | 2019-04-20 22:46:21 +0200 |
commit | 060f870b85a6ee85668caeb791935fe98f4da56d (patch) | |
tree | 33b415746b521af99f3b7433e412ba873b74b358 /lib/curl_get_line.c | |
parent | e04e974aed6b1187ec3bc7a6552a3d86cd4611cf (diff) | |
download | curl-060f870b85a6ee85668caeb791935fe98f4da56d.tar.gz |
altsvc: Fix building with cookies disables
ALTSVC requires Curl_get_line which is defined in lib/cookie.c inside a #if
check of HTTP and COOKIES. That makes Curl_get_line undefined if COOKIES is
disabled. Fix by splitting out the function into a separate file which can
be included where needed.
Closes #3717
Reviewed-by: Daniel Gustafsson <daniel@yesql.se>
Reviewed-by: Marcel Raad <Marcel.Raad@teamviewer.com>
Diffstat (limited to 'lib/curl_get_line.c')
-rw-r--r-- | lib/curl_get_line.c | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/lib/curl_get_line.c b/lib/curl_get_line.c new file mode 100644 index 000000000..c4194851a --- /dev/null +++ b/lib/curl_get_line.c @@ -0,0 +1,55 @@ +/*************************************************************************** + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * + * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al. + * + * This software is licensed as described in the file COPYING, which + * you should have received as part of this distribution. The terms + * are also available at https://curl.haxx.se/docs/copyright.html. + * + * You may opt to use, copy, modify, merge, publish, distribute and/or sell + * copies of the Software, and permit persons to whom the Software is + * furnished to do so, under the terms of the COPYING file. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ***************************************************************************/ + +#include "curl_setup.h" + +#include "curl_get_line.h" +#include "curl_memory.h" +/* The last #include file should be: */ +#include "memdebug.h" + +/* + * get_line() makes sure to only return complete whole lines that fit in 'len' + * bytes and end with a newline. + */ +char *Curl_get_line(char *buf, int len, FILE *input) +{ + bool partial = FALSE; + while(1) { + char *b = fgets(buf, len, input); + if(b) { + size_t rlen = strlen(b); + if(rlen && (b[rlen-1] == '\n')) { + if(partial) { + partial = FALSE; + continue; + } + return b; + } + /* read a partial, discard the next piece that ends with newline */ + partial = TRUE; + } + else + break; + } + return NULL; +} |