Commit 060f870b authored by Po-Chuan Hsieh's avatar Po-Chuan Hsieh Committed by Daniel Gustafsson
Browse files

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: default avatarDaniel Gustafsson <daniel@yesql.se>
Reviewed-by: default avatarMarcel Raad <Marcel.Raad@teamviewer.com>
parent e04e974a

lib/Makefile.inc

+2 −2
Original line number Original line Diff line number Diff line
@@ -55,7 +55,7 @@ LIB_CFILES = file.c timeval.c base64.c hostip.c progress.c formdata.c \ 
  curl_multibyte.c hostcheck.c conncache.c dotdot.c                     \

  curl_multibyte.c hostcheck.c conncache.c dotdot.c                     \

  x509asn1.c http2.c smb.c curl_endian.c curl_des.c system_win32.c      \

  x509asn1.c http2.c smb.c curl_endian.c curl_des.c system_win32.c      \

  mime.c sha256.c setopt.c curl_path.c curl_ctype.c curl_range.c psl.c  \

  mime.c sha256.c setopt.c curl_path.c curl_ctype.c curl_range.c psl.c  \

  doh.c urlapi.c altsvc.c

  doh.c urlapi.c curl_get_line.c altsvc.c





LIB_HFILES = arpa_telnet.h netrc.h file.h timeval.h hostip.h progress.h \

LIB_HFILES = arpa_telnet.h netrc.h file.h timeval.h hostip.h progress.h \

  formdata.h cookie.h http.h sendf.h ftp.h url.h dict.h if2ip.h         \

  formdata.h cookie.h http.h sendf.h ftp.h url.h dict.h if2ip.h         \
@@ -76,7 +76,7 @@ LIB_HFILES = arpa_telnet.h netrc.h file.h timeval.h hostip.h progress.h \ 
  x509asn1.h http2.h sigpipe.h smb.h curl_endian.h curl_des.h           \

  x509asn1.h http2.h sigpipe.h smb.h curl_endian.h curl_des.h           \

  curl_printf.h system_win32.h rand.h mime.h curl_sha256.h setopt.h     \

  curl_printf.h system_win32.h rand.h mime.h curl_sha256.h setopt.h     \

  curl_path.h curl_ctype.h curl_range.h psl.h doh.h urlapi-int.h        \

  curl_path.h curl_ctype.h curl_range.h psl.h doh.h urlapi-int.h        \

  altsvc.h

  curl_get_line.h altsvc.h





LIB_RCFILES = libcurl.rc

LIB_RCFILES = libcurl.rc

lib/altsvc.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -29,7 +29,7 @@ 
#include <curl/curl.h>

#include <curl/curl.h>

#include "urldata.h"

#include "urldata.h"

#include "altsvc.h"

#include "altsvc.h"

#include "cookie.h" /* for Curl_get_line() */

#include "curl_get_line.h"

#include "strcase.h"

#include "strcase.h"

#include "parsedate.h"

#include "parsedate.h"

#include "sendf.h"

#include "sendf.h"

lib/cookie.c

+1 −27
Original line number Original line Diff line number Diff line
@@ -93,6 +93,7 @@ Example set of cookies: 
#include "share.h"

#include "share.h"

#include "strtoofft.h"

#include "strtoofft.h"

#include "strcase.h"

#include "strcase.h"

#include "curl_get_line.h"

#include "curl_memrchr.h"

#include "curl_memrchr.h"

#include "inet_pton.h"

#include "inet_pton.h"
@@ -1085,33 +1086,6 @@ Curl_cookie_add(struct Curl_easy *data, 
  return co;

  return co;

}

}





/*

 * 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;

}







/*****************************************************************************

/*****************************************************************************

 *

 *

lib/cookie.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -101,7 +101,6 @@ struct Cookie *Curl_cookie_getlist(struct CookieInfo *, const char *, 
void Curl_cookie_freelist(struct Cookie *cookies);

void Curl_cookie_freelist(struct Cookie *cookies);

void Curl_cookie_clearall(struct CookieInfo *cookies);

void Curl_cookie_clearall(struct CookieInfo *cookies);

void Curl_cookie_clearsess(struct CookieInfo *cookies);

void Curl_cookie_clearsess(struct CookieInfo *cookies);

char *Curl_get_line(char *buf, int len, FILE *input);





#if defined(CURL_DISABLE_HTTP) || defined(CURL_DISABLE_COOKIES)

#if defined(CURL_DISABLE_HTTP) || defined(CURL_DISABLE_COOKIES)

#define Curl_cookie_list(x) NULL

#define Curl_cookie_list(x) NULL

lib/curl_get_line.c

0 → 100644
+55 −0
Original line number Original line Diff line number Diff line 
/***************************************************************************

 *                                  _   _ ____  _

 *  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;

}