mirror of
https://github.com/moparisthebest/curl
synced 2024-11-05 09:05:04 -05:00
dcd6f81025
The function does not return the same value as snprintf() normally does, so readers may be mislead into thinking the code works differently than it actually does. A different function name makes this easier to detect. Reported-by: Tomas Hoger Assisted-by: Daniel Gustafsson Fixes #3296 Closes #3297
118 lines
4.1 KiB
C
118 lines
4.1 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) 1998 - 2018, 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 "curlcheck.h"
|
|
|
|
#include "urldata.h"
|
|
#include "progress.h"
|
|
|
|
static int usec_magnitude = 1000000;
|
|
|
|
static bool unit_setup(void)
|
|
{
|
|
return CURLE_OK;
|
|
}
|
|
|
|
static void unit_stop(void)
|
|
{
|
|
|
|
}
|
|
|
|
/*
|
|
* Invoke Curl_pgrsTime for TIMER_STARTSINGLE to trigger the behavior that
|
|
* manages is_t_startransfer_set, but fake the t_startsingle time for purposes
|
|
* of the test.
|
|
*/
|
|
static void fake_t_startsingle_time(struct Curl_easy *data,
|
|
struct curltime fake_now,
|
|
int seconds_offset)
|
|
{
|
|
Curl_pgrsTime(data, TIMER_STARTSINGLE);
|
|
data->progress.t_startsingle.tv_sec = fake_now.tv_sec + seconds_offset;
|
|
data->progress.t_startsingle.tv_usec = fake_now.tv_usec;
|
|
}
|
|
|
|
static bool usec_matches_seconds(time_t time_usec, int expected_seconds)
|
|
{
|
|
int time_sec = (int)(time_usec / usec_magnitude);
|
|
bool same = (time_sec == expected_seconds);
|
|
fprintf(stderr, "is %d us same as %d seconds? %s\n",
|
|
(int)time_usec, expected_seconds,
|
|
same?"Yes":"No");
|
|
return same;
|
|
}
|
|
|
|
static void expect_timer_seconds(struct Curl_easy *data, int seconds)
|
|
{
|
|
char msg[64];
|
|
msnprintf(msg, sizeof(msg), "about %d seconds should have passed", seconds);
|
|
fail_unless(usec_matches_seconds(data->progress.t_nslookup, seconds), msg);
|
|
fail_unless(usec_matches_seconds(data->progress.t_connect, seconds), msg);
|
|
fail_unless(usec_matches_seconds(data->progress.t_appconnect, seconds), msg);
|
|
fail_unless(usec_matches_seconds(data->progress.t_pretransfer, seconds),
|
|
msg);
|
|
fail_unless(usec_matches_seconds(data->progress.t_starttransfer, seconds),
|
|
msg);
|
|
}
|
|
|
|
/* Scenario: simulate a redirect. When a redirect occurs, t_nslookup,
|
|
* t_connect, t_appconnect, t_pretransfer, and t_starttransfer are addative.
|
|
* E.g., if t_starttransfer took 2 seconds initially and took another 1
|
|
* second for the redirect request, then the resulting t_starttransfer should
|
|
* be 3 seconds. */
|
|
UNITTEST_START
|
|
struct Curl_easy data;
|
|
struct curltime now = Curl_now();
|
|
|
|
data.progress.t_nslookup = 0;
|
|
data.progress.t_connect = 0;
|
|
data.progress.t_appconnect = 0;
|
|
data.progress.t_pretransfer = 0;
|
|
data.progress.t_starttransfer = 0;
|
|
data.progress.t_redirect = 0;
|
|
data.progress.start.tv_sec = now.tv_sec - 2;
|
|
data.progress.start.tv_usec = now.tv_usec;
|
|
fake_t_startsingle_time(&data, now, -2);
|
|
|
|
Curl_pgrsTime(&data, TIMER_NAMELOOKUP);
|
|
Curl_pgrsTime(&data, TIMER_CONNECT);
|
|
Curl_pgrsTime(&data, TIMER_APPCONNECT);
|
|
Curl_pgrsTime(&data, TIMER_PRETRANSFER);
|
|
Curl_pgrsTime(&data, TIMER_STARTTRANSFER);
|
|
|
|
expect_timer_seconds(&data, 2);
|
|
|
|
/* now simulate the redirect */
|
|
data.progress.t_redirect = data.progress.t_starttransfer + 1;
|
|
fake_t_startsingle_time(&data, now, -1);
|
|
|
|
Curl_pgrsTime(&data, TIMER_NAMELOOKUP);
|
|
Curl_pgrsTime(&data, TIMER_CONNECT);
|
|
Curl_pgrsTime(&data, TIMER_APPCONNECT);
|
|
Curl_pgrsTime(&data, TIMER_PRETRANSFER);
|
|
/* ensure t_starttransfer is only set on the first invocation by attempting
|
|
* to set it twice */
|
|
Curl_pgrsTime(&data, TIMER_STARTTRANSFER);
|
|
Curl_pgrsTime(&data, TIMER_STARTTRANSFER);
|
|
|
|
expect_timer_seconds(&data, 3);
|
|
UNITTEST_STOP
|