emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wget: make -T timeout work on header reads too. Closes 8636

Browse Source 
function                                             old     new   delta
set_alarm                                              -      27     +27
fgets_and_trim                                        76      92     +16
wget_main                                           2610    2616      +6
open_socket                                           64      54     -10

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2016-03-17 15:58:16 +01:00
parent 0d1b71e8e6
commit 6701e91d84
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
networking/wget.c
View File

@ -203,7 +203,7 @@ struct globals {
const char *user_agent; /* "User-Agent" header field */ const char *user_agent; /* "User-Agent" header field */
#if ENABLE_FEATURE_WGET_TIMEOUT #if ENABLE_FEATURE_WGET_TIMEOUT
unsigned timeout_seconds; unsigned timeout_seconds;
bool connecting; bool die_if_timed_out;
#endif #endif
int output_fd; int output_fd;
int o_flags; int o_flags;
@ -333,9 +333,20 @@ static char* sanitize_string(char *s)
static void alarm_handler(int sig UNUSED_PARAM) static void alarm_handler(int sig UNUSED_PARAM)
{ {
/* This is theoretically unsafe (uses stdio and malloc in signal handler) */ /* This is theoretically unsafe (uses stdio and malloc in signal handler) */
if (G.connecting) if (G.die_if_timed_out)
bb_error_msg_and_die("download timed out"); bb_error_msg_and_die("download timed out");
} }
static void set_alarm(void)
{
if (G.timeout_seconds) {
alarm(G.timeout_seconds);
G.die_if_timed_out = 1;
}
}
# define clear_alarm() ((void)(G.die_if_timed_out = 0))
#else
# define set_alarm() ((void)0)
# define clear_alarm() ((void)0)
#endif #endif
static FILE *open_socket(len_and_sockaddr *lsa) static FILE *open_socket(len_and_sockaddr *lsa)
@ -343,9 +354,9 @@ static FILE *open_socket(len_and_sockaddr *lsa)
int fd; int fd;
FILE *fp; FILE *fp;
IF_FEATURE_WGET_TIMEOUT(alarm(G.timeout_seconds); G.connecting = 1;) set_alarm();
fd = xconnect_stream(lsa); fd = xconnect_stream(lsa);
IF_FEATURE_WGET_TIMEOUT(G.connecting = 0;) clear_alarm();
/* glibc 2.4 seems to try seeking on it - ??! */ /* glibc 2.4 seems to try seeking on it - ??! */
/* hopefully it understands what ESPIPE means... */ /* hopefully it understands what ESPIPE means... */
@ -357,14 +368,15 @@ static FILE *open_socket(len_and_sockaddr *lsa)
} }
/* Returns '\n' if it was seen, else '\0'. Trims at first '\r' or '\n' */ /* Returns '\n' if it was seen, else '\0'. Trims at first '\r' or '\n' */
/* FIXME: does not respect FEATURE_WGET_TIMEOUT and -T N: */
static char fgets_and_trim(FILE *fp) static char fgets_and_trim(FILE *fp)
{ {
char c; char c;
char *buf_ptr; char *buf_ptr;
set_alarm();
if (fgets(G.wget_buf, sizeof(G.wget_buf) - 1, fp) == NULL) if (fgets(G.wget_buf, sizeof(G.wget_buf) - 1, fp) == NULL)
bb_perror_msg_and_die("error getting response"); bb_perror_msg_and_die("error getting response");
clear_alarm();
buf_ptr = strchrnul(G.wget_buf, '\n'); buf_ptr = strchrnul(G.wget_buf, '\n');
c = *buf_ptr; c = *buf_ptr;