Major rework of the directory structure and the entire build system.

 -Erik

1 files changed, 0 insertions, 834 deletions

diff --git a/wget.c b/wget.c
deleted file mode 100644
index 59373d1d9..000000000
--- a/wget.c
+++ /dev/null
@@ -1,834 +0,0 @@
-/* vi: set sw=4 ts=4: */
-/*
- * wget - retrieve a file using HTTP or FTP
- *
- * Chip Rosenthal Covad Communications <chip@laserlink.net>
- *
- */
-
-#include <stdio.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <ctype.h>
-#include <string.h>
-#include <unistd.h>
-#include <signal.h>
-#include <sys/ioctl.h>
-
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-#include <getopt.h>
-
-#include "busybox.h"
-
-/* Stupid libc5 doesn't define this... */
-#ifndef timersub
-#define	timersub(a, b, result)						      \
-  do {									      \
-    (result)->tv_sec = (a)->tv_sec - (b)->tv_sec;			      \
-    (result)->tv_usec = (a)->tv_usec - (b)->tv_usec;			      \
-    if ((result)->tv_usec < 0) {					      \
-      --(result)->tv_sec;						      \
-      (result)->tv_usec += 1000000;					      \
-    }									      \
-  } while (0)
-#endif	
-
-struct host_info {
-	char *host;
-	int port;
-	char *path;
-	int is_ftp;
-	char *user;
-};
-
-static void parse_url(char *url, struct host_info *h);
-static FILE *open_socket(char *host, int port);
-static char *gethdr(char *buf, size_t bufsiz, FILE *fp, int *istrunc);
-static int ftpcmd(char *s1, char *s2, FILE *fp, char *buf);
-
-/* Globals (can be accessed from signal handlers */
-static off_t filesize = 0;		/* content-length of the file */
-static int chunked = 0;			/* chunked transfer encoding */
-#ifdef BB_FEATURE_WGET_STATUSBAR
-static void progressmeter(int flag);
-static char *curfile;			/* Name of current file being transferred. */
-static struct timeval start;	/* Time a transfer started. */
-static volatile unsigned long statbytes = 0; /* Number of bytes transferred so far. */
-/* For progressmeter() -- number of seconds before xfer considered "stalled" */
-static const int STALLTIME = 5;
-#endif
-		
-static void close_and_delete_outfile(FILE* output, char *fname_out, int do_continue)
-{
-	if (output != stdout && do_continue==0) {
-		fclose(output);
-		unlink(fname_out);
-	}
-}
-
-/* Read NMEMB elements of SIZE bytes into PTR from STREAM.  Returns the
- * number of elements read, and a short count if an eof or non-interrupt
- * error is encountered.  */
-static size_t safe_fread(void *ptr, size_t size, size_t nmemb, FILE *stream)
-{
-	size_t ret = 0;
-
-	do {
-		clearerr(stream);
-		ret += fread((char *)ptr + (ret * size), size, nmemb - ret, stream);
-	} while (ret < nmemb && ferror(stream) && errno == EINTR);
-
-	return ret;
-}
-
-/* Write NMEMB elements of SIZE bytes from PTR to STREAM.  Returns the
- * number of elements written, and a short count if an eof or non-interrupt
- * error is encountered.  */
-static size_t safe_fwrite(void *ptr, size_t size, size_t nmemb, FILE *stream)
-{
-	size_t ret = 0;
-
-	do {
-		clearerr(stream);
-		ret += fwrite((char *)ptr + (ret * size), size, nmemb - ret, stream);
-	} while (ret < nmemb && ferror(stream) && errno == EINTR);
-
-	return ret;
-}
-
-/* Read a line or SIZE - 1 bytes into S, whichever is less, from STREAM.
- * Returns S, or NULL if an eof or non-interrupt error is encountered.  */
-static char *safe_fgets(char *s, int size, FILE *stream)
-{
-	char *ret;
-
-	do {
-		clearerr(stream);
-		ret = fgets(s, size, stream);
-	} while (ret == NULL && ferror(stream) && errno == EINTR);
-
-	return ret;
-}
-
-#define close_delete_and_die(s...) { \
-	close_and_delete_outfile(output, fname_out, do_continue); \
-	error_msg_and_die(s); }
-
-
-#ifdef BB_FEATURE_WGET_AUTHENTICATION
-/*
- *  Base64-encode character string
- *  oops... isn't something similar in uuencode.c?
- *  It would be better to use already existing code
- */
-char *base64enc(char *p, char *buf, int len) {
-
-        char al[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
-                    "0123456789+/";
-		char *s = buf;
-
-        while(*p) {
-				if (s >= buf+len-4)
-					error_msg_and_die("buffer overflow");
-                *(s++) = al[(*p >> 2) & 0x3F];
-                *(s++) = al[((*p << 4) & 0x30) | ((*(p+1) >> 4) & 0x0F)];
-                *s = *(s+1) = '=';
-                *(s+2) = 0;
-                if (! *(++p)) break;
-                *(s++) = al[((*p << 2) & 0x3C) | ((*(p+1) >> 6) & 0x03)];
-                if (! *(++p)) break;
-                *(s++) = al[*(p++) & 0x3F];
-        }
-
-		return buf;
-}
-#endif
-
-int wget_main(int argc, char **argv)
-{
-	int n, try=5, status;
-	int port;
-	char *proxy;
-	char *dir_prefix=NULL;
-	char *s, buf[512];
-	struct stat sbuf;
-	char extra_headers[1024];
-	char *extra_headers_ptr = extra_headers;
-	int extra_headers_left = sizeof(extra_headers);
-	int which_long_opt = 0, option_index = -1;
-	struct host_info server, target;
-
-	FILE *sfp = NULL;			/* socket to web/ftp server			*/
-	FILE *dfp = NULL;			/* socket to ftp server (data)		*/
-	char *fname_out = NULL;		/* where to direct output (-O)		*/
-	int do_continue = 0;		/* continue a prev transfer (-c)	*/
-	long beg_range = 0L;		/*   range at which continue begins	*/
-	int got_clen = 0;			/* got content-length: from server	*/
-	FILE *output;				/* socket to web server				*/
-	int quiet_flag = FALSE;		/* Be verry, verry quiet...			*/
-
-#define LONG_HEADER	1
-	struct option long_options[] = {
-		{ "continue",		0, NULL, 'c' },
-		{ "quiet",		0, NULL, 'q' },
-		{ "output-document",	1, NULL, 'O' },
-		{ "header",		1, &which_long_opt, LONG_HEADER },
-		{ 0,			0, 0, 0 }
-	};
-	/*
-	 * Crack command line.
-	 */
-	while ((n = getopt_long(argc, argv, "cqO:P:", long_options, &option_index)) != EOF) {
-		switch (n) {
-		case 'c':
-			++do_continue;
-			break;
-		case 'P':
-			dir_prefix = optarg;
-			break;
-		case 'q':
-			quiet_flag = TRUE;
-			break;
-		case 'O':
-			/* can't set fname_out to NULL if outputting to stdout, because
-			 * this gets interpreted as the auto-gen output filename
-			 * case below  - tausq@debian.org
-			 */
-			fname_out = optarg;
-			break;
-		case 0:
-			switch (which_long_opt) {
-				case LONG_HEADER: {
-					int arglen = strlen(optarg);
-					if(extra_headers_left - arglen - 2 <= 0)
-						error_msg_and_die("extra_headers buffer too small(need %i)", extra_headers_left - arglen);
-					strcpy(extra_headers_ptr, optarg);
-					extra_headers_ptr += arglen;
-					extra_headers_left -= ( arglen + 2 );
-					*extra_headers_ptr++ = '\r';
-					*extra_headers_ptr++ = '\n';
-					*(extra_headers_ptr + 1) = 0;
-					break;
-				}
-			}
-			break;
-		default:
-			show_usage();
-		}
-	}
-
-	if (argc - optind != 1)
-			show_usage();
-
-	parse_url(argv[optind], &target);
-	server.host = target.host;
-	server.port = target.port;
-
-	/*
-	 * Use the proxy if necessary.
-	 */
-	proxy = getenv(target.is_ftp ? "ftp_proxy" : "http_proxy");
-	if (proxy)
-		parse_url(xstrdup(proxy), &server);
-	
-	/* Guess an output filename */
-	if (!fname_out) {
-		fname_out = 
-#ifdef BB_FEATURE_WGET_STATUSBAR
-			curfile = 
-#endif
-			get_last_path_component(target.path);
-		if (fname_out==NULL || strlen(fname_out)<1) {
-			fname_out = 
-#ifdef BB_FEATURE_WGET_STATUSBAR
-				curfile = 
-#endif
-				"index.html";
-		}
-		if (dir_prefix != NULL)
-			fname_out = concat_path_file(dir_prefix, fname_out);
-#ifdef BB_FEATURE_WGET_STATUSBAR
-	} else {
-		curfile = get_last_path_component(fname_out);
-#endif
-	}
-	if (do_continue && !fname_out)
-		error_msg_and_die("cannot specify continue (-c) without a filename (-O)");
-
-
-	/*
-	 * Open the output file stream.
-	 */
-	if (strcmp(fname_out, "-") == 0) {
-		output = stdout;
-		quiet_flag = TRUE;
-	} else {
-		output = xfopen(fname_out, (do_continue ? "a" : "w"));
-	}
-
-	/*
-	 * Determine where to start transfer.
-	 */
-	if (do_continue) {
-		if (fstat(fileno(output), &sbuf) < 0)
-			perror_msg_and_die("fstat()");
-		if (sbuf.st_size > 0)
-			beg_range = sbuf.st_size;
-		else
-			do_continue = 0;
-	}
-
-	if (proxy || !target.is_ftp) {
-		/*
-		 *  HTTP session
-		 */
-		do {
-			if (! --try)
-				close_delete_and_die("too many redirections");
-
-			/*
-			 * Open socket to http server
-			 */
-			if (sfp) fclose(sfp);
-			sfp = open_socket(server.host, server.port);
-			
-			/*
-			 * Send HTTP request.
-			 */
-			if (proxy) {
-				fprintf(sfp, "GET %stp://%s:%d/%s HTTP/1.1\r\n",
-					target.is_ftp ? "f" : "ht", target.host,
-					target.port, target.path);
-			} else {
-				fprintf(sfp, "GET /%s HTTP/1.1\r\n", target.path);
-			}
-
-			fprintf(sfp, "Host: %s\r\nUser-Agent: Wget\r\n", target.host);
-
-#ifdef BB_FEATURE_WGET_AUTHENTICATION
-			if (target.user) {
-				fprintf(sfp, "Authorization: Basic %s\r\n",
-					base64enc(target.user, buf, sizeof(buf)));
-			}
-			if (proxy && server.user) {
-				fprintf(sfp, "Proxy-Authorization: Basic %s\r\n",
-					base64enc(server.user, buf, sizeof(buf)));
-			}
-#endif
-
-			if (do_continue)
-				fprintf(sfp, "Range: bytes=%ld-\r\n", beg_range);
-			if(extra_headers_left < sizeof(extra_headers))
-				fputs(extra_headers,sfp);
-			fprintf(sfp,"Connection: close\r\n\r\n");
-
-			/*
-		 	* Retrieve HTTP response line and check for "200" status code.
-		 	*/
-read_response:		if (fgets(buf, sizeof(buf), sfp) == NULL)
-				close_delete_and_die("no response from server");
-				
-			for (s = buf ; *s != '\0' && !isspace(*s) ; ++s)
-			;
-			for ( ; isspace(*s) ; ++s)
-			;
-			switch (status = atoi(s)) {
-				case 0:
-				case 100:
-					while (gethdr(buf, sizeof(buf), sfp, &n) != NULL);
-					goto read_response;
-				case 200:
-					if (do_continue && output != stdout)
-						output = freopen(fname_out, "w", output);
-					do_continue = 0;
-					break;
-				case 300:	/* redirection */
-				case 301:
-				case 302:
-				case 303:
-					break;
-				case 206:
-					if (do_continue)
-						break;
-					/*FALLTHRU*/
-				default:
-					chomp(buf);
-					close_delete_and_die("server returned error %d: %s", atoi(s), buf);
-			}
-		
-			/*
-			 * Retrieve HTTP headers.
-			 */
-			while ((s = gethdr(buf, sizeof(buf), sfp, &n)) != NULL) {
-				if (strcasecmp(buf, "content-length") == 0) {
-					filesize = atol(s);
-					got_clen = 1;
-					continue;
-				}
-				if (strcasecmp(buf, "transfer-encoding") == 0) {
-					if (strcasecmp(s, "chunked") == 0) {
-						chunked = got_clen = 1;
-					} else {
-					close_delete_and_die("server wants to do %s transfer encoding", s);
-					}
-				}
-				if (strcasecmp(buf, "location") == 0) {
-					if (s[0] == '/')
-						target.path = xstrdup(s+1);
-					else {
-						parse_url(xstrdup(s), &target);
-						if (!proxy) {
-							server.host = target.host;
-							server.port = target.port;
-						}
-					}
-				}
-			}
-		} while(status >= 300);
-		
-		dfp = sfp;
-	}
-	else
-	{
-		/*
-		 *  FTP session
-		 */
-		if (! target.user)
-			target.user = xstrdup("anonymous:busybox@");
-
-		sfp = open_socket(server.host, server.port);
-		if (ftpcmd(NULL, NULL, sfp, buf) != 220)
-			close_delete_and_die("%s", buf+4);
-
-		/* 
-		 * Splitting username:password pair,
-		 * trying to log in
-		 */
-		s = strchr(target.user, ':');
-		if (s)
-			*(s++) = '\0';
-		switch(ftpcmd("USER ", target.user, sfp, buf)) {
-			case 230:
-				break;
-			case 331:
-				if (ftpcmd("PASS ", s, sfp, buf) == 230)
-					break;
-				/* FALLTHRU (failed login) */
-			default:
-				close_delete_and_die("ftp login: %s", buf+4);
-		}
-		
-		ftpcmd("CDUP", NULL, sfp, buf);
-		ftpcmd("TYPE I", NULL, sfp, buf);
-		
-		/*
-		 * Querying file size
-		 */
-		if (ftpcmd("SIZE /", target.path, sfp, buf) == 213) {
-			filesize = atol(buf+4);
-			got_clen = 1;
-		}
-		
-		/*
-		 * Entering passive mode
-		 */
-		if (ftpcmd("PASV", NULL, sfp, buf) !=  227)
-			close_delete_and_die("PASV: %s", buf+4);
-		s = strrchr(buf, ',');
-		*s = 0;
-		port = atoi(s+1);
-		s = strrchr(buf, ',');
-		port += atoi(s+1) * 256;
-		dfp = open_socket(server.host, port);
-
-		if (do_continue) {
-			sprintf(buf, "REST %ld", beg_range);
-			if (ftpcmd(buf, NULL, sfp, buf) != 350) {
-				if (output != stdout)
-					output = freopen(fname_out, "w", output);
-				do_continue = 0;
-			} else
-				filesize -= beg_range;
-		}
-		
-		if (ftpcmd("RETR /", target.path, sfp, buf) > 150)
-			close_delete_and_die("RETR: %s", buf+4);
-
-	}
-
-
-	/*
-	 * Retrieve file
-	 */
-	if (chunked) {
-		fgets(buf, sizeof(buf), dfp);
-		filesize = strtol(buf, (char **) NULL, 16);
-	}
-#ifdef BB_FEATURE_WGET_STATUSBAR
-	if (quiet_flag==FALSE)
-		progressmeter(-1);
-#endif
-	do {
-		while ((filesize > 0 || !got_clen) && (n = safe_fread(buf, 1, chunked ? (filesize > sizeof(buf) ? sizeof(buf) : filesize) : sizeof(buf), dfp)) > 0) {
-		safe_fwrite(buf, 1, n, output);
-#ifdef BB_FEATURE_WGET_STATUSBAR
-		statbytes+=n;
-#endif
-		if (got_clen)
-			filesize -= n;
-	}
-
-		if (chunked) {
-			safe_fgets(buf, sizeof(buf), dfp); /* This is a newline */
-			safe_fgets(buf, sizeof(buf), dfp);
-			filesize = strtol(buf, (char **) NULL, 16);
-			if (filesize==0) chunked = 0; /* all done! */
-		}
-
-	if (n == 0 && ferror(dfp))
-		perror_msg_and_die("network read error");
-	} while (chunked);
-#ifdef BB_FEATURE_WGET_STATUSBAR
-	if (quiet_flag==FALSE)
-		progressmeter(1);
-#endif
-	if (!proxy && target.is_ftp) {
-		fclose(dfp);
-		if (ftpcmd(NULL, NULL, sfp, buf) != 226)
-			error_msg_and_die("ftp error: %s", buf+4);
-		ftpcmd("QUIT", NULL, sfp, buf);
-	}
-	exit(EXIT_SUCCESS);
-}
-
-
-void parse_url(char *url, struct host_info *h)
-{
-	char *cp, *sp, *up;
-
-	if (strncmp(url, "http://", 7) == 0) {
-		h->port = 80;
-		h->host = url + 7;
-		h->is_ftp = 0;
-	} else if (strncmp(url, "ftp://", 6) == 0) {
-		h->port = 21;
-		h->host = url + 6;
-		h->is_ftp = 1;
-	} else
-		error_msg_and_die("not an http or ftp url: %s", url);
-
-	sp = strchr(h->host, '/');
-	if (sp != NULL) {
-		*sp++ = '\0';
-		h->path = sp;
-	} else
-		h->path = "";
-
-	up = strrchr(h->host, '@');
-	if (up != NULL) {
-		h->user = h->host;
-		*up++ = '\0';
-		h->host = up;
-	} else
-		h->user = NULL;
-
-	cp = strchr(h->host, ':');
-	if (cp != NULL) {
-		*cp++ = '\0';
-		h->port = atoi(cp);
-	}
-
-}
-
-
-FILE *open_socket(char *host, int port)
-{
-	struct sockaddr_in s_in;
-	struct hostent *hp;
-	int fd;
-	FILE *fp;
-
-	memset(&s_in, 0, sizeof(s_in));
-	s_in.sin_family = AF_INET;
-	hp = xgethostbyname(host);
-	memcpy(&s_in.sin_addr, hp->h_addr_list[0], hp->h_length);
-	s_in.sin_port = htons(port);
-
-	/*
-	 * Get the server onto a stdio stream.
-	 */
-	if ((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
-		perror_msg_and_die("socket()");
-	if (connect(fd, (struct sockaddr *) &s_in, sizeof(s_in)) < 0)
-		perror_msg_and_die("connect(%s)", host);
-	if ((fp = fdopen(fd, "r+")) == NULL)
-		perror_msg_and_die("fdopen()");
-
-	return fp;
-}
-
-
-char *gethdr(char *buf, size_t bufsiz, FILE *fp, int *istrunc)
-{
-	char *s, *hdrval;
-	int c;
-
-	*istrunc = 0;
-
-	/* retrieve header line */
-	if (fgets(buf, bufsiz, fp) == NULL)
-		return NULL;
-
-	/* see if we are at the end of the headers */
-	for (s = buf ; *s == '\r' ; ++s)
-		;
-	if (s[0] == '\n')
-		return NULL;
-
-	/* convert the header name to lower case */
-	for (s = buf ; isalnum(*s) || *s == '-' ; ++s)
-		*s = tolower(*s);
-
-	/* verify we are at the end of the header name */
-	if (*s != ':')
-		error_msg_and_die("bad header line: %s", buf);
-
-	/* locate the start of the header value */
-	for (*s++ = '\0' ; *s == ' ' || *s == '\t' ; ++s)
-		;
-	hdrval = s;
-
-	/* locate the end of header */
-	while (*s != '\0' && *s != '\r' && *s != '\n')
-		++s;
-
-	/* end of header found */
-	if (*s != '\0') {
-		*s = '\0';
-		return hdrval;
-	}
-
-	/* Rats!  The buffer isn't big enough to hold the entire header value. */
-	while (c = getc(fp), c != EOF && c != '\n')
-		;
-	*istrunc = 1;
-	return hdrval;
-}
-
-static int ftpcmd(char *s1, char *s2, FILE *fp, char *buf)
-{
-	char *p;
-	
-	if (s1) {
-		if (!s2) s2="";
-		fprintf(fp, "%s%s\n", s1, s2);
-		fflush(fp);
-	}
-	
-	do {
-		p = fgets(buf, 510, fp);
-		if (!p)
-			perror_msg_and_die("fgets()");
-	} while (! isdigit(buf[0]) || buf[3] != ' ');
-	
-	return atoi(buf);
-}
-
-#ifdef BB_FEATURE_WGET_STATUSBAR
-/* Stuff below is from BSD rcp util.c, as added to openshh. 
- * Original copyright notice is retained at the end of this file.
- * 
- */ 
-
-
-static int
-getttywidth(void)
-{
-	struct winsize winsize;
-
-	if (ioctl(fileno(stdout), TIOCGWINSZ, &winsize) != -1)
-		return (winsize.ws_col ? winsize.ws_col : 80);
-	else
-		return (80);
-}
-
-static void
-updateprogressmeter(int ignore)
-{
-	int save_errno = errno;
-
-	progressmeter(0);
-	errno = save_errno;
-}
-
-static void
-alarmtimer(int wait)
-{
-	struct itimerval itv;
-
-	itv.it_value.tv_sec = wait;
-	itv.it_value.tv_usec = 0;
-	itv.it_interval = itv.it_value;
-	setitimer(ITIMER_REAL, &itv, NULL);
-}
-
-
-static void
-progressmeter(int flag)
-{
-	static const char prefixes[] = " KMGTP";
-	static struct timeval lastupdate;
-	static off_t lastsize, totalsize;
-	struct timeval now, td, wait;
-	off_t cursize, abbrevsize;
-	double elapsed;
-	int ratio, barlength, i, remaining;
-	char buf[256];
-
-	if (flag == -1) {
-		(void) gettimeofday(&start, (struct timezone *) 0);
-		lastupdate = start;
-		lastsize = 0;
-		totalsize = filesize; /* as filesize changes.. */
-	}
-
-	(void) gettimeofday(&now, (struct timezone *) 0);
-	cursize = statbytes;
-	if (totalsize != 0 && !chunked) {
-		ratio = 100.0 * cursize / totalsize;
-		ratio = MAX(ratio, 0);
-		ratio = MIN(ratio, 100);
-	} else
-		ratio = 100;
-
-	snprintf(buf, sizeof(buf), "\r%-20.20s %3d%% ", curfile, ratio);
-
-	barlength = getttywidth() - 51;
-	if (barlength > 0) {
-		i = barlength * ratio / 100;
-		snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
-			 "|%.*s%*s|", i,
-			 "*****************************************************************************"
-			 "*****************************************************************************",
-			 barlength - i, "");
-	}
-	i = 0;
-	abbrevsize = cursize;
-	while (abbrevsize >= 100000 && i < sizeof(prefixes)) {
-		i++;
-		abbrevsize >>= 10;
-	}
-	snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %5d %c%c ",
-	     (int) abbrevsize, prefixes[i], prefixes[i] == ' ' ? ' ' :
-		 'B');
-
-	timersub(&now, &lastupdate, &wait);
-	if (cursize > lastsize) {
-		lastupdate = now;
-		lastsize = cursize;
-		if (wait.tv_sec >= STALLTIME) {
-			start.tv_sec += wait.tv_sec;
-			start.tv_usec += wait.tv_usec;
-		}
-		wait.tv_sec = 0;
-	}
-	timersub(&now, &start, &td);
-	elapsed = td.tv_sec + (td.tv_usec / 1000000.0);
-
-	if (wait.tv_sec >= STALLTIME) {
-		snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
-			 " - stalled -");
-	} else if (statbytes <= 0 || elapsed <= 0.0 || cursize > totalsize || chunked) {
-		snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
-			 "   --:-- ETA");
-	} else {
-		remaining = (int) (totalsize / (statbytes / elapsed) - elapsed);
-		i = remaining / 3600;
-		if (i)
-			snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
-				 "%2d:", i);
-		else
-			snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
-				 "   ");
-		i = remaining % 3600;
-		snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
-			 "%02d:%02d ETA", i / 60, i % 60);
-	}
-	write(fileno(stderr), buf, strlen(buf));
-
-	if (flag == -1) {
-		struct sigaction sa;
-		sa.sa_handler = updateprogressmeter;
-		sigemptyset(&sa.sa_mask);
-		sa.sa_flags = SA_RESTART;
-		sigaction(SIGALRM, &sa, NULL);
-		alarmtimer(1);
-	} else if (flag == 1) {
-		alarmtimer(0);
-		statbytes = 0;
-		putc('\n', stderr);
-	}
-}
-#endif
-
-/* Original copyright notice which applies to the BB_FEATURE_WGET_STATUSBAR stuff,
- * much of which was blatently stolen from openssh.  */
- 
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * 3. <BSD Advertising Clause omitted per the July 22, 1999 licensing change 
- *		ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change> 
- *
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	$Id: wget.c,v 1.45 2001/07/19 22:28:01 andersen Exp $
- */
-
-
-
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/
-
-
-