#endif
if (beg_range)
- fprintf(sfp, "Range: bytes="OFF_FMT"-\r\n", beg_range);
+ fprintf(sfp, "Range: bytes=%"OFF_FMT"-\r\n", beg_range);
#if ENABLE_FEATURE_WGET_LONG_OPTIONS
if (extra_headers)
fputs(extra_headers, sfp);
break;
/*FALLTHRU*/
default:
- chomp(buf);
- bb_error_msg_and_die("server returned error %s: %s", s, buf);
+ /* Show first line only and kill any ESC tricks */
+ buf[strcspn(buf, "\n\r\x1b")] = '\0';
+ bb_error_msg_and_die("server returned error: %s", buf);
}
/*
dfp = open_socket(&s_in);
if (beg_range) {
- sprintf(buf, "REST "OFF_FMT, beg_range);
+ sprintf(buf, "REST %"OFF_FMT, beg_range);
if (ftpcmd(buf, NULL, sfp, buf) == 350)
content_len -= beg_range;
}
{
FILE *fp;
+ /* glibc 2.4 seems to try seeking on it - ??! */
+ /* hopefully it understands what ESPIPE means... */
fp = fdopen(xconnect_tcp_v4(s_in), "r+");
if (fp == NULL)
bb_perror_msg_and_die("fdopen");
{
int width=0;
get_terminal_width_height(0, &width, NULL);
- return (width);
+ return width;
}
static void