Index: trunk/minix/commands/urlget/Makefile
===================================================================
--- trunk/minix/commands/urlget/Makefile	(revision 9)
+++ 	(revision )
@@ -1,36 +1,0 @@
-# Makefile for urlget
-#
-# 07/02/96 Initial Release	Michael Temari, <temari@ix.netcom.com>
-#
-
-CFLAGS=	-D_MINIX $(OPT)
-LDFLAGS=-fnone
-BINDIR=	/usr/bin
-PROG=	urlget
-LINK1=	httpget
-LINK2=	ftpget
-CC=exec cc
-
-OBJS=	urlget.o net.o
-
-all:	$(PROG)
-
-$(PROG):	$(OBJS)
-	$(CC) $(LDFLAGS) -o $@ $(OBJS)
-	install -S 4kw $@
-
-clean:
-	rm -f $(PROG) $(OBJS)
-
-tar:
-	tar cvf urlget.tar Makefile urlget.c net.c net.h
-
-install:	$(BINDIR)/$(PROG) $(BINDIR)/$(LINK1) $(BINDIR)/$(LINK2)
-
-$(BINDIR)/$(PROG):	$(PROG)
-	install -c $? $@
-
-$(BINDIR)/$(LINK1) $(BINDIR)/$(LINK2):	$(BINDIR)/$(PROG)
-	install -l $? $@
-
-$(OBJS):	net.h
Index: trunk/minix/commands/urlget/build
===================================================================
--- trunk/minix/commands/urlget/build	(revision 9)
+++ 	(revision )
@@ -1,3 +1,0 @@
-#!/bin/sh
-make clean
-make && make install
Index: trunk/minix/commands/urlget/net.c
===================================================================
--- trunk/minix/commands/urlget/net.c	(revision 9)
+++ 	(revision )
@@ -1,98 +1,0 @@
-/* net.c Copyright 2000 by Michael Temari All Rights Reserved */
-/* 04/05/2000 Michael Temari <Michael@TemWare.Com> */
-
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/wait.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <unistd.h>
-#include <time.h>
-#include <net/netlib.h>
-#include <net/hton.h>
-#include <net/gen/in.h>
-#include <net/gen/inet.h>
-#include <net/gen/tcp.h>
-#include <net/gen/tcp_io.h>
-#include <net/gen/socket.h>
-#include <net/gen/netdb.h>
-
-#include "net.h"
-
-int connect(host, port)
-char *host;
-int port;
-{
-nwio_tcpconf_t tcpconf;
-nwio_tcpcl_t tcpcopt;
-char *tcp_device;
-int netfd;
-ipaddr_t nethost;
-tcpport_t netport;
-struct hostent *hp;
-struct servent *sp;
-char *p;
-int s;
-int tries;
-
-   if((hp = gethostbyname(host)) == (struct hostent *)NULL) {
-	fprintf(stderr, "Unknown host %s!\n", host);  
-	return(-1);
-   } else
-	memcpy((char *) &nethost, (char *) hp->h_addr, hp->h_length);
-
-   netport = htons(port);
-
-   /* Connect to the host */
-   if((tcp_device = getenv("TCP_DEVICE")) == NULL)
-	tcp_device = TCP_DEVICE;
-
-   if((netfd = open(tcp_device, O_RDWR)) < 0) {
-	perror("httpget: opening tcp");
-	return(-1);
-   }
-
-   tcpconf.nwtc_flags = NWTC_LP_SEL | NWTC_SET_RA | NWTC_SET_RP;
-   tcpconf.nwtc_remaddr = nethost;
-   tcpconf.nwtc_remport = netport;
-
-   s = ioctl(netfd, NWIOSTCPCONF, &tcpconf);
-   if(s < 0) {
-	perror("httpget: NWIOSTCPCONF");
-	close(netfd);
-	return(-1);
-   }
-
-   s = ioctl(netfd, NWIOGTCPCONF, &tcpconf);
-   if(s < 0) {
-	perror("httpget: NWIOGTCPCONF");
-	close(netfd);
-	return(-1);
-   }
-
-   tcpcopt.nwtcl_flags = 0;
-
-   tries = 0;
-   do {
-	s = ioctl(netfd, NWIOTCPCONN, &tcpcopt);
-	if(s == -1 && errno == EAGAIN) {
-		if(tries++ >= 10)
-			break;
-		sleep(10);
-	} else
-		break;
-   } while(1);
-
-   if(s < 0) {
-	perror("httpget: NWIOTCPCONN");
-	close(netfd);
-	return(-1);
-   }
-
-   return(netfd);
-}
Index: trunk/minix/commands/urlget/net.h
===================================================================
--- trunk/minix/commands/urlget/net.h	(revision 9)
+++ 	(revision )
@@ -1,4 +1,0 @@
-/* net.h Copyright 2000 by Michael Temari All Rights Reserved */
-/* 04/05/2000 Michael Temari <Michael@TemWare.Com> */
-
-_PROTOTYPE(int connect, (char *host, int port));
Index: trunk/minix/commands/urlget/urlget.c
===================================================================
--- trunk/minix/commands/urlget/urlget.c	(revision 9)
+++ 	(revision )
@@ -1,629 +1,0 @@
-/* urlget.c Copyright 2000 by Michael Temari All Rights Reserved */
-/* 04/05/2000 Michael Temari <Michael@TemWare.Com> */
-
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/wait.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <unistd.h>
-#include <time.h>
-
-#include "net.h"
-
-_PROTOTYPE(char *unesc, (char *s));
-_PROTOTYPE(void encode64, (char **pp, char *s));
-_PROTOTYPE(char *auth, (char *user, char *pass));
-_PROTOTYPE(int skipit, (char *buf, int len, int *skip));
-_PROTOTYPE(int httpget, (char *host, int port, char *user, char *pass, char *path, int headers, int discard, int post));
-_PROTOTYPE(void ftppasv, (char *reply));
-_PROTOTYPE(int ftpreply, (FILE *fpr));
-_PROTOTYPE(int ftpcmd, (FILE *fpw, FILE *fpr, char *cmd, char *arg));
-_PROTOTYPE(int ftpget, (char *host, int port, char *user, char *pass, char *path, int type));
-_PROTOTYPE(int tcpget, (char *host, int port, char *user, char *pass, char *path));
-_PROTOTYPE(int main, (int argc, char *argv[]));
-
-char ftpphost[15+1];
-unsigned int ftppport;
-
-#define	SCHEME_HTTP	1
-#define	SCHEME_FTP	2
-#define	SCHEME_TCP	3
-#define	SCHEME_NNTP	4
-
-char buffer[16000];
-
-#if 0
-_PROTOTYPE(int strncasecmp, (const char *s1, const char *s2, size_t len));
-int
-strncasecmp(s1, s2, len)
-const char *s1, *s2;
-size_t len;
-{
-        int c1, c2;
-        do {
-                if (len == 0)
-                        return 0;
-                len--;
-        } while (c1= toupper(*s1++), c2= toupper(*s2++), c1 == c2 && (c1 & c2))
-                ;
-        if (c1 & c2)
-                return c1 < c2 ? -1 : 1;
-        return c1 ? 1 : (c2 ? -1 : 0);
-}
-#endif
-
-char *unesc(s)
-char *s;
-{
-char *p;
-char *p2;
-unsigned char c;
-
-   p = s;
-   p2 = s;
-   while(*p) {
-   	if(*p != '%') {
-   		*p2++ = *p++;
-   		continue;
-   	}
-   	p++;
-   	if(*p == '%') {
-   		*p2++ = *p++;
-   		continue;
-   	}
-   	if(*p >= '0' && *p <= '9') c = *p++ - '0'; else
-   	if(*p >= 'a' && *p <= 'f') c = *p++ - 'a' + 10; else
-   	if(*p >= 'A' && *p <= 'F') c = *p++ - 'A' + 10; else
-   		break;
-   	if(*p >= '0' && *p <= '9') c = c << 4 | (*p++ - '0'); else
-   	if(*p >= 'a' && *p <= 'f') c = c << 4 | (*p++ - 'a') + 10; else
-   	if(*p >= 'A' && *p <= 'F') c = c << 4 | (*p++ - 'A') + 10; else
-   		break;
-   	*p2++ = c;
-   }
-   *p2 = '\0';
-   return(s);
-}
-
-void encode64(pp, s)
-char **pp;
-char *s;
-{
-char *p;
-char c[3];
-int i;
-int len;
-static char e64[64] = {
-	'A','B','C','D','E','F','G','H','I','J','K','L','M',
-	'N','O','P','Q','R','S','T','U','V','W','X','Y','Z',
-	'a','b','c','d','e','f','g','h','i','j','k','l','m',
-	'n','o','p','q','r','s','t','u','v','w','x','y','z',
-	'0','1','2','3','4','5','6','7','8','9','+','/' };
-
-   p = *pp;
-   len = strlen(s);
-   for(i=0; i < len; i += 3) {
-   	c[0] = *s++;
-   	c[1] = *s++;
-   	c[2] = *s++;
-   	*p++ = e64[  c[0] >> 2];
-   	*p++ = e64[((c[0] << 4) & 0x30) | ((c[1] >> 4) & 0x0f)];
-   	*p++ = e64[((c[1] << 2) & 0x3c) | ((c[2] >> 6) & 0x03)];
-   	*p++ = e64[  c[2]       & 0x3f];
-   }
-   if(i == len+1)
-   	p[-1] = '=';
-   else
-   if(i == len+2) {
-   	p[-1] = '=';
-   	p[-2] = '=';
-   }
-   *p = '\0';
-   *pp = p;
-   return;
-}
-
-char *auth(user, pass)
-char *user;
-char *pass;
-{
-static char a[128];
-char up[128];
-char *p;
-
-   strcpy(a, "BASIC ");
-   p = a + 6;
-   sprintf(up, "%s:%s", user, pass);
-   encode64(&p, up);
-
-   return(a);
-}
-
-int skipit(buf, len, skip)
-char *buf;
-int len;
-int *skip;
-{
-static int lf = 0;
-static int crlf = 0;
-char *p;
-
-   p = buf;
-
-   while(--len >= 0) {
-   	if((crlf == 0 || crlf == 2) && *p == '\r')
-   		crlf++;
-   	else
-   	if((crlf == 1 || crlf == 3) && *p == '\n')
-   		crlf++;
-   	else
-   		crlf = 0;
-   	if(*p == '\n')
-   		lf++;
-   	else
-   		lf = 0;
-   	if(crlf == 4 || lf == 2) {
-   		*skip = 0;
-   		return(len);
-   	}
-   	p++;
-   }
-
-   return(0);
-}
-
-int httpget(host, port, user, pass, path, headers, discard, post)
-char *host;
-int port;
-char *user;
-char *pass;
-char *path;
-int headers;
-int discard;
-int post;
-{
-int fd;
-int skip;
-int s;
-int s2;
-char *a;
-char *qs;
-int len;
-
-   if(port == 0)
-   	port = 80;
-
-   fd = connect(host, port);
-   if(fd < 0) {
-   	fprintf(stderr, "httpget: Could not connect to %s:%d\n", host, port);
-   	return(-1);
-   }
-
-   if(post) {
-   	qs = strrchr(path, '?');
-   	if(qs != (char *)NULL) {
-   		*qs++ = '\0';
-   		len = strlen(qs);
-   	} else
-   		len = 0;
-   }
-
-   if(post && len > 0)
-	write(fd, "POST ", 5);
-   else
-	write(fd, "GET ", 4);
-   write(fd, path, strlen(path));
-   write(fd, " HTTP/1.0\r\n", 11);
-   write(fd, "User-Agent: urlget\r\n", 20);
-   write(fd, "Connection: Close\r\n", 19);
-   if(*user) {
-   	write(fd, "Authorization: ", 15);
-   	a = auth(user, pass);
-   	write(fd, a, strlen(a));
-   	write(fd, "\r\n", 2);
-   }
-   if(post && len > 0) {
-   	sprintf(buffer, "Content-Length: %u\r\n", len);
-   	write(fd, buffer, strlen(buffer));
-   }
-   write(fd, "Host: ", 6);
-   write(fd, host, strlen(host));
-   write(fd, "\r\n", 2);
-   write(fd, "\r\n", 2);
-   if(post && len > 0)
-   	write(fd, qs, len);
-
-   skip = 1;
-   while((s = read(fd, buffer, sizeof(buffer)-1)) > 0) {
-	buffer[s] = '\0';
-   	if(skip) {
-   		static int firstline = 1;
-		if(firstline) {
-			static char linebuf[1000];
-			int l = 0;
-			int c, v1, v2, e;
-			if(s >= sizeof(linebuf)-l)
-				c = sizeof(linebuf)-1-l;
-			else	c = s;
-			memcpy(linebuf+l, buffer, c);
-			linebuf[l+c] = '\0';
-			if(strchr(buffer, '\n') || strchr(buffer, '\r'))
-				firstline = 0;
-			if(sscanf(linebuf, "HTTP/%d.%d %d ", &v1, &v2, &e) == 3
-				&& e != 200) {
-				fprintf(stderr, "HTTP error %d\n", e);
-				return -1;
-			}
-		}
-
-   		s2 = skipit(buffer, s, &skip);
-   		if(headers)
-   			write(1, buffer, s - s2);
-   	} else
-   		s2 = s;
-   	if(s2 && !discard)
-		if(write(1, &buffer[s - s2], s2) != s2) {
-			perror("write");
-			return(-1);
-		}
-   }
-   if(s < 0) {
-   	fprintf(stderr, "httpget: Read error\n");
-	return(-1);
-   }
-
-   close(fd);
-
-   return(0);
-}
-
-void ftppasv(reply)
-char *reply;
-{
-char *p;
-unsigned char n[6];
-int i;
-
-   ftppport = 0;
-
-   p = reply;
-   while(*p && *p != '(') p++;
-   if(!*p) return;
-   p++;
-   i = 0;
-   while(1) {
-   	n[i++] = atoi(p);
-   	if(i == 6) break;
-   	p = strchr(p, ',');
-   	if(p == (char *)NULL) return;
-   	p++;
-   }
-   sprintf(ftpphost, "%d.%d.%d.%d", n[0], n[1], n[2], n[3]);
-   ftppport = n[4] * 256 + n[5];
-   return;
-}
-
-int ftpreply(fpr)
-FILE *fpr;
-{
-static char reply[256];
-int s;
-char code[4];
-int ft;
-
-   do {
-   	ft = 1;
-   	do {
-   		if(fgets(reply, sizeof(reply), fpr) == (char *)NULL)
-   			return(-1);
-   		if(ft) {
-   			ft = 0;
-   			strncpy(code, reply, 3);
-   			code[3] = '\0';
-   		}
-   	} while(strncmp(reply, code, 3) || reply[3] == '-');
-   	s = atoi(code);
-   } while(s < 200 && s != 125 && s != 150);
-   if(s == 227) ftppasv(reply);
-   return(s);
-}
-
-int ftpcmd(fpw, fpr, cmd, arg)
-FILE *fpw;
-FILE *fpr;
-char *cmd;
-char *arg;
-{
-   fprintf(fpw, "%s%s%s\r\n", cmd, *arg ? " " : "", arg);
-   fflush(fpw);
-   return(ftpreply(fpr));
-}
-
-int ftpget(host, port, user, pass, path, type)
-char *host;
-int port;
-char *user;
-char *pass;
-char *path;
-int type;
-{
-int fd;
-int fd2;
-FILE *fpr;
-FILE *fpw;
-int s;
-int s2;
-char *p;
-char *p2;
-char typec[2];
-
-   if(port == 0)
-   	port = 21;
-
-   if(type == '\0')
-   	type = 'i';
-
-   fd = connect(host, port);
-   if(fd < 0) {
-   	fprintf(stderr, "ftpget: Could not connect to %s:%d\n", host, port);
-   	return(-1);
-   }
-   fpr = fdopen(fd, "r");
-   fpw = fdopen(fd, "w");
-
-   s = ftpreply(fpr);
-   if(s / 100 != 2) goto error;
-   s = ftpcmd(fpw, fpr, "USER", *user ? user : "ftp");
-   if(s / 100 == 3)
-   	s = ftpcmd(fpw, fpr, "PASS", *pass ? pass : "urlget@");
-
-   if(s / 100 != 2) goto error;
-
-   p = path;
-   if(*p == '/') p++;
-   while((p2 = strchr(p, '/')) != (char *)NULL) {
-   	*p2++ = '\0';
-   	s = ftpcmd(fpw, fpr, "CWD", unesc(p));
-   	p = p2;
-   }
-   sprintf(typec, "%c", type == 'd' ? 'A' : type);
-   s = ftpcmd(fpw, fpr, "TYPE", typec);
-   if(s / 100 != 2) goto error;
-   s = ftpcmd(fpw, fpr, "PASV", "");
-   if(s != 227) goto error;
-   fd2 = connect(ftpphost, ftppport);
-   if(fd2 < 0) goto error;
-   s = ftpcmd(fpw, fpr, type == 'd' ? "NLST" : "RETR", unesc(p));
-   if(s / 100 != 1) goto error;
-   while((s = read(fd2, buffer, sizeof(buffer))) > 0) {
-   	s2 = write(1, buffer, s);
-   	if(s2 != s) break;
-   }
-   if(s2 != s && s != 0) s = -1;
-   close(fd2);
-
-   s = ftpreply(fpr);
-   if(s / 100 == 2) s = 0;
-
-error:
-   (void) ftpcmd(fpw, fpr, "QUIT", "");
-
-   fclose(fpr);
-   fclose(fpw);
-   close(fd);
-
-   return(s == 0 ? 0 : -1);
-}
-
-int tcpget(host, port, user, pass, path)
-char *host;
-int port;
-char *user;
-char *pass;
-char *path;
-{
-int fd;
-int s;
-int s2;
-
-   if(port == 0) {
-   	fprintf(stderr, "tcpget: No port specified\n");
-   	return(-1);
-   }
-
-   fd = connect(host, port);
-   if(fd < 0) {
-   	fprintf(stderr, "httpget: Could not connect to %s:%d\n", host, port);
-   	return(-1);
-   }
-   if(*path == '\/')
-   	path++;
-
-   write(fd, path, strlen(path));
-   write(fd, "\n", 1);
-   while((s = read(fd, buffer, sizeof(buffer))) > 0) {
-   	s2 = write(1, buffer, s);
-   	if(s2 != s) break;
-   }
-   close(fd);
-   return(0);
-}
-
-int main(argc, argv)
-int argc;
-char *argv[];
-{
-char *prog;
-char *url;
-char scheme;
-char user[64];
-char pass[64];
-char host[64];
-int port;
-char *path;
-int type;
-char *ps;
-char *p;
-char *at;
-int s, c;
-int opt_h = 0;
-int opt_d = 0;
-int opt_p = 0;
-
-   prog = strrchr(*argv, '/');
-   if(prog == (char *)NULL)
-   	prog = *argv;
-   argv++;
-   argc--;
-
-   while(argc && argv[0][0] == '-') {
-   	char *opt = *argv++ + 1;
-   	argc--;
-
-	if (opt[0] == '-' && opt[1] == 0) break;
-
-   	while (*opt) switch (*opt++) {
-		case 'h':	opt_h = -1;	break;
-		case 'd':	opt_d = -1;	break;
-		case 'p':	opt_p = -1;	break;
-		default:	argc = 0;	break;
-	}
-   }
-
-   if(strcmp(prog, "ftpget") == 0) {
-   	if(argc < 2 || argc > 4) {
-   		fprintf(stderr, "Usage: %s host path [user [pass]]\n", prog);
-   		return(-1);
-   	}
-   	strncpy(host, *argv++, sizeof(host));
-   	port = 21;
-   	path = *argv++;
-   	if(argc) {
-   		strncpy(user, *argv++, sizeof(user));
-   		argc++;
-   	} else
-   		*user = '\0';
-   	if(argc) {
-   		strncpy(pass, *argv++, sizeof(pass));
-   		argc++;
-   	} else
-   		*pass = '\0';
-	s = ftpget(host, port, user, path, path, 'i');
-	return(s);
-   }
-   if(strcmp(prog, "httpget") == 0) {
-   	if(argc != 2) {
-   		fprintf(stderr, "Usage: %s [-h] [-d] [-p] host path\n", prog);
-   		return(-1);
-   	}
-   	strncpy(host, *argv++, sizeof(host));
-   	port = 80;
-   	path = *argv++;
-	s = httpget(host, port, user, path, path, opt_h, opt_d, opt_p);
-	return(s);
-   }
-
-   if(argc != 1) {
-   usage:
-   	fprintf(stderr, "Usage: %s [-h] [-p] url\n", prog);
-   	return(-1);
-   }
-
-   url = *argv++;
-   argc--;
-
-   if(strncasecmp(url, "http://", 7) == 0) {
-   	scheme = SCHEME_HTTP;
-   	ps = url + 7;
-   } else
-   if(strncasecmp(url, "ftp://", 6) == 0) {
-   	scheme = SCHEME_FTP;
-   	ps = url + 6;
-   } else 
-   if(strncasecmp(url, "tcp://", 6) == 0) {
-   	scheme = SCHEME_TCP;
-   	ps = url + 6;
-   } else {
-	fprintf(stderr, "%s: I do not handle this scheme\n", prog);
-	return(-1);
-   }
-
-   user[0] = '\0';
-   pass[0] = '\0';
-   host[0] = '\0';
-   port = 0;
-
-   p = ps;
-   while(*p && *p != '/') p++;
-   path = p;
-   c = *path;
-   *path = '\0';
-
-   at = strchr(ps, '@');
-   if(at != (char *)NULL) {
-   	*at = '\0';
-   	p = ps;
-   	while(*p && *p != ':') p++;
-   	if(*p)
-   		*p++ = '\0';
-	strcpy(user, ps);
-   	strcpy(pass, p);
-   	ps = at + 1;
-   }
-
-   *path = c;
-   p = ps;
-   while(*p && *p != '/' && *p != ':') p++;
-   strncpy(host, ps, p - ps);
-   host[p - ps] = '\0';
-   if(*p == ':') {
-   	p++;
-   	ps = p;
-   	while(*p && *p != '/')
-   		port = port * 10 + (*p++ - '0');
-   }
-   if(*p == '/')
-	path = p;
-   else
-   	path = "/";
-   if(scheme == SCHEME_FTP) {
-   	p = path;
-   	while(*p && *p != ';') p++;
-   	if(*p) {
-   		*p++ = '\0';
-   		if(strncasecmp(p, "type=", 5) == 0) {
-   			p += 5;
-   			type = tolower(*p);
-   		}
-   	}
-   }
-
-#if 0
-   fprintf(stderr, "Host: %s\n", host);
-   fprintf(stderr, "Port: %d\n", port);
-   fprintf(stderr, "User: %s\n", user);
-   fprintf(stderr, "Pass: %s\n", pass);
-   fprintf(stderr, "Path: %s\n", path);
-   fprintf(stderr, "Type: %c\n", type);
-#endif
-
-   switch(scheme) {
-   	case SCHEME_HTTP:
-		s = httpget(host, port, user, pass, path, opt_h, opt_d, opt_p);
-		break;
-	case SCHEME_FTP:
-		s = ftpget(host, port, user, pass, path, type);
-		break;
-	case SCHEME_TCP:
-		s = tcpget(host, port, user, pass, path);
-		break;
-   }
-
-   return(s);
-}