mirror of
https://github.com/moparisthebest/curl
synced 2024-11-13 21:15:08 -05:00
4a5aa6682d
This reverts renaming and usage of lib/*.h header files done
28-12-2012, reverting 2 commits:
f871de0... build: make use of 76 lib/*.h renamed files
ffd8e12... build: rename 76 lib/*.h files
This also reverts removal of redundant include guard (redundant thanks
to changes in above commits) done 2-12-2013, reverting 1 commit:
c087374... curl_setup.h: remove redundant include guard
This also reverts renaming and usage of lib/*.c source files done
3-12-2013, reverting 3 commits:
13606bb... build: make use of 93 lib/*.c renamed files
5b6e792... build: rename 93 lib/*.c files
7d83dff... build: commit 13606bbfde follow-up 1
Start of related discussion thread:
http://curl.haxx.se/mail/lib-2013-01/0012.html
Asking for confirmation on pushing this revertion commit:
http://curl.haxx.se/mail/lib-2013-01/0048.html
Confirmation summary:
http://curl.haxx.se/mail/lib-2013-01/0079.html
NOTICE: The list of 2 files that have been modified by other
intermixed commits, while renamed, and also by at least one
of the 6 commits this one reverts follows below. These 2 files
will exhibit a hole in history unless git's '--follow' option
is used when viewing logs.
lib/curl_imap.h
lib/curl_smtp.h
117 lines
3.6 KiB
C
117 lines
3.6 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) 1998 - 2012, 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.
|
|
*
|
|
***************************************************************************/
|
|
#include "tool_setup.h"
|
|
|
|
#ifdef USE_ENVIRONMENT
|
|
|
|
#ifdef __riscos__
|
|
# include <kernel.h>
|
|
#endif
|
|
|
|
#define _MPRINTF_REPLACE /* use our functions only */
|
|
#include <curl/mprintf.h>
|
|
|
|
#include "tool_writeenv.h"
|
|
|
|
#include "memdebug.h" /* keep this as LAST include */
|
|
|
|
static const struct
|
|
{
|
|
const char * name;
|
|
CURLINFO id;
|
|
enum {
|
|
writeenv_NONE,
|
|
writeenv_DOUBLE,
|
|
writeenv_LONG,
|
|
writeenv_STRING
|
|
} type;
|
|
} variables[14] =
|
|
{
|
|
{"curl_url_effective", CURLINFO_EFFECTIVE_URL, writeenv_STRING},
|
|
{"curl_http_code", CURLINFO_RESPONSE_CODE, writeenv_LONG},
|
|
{"curl_time_total", CURLINFO_TOTAL_TIME, writeenv_DOUBLE},
|
|
{"curl_time_namelookup", CURLINFO_NAMELOOKUP_TIME, writeenv_DOUBLE},
|
|
{"curl_time_connect", CURLINFO_CONNECT_TIME, writeenv_DOUBLE},
|
|
{"curl_time_pretransfer", CURLINFO_PRETRANSFER_TIME, writeenv_DOUBLE},
|
|
{"curl_time_starttransfer", CURLINFO_STARTTRANSFER_TIME, writeenv_DOUBLE},
|
|
{"curl_size_header", CURLINFO_HEADER_SIZE, writeenv_LONG},
|
|
{"curl_size_request", CURLINFO_REQUEST_SIZE, writeenv_LONG},
|
|
{"curl_size_download", CURLINFO_SIZE_DOWNLOAD, writeenv_DOUBLE},
|
|
{"curl_size_upload", CURLINFO_SIZE_UPLOAD, writeenv_DOUBLE},
|
|
{"curl_speed_download", CURLINFO_SPEED_DOWNLOAD, writeenv_DOUBLE},
|
|
{"curl_speed_upload", CURLINFO_SPEED_UPLOAD, writeenv_DOUBLE},
|
|
{NULL, 0, writeenv_NONE}
|
|
};
|
|
|
|
static void internalSetEnv(const char * name, char * value)
|
|
{
|
|
/* Add your OS-specific code here. */
|
|
#ifdef __riscos__
|
|
_kernel_setenv(name, value);
|
|
#elif defined (CURLDEBUG)
|
|
curl_memlog("ENV %s = %s\n", name, value);
|
|
#endif
|
|
return;
|
|
}
|
|
|
|
void ourWriteEnv(CURL *curl)
|
|
{
|
|
unsigned int i;
|
|
char *string, numtext[10];
|
|
long longinfo;
|
|
double doubleinfo;
|
|
|
|
for(i=0; variables[i].name; i++) {
|
|
switch (variables[i].type) {
|
|
case writeenv_STRING:
|
|
if(curl_easy_getinfo(curl, variables[i].id, &string) == CURLE_OK)
|
|
internalSetEnv(variables[i].name, string);
|
|
else
|
|
internalSetEnv(variables[i].name, NULL);
|
|
break;
|
|
|
|
case writeenv_LONG:
|
|
if(curl_easy_getinfo(curl, variables[i].id, &longinfo) == CURLE_OK) {
|
|
curl_msprintf(numtext, "%5ld", longinfo);
|
|
internalSetEnv(variables[i].name, numtext);
|
|
}
|
|
else
|
|
internalSetEnv(variables[i].name, NULL);
|
|
break;
|
|
case writeenv_DOUBLE:
|
|
if(curl_easy_getinfo(curl, variables[i].id, &doubleinfo) == CURLE_OK) {
|
|
curl_msprintf(numtext, "%6.2f", doubleinfo);
|
|
internalSetEnv(variables[i].name, numtext);
|
|
}
|
|
else
|
|
internalSetEnv(variables[i].name, NULL);
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
|
|
return;
|
|
}
|
|
|
|
#endif
|