bdec6f2b20
curl_easy_duphandle did not necessarily duplicate the CURLOPT_COOKIEFILE option. It only enabled the cookie engine in the destination handle if data->cookies is not NULL (where data is the source handle). In case of a newly initialized handle which just had the cookie support enabled by a curl_easy_setopt(handle, CURL_COOKIEFILE, "")-call, handle->cookies was still NULL because the setopt-call only appends the value to data->change.cookielist, hence duplicating this handle would not have the cookie engine switched on. We also concluded that the slist-functionality would be suitable for being put in its own module rather than simply hanging out in lib/sendf.c so I created lib/slist.[ch] for them.
137 lines
3.4 KiB
C
137 lines
3.4 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) 1998 - 2009, 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 http://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.
|
|
*
|
|
* $Id$
|
|
***************************************************************************/
|
|
|
|
#include "setup.h"
|
|
|
|
#include <stdio.h>
|
|
#include <stdarg.h>
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
#include "memory.h"
|
|
#include "slist.h"
|
|
|
|
/* The last #include file should be: */
|
|
#include "memdebug.h"
|
|
|
|
/* returns last node in linked list */
|
|
static struct curl_slist *slist_get_last(struct curl_slist *list)
|
|
{
|
|
struct curl_slist *item;
|
|
|
|
/* if caller passed us a NULL, return now */
|
|
if(!list)
|
|
return NULL;
|
|
|
|
/* loop through to find the last item */
|
|
item = list;
|
|
while(item->next) {
|
|
item = item->next;
|
|
}
|
|
return item;
|
|
}
|
|
|
|
/*
|
|
* curl_slist_append() appends a string to the linked list. It always returns
|
|
* the address of the first record, so that you can use this function as an
|
|
* initialization function as well as an append function. If you find this
|
|
* bothersome, then simply create a separate _init function and call it
|
|
* appropriately from within the program.
|
|
*/
|
|
struct curl_slist *curl_slist_append(struct curl_slist *list,
|
|
const char *data)
|
|
{
|
|
struct curl_slist *last;
|
|
struct curl_slist *new_item;
|
|
|
|
new_item = malloc(sizeof(struct curl_slist));
|
|
if(new_item) {
|
|
char *dupdata = strdup(data);
|
|
if(dupdata) {
|
|
new_item->next = NULL;
|
|
new_item->data = dupdata;
|
|
}
|
|
else {
|
|
free(new_item);
|
|
return NULL;
|
|
}
|
|
}
|
|
else
|
|
return NULL;
|
|
|
|
if(list) {
|
|
last = slist_get_last(list);
|
|
last->next = new_item;
|
|
return list;
|
|
}
|
|
|
|
/* if this is the first item, then new_item *is* the list */
|
|
return new_item;
|
|
}
|
|
|
|
/*
|
|
* Curl_slist_duplicate() duplicates a linked list. It always returns the
|
|
* address of the first record of the cloned list or NULL in case of an
|
|
* error (or if the input list was NULL).
|
|
*/
|
|
struct curl_slist *Curl_slist_duplicate(struct curl_slist *inlist)
|
|
{
|
|
struct curl_slist *outlist = NULL;
|
|
struct curl_slist *tmp;
|
|
|
|
while(inlist) {
|
|
tmp = curl_slist_append(outlist, inlist->data);
|
|
|
|
if (!tmp) {
|
|
curl_slist_free_all(outlist);
|
|
return NULL;
|
|
}
|
|
|
|
outlist = tmp;
|
|
inlist = inlist->next;
|
|
}
|
|
return outlist;
|
|
}
|
|
|
|
/* be nice and clean up resources */
|
|
void curl_slist_free_all(struct curl_slist *list)
|
|
{
|
|
struct curl_slist *next;
|
|
struct curl_slist *item;
|
|
|
|
if(!list)
|
|
return;
|
|
|
|
item = list;
|
|
do {
|
|
next = item->next;
|
|
|
|
if(item->data) {
|
|
free(item->data);
|
|
}
|
|
free(item);
|
|
item = next;
|
|
} while(next);
|
|
}
|
|
|