From e11835232448831f8bd4a27c4f8d8a7aa78383b5 Mon Sep 17 00:00:00 2001
From: cinap_lenrek <cinap_lenrek@felloff.net>
Date: Sun, 23 Mar 2014 18:47:59 +0100
Subject: [PATCH] hget: revert hget -v change, this needs more thought

problems that need to be addressed:

- reads in the whole /proc every second for no reason
- breaks when http server doesnt include Content-Length header
- length is wrong for continued download (-o option)
---
 rc/bin/hget    | 16 +---------------
 sys/man/1/hget | 23 -----------------------
 2 files changed, 1 insertion(+), 38 deletions(-)

diff --git a/rc/bin/hget b/rc/bin/hget
index fb7534403..82b9cba67 100755
--- a/rc/bin/hget
+++ b/rc/bin/hget
@@ -2,7 +2,7 @@
 rfork e
 argv0=$0
 fn usage {
-	echo usage: $argv0 '[ -v ] [ -l | -o file] [ -p body | -P ] [ -r header ] [ -m method ] [ -b baseurl ] url' >[1=2]
+	echo usage: $argv0 '[ -l | -o file] [ -p body | -P ] [ -r header ] [ -m method ] [ -b baseurl ] url' >[1=2]
 	exit usage
 }
 s=0
@@ -13,7 +13,6 @@ r=()
 m=()
 b=()
 l=()
-v=()
 while(~ $1 -*){
 	switch($1){
 	case -o
@@ -35,8 +34,6 @@ while(~ $1 -*){
 	case -b
 		b=$2
 		shift
-	case -v
-		v=1
 	case *
 		usage
 	}
@@ -74,17 +71,6 @@ if(! ~ $s 0)
 			echo `{cat $d/parsed/url}
 			exit
 		}
-		if(~ $#v 1){
-			hpid=$pid
-			@{
-				while(ls /proc | grep -s $hpid) {
-					have=`{grep '^  0' /proc/$hpid/fd | awk '{ print $9 }' }
-					want=`{cat $d/contentlength}
-					echo $have $want >[1=2]
-					sleep 1
-				}
-			} &
-		}
 		if(~ $#o 1){
 			l=`{cat $d/contentlength >[2]/dev/null}
 			x=`{awk 'BEGIN{FS=" |-"}/^bytes ([0-9]+)\-/{print $2}' \
diff --git a/sys/man/1/hget b/sys/man/1/hget
index 3afeaee3f..a8671369d 100644
--- a/sys/man/1/hget
+++ b/sys/man/1/hget
@@ -22,8 +22,6 @@ hget, hpost, webpaste, urlencode \- retrieve, post to a web page corresponding t
 ] [
 .B -b
 .I baseurl
-] [
-.B -v
 ]
 .I url
 .PP
@@ -126,15 +124,6 @@ Option
 .B -m
 overrides the HTTP method used for the request.
 .PP
-Option
-.B -v
-causes
-.I hget
-to emit download status on file descriptor 2,
-suitable for use with
-.I aux/statusbar .
-See EXAMPLES.
-.PP
 .I Hpost
 retrieves the web page specified by the URL
 .I url,
@@ -212,18 +201,6 @@ Download a file from the web.
 % hget http://9front.org/img/nix-on.jpg >/tmp/nix-on.jpg
 .EE
 .PP
-Use
-.I hget
-in conjuncton with
-.I aux/statusbar
-to monitor progress.
-.IP
-.EX
-hget -v -o 9front.iso.bz2 \\
-	http://www.r-36.net/9front/9front.iso.bz2 \\
-	|[2] aux/statusbar '9front.iso.bz2'
-.EE
-.PP
 Retrieve the commands needed to submit a form, which may then be
 edited and sent.
 .IP