Re: [9front] [PATCH] Update hpost to use -r header like hget

[Julien Blanchard <julien@typed-hole.org>]

On 17/12/2020 11:30, Alex Musolino wrote:
>>    fn usage {
>> -	echo 'usage: hpost [ -l ] [ -[gpm] action ] [ -u ] url [ field:value |
>> field@file ... ]' >[1=2]
>> +	echo 'usage: hpost [ -l ] [ -[gpm] action ] [ -r ] headers [ -u ] url
>> [ field:value | field@file ... ]' >[1=2]
>>    	exit usage
>>    }
> 
> I think this bit should be:
> 
>    fn usage {
> -	echo 'usage: hpost [ -l ] [ -[gpm] action ] [ -u ] url [ field:value |
> field@file ... ]' >[1=2]
> +	echo 'usage: hpost [ -l ] [ -[gpm] action ] [ -r header ] [ -u ] url
> [ field:value | field@file ... ]' >[1=2]
>    	exit usage
>    }
> 
> This matches the man page and the usage string from hget(1).  Also, it
> wouldn't hurt to amend the man page to mention that the -r option can
> be repeated.
> 

Good idea, here's the updated diff:


diff -r ac35c963f8e2 rc/bin/hpost
--- a/rc/bin/hpost	Sun Dec 13 20:23:03 2020 +0100
+++ b/rc/bin/hpost	Thu Dec 17 11:21:32 2020 +0000
@@ -1,12 +1,15 @@
  #!/bin/rc
  rfork e
  url=()
+headers=()
+action=()
+method=()
  at=()	# text fields
  af=()	# file fields
  l=()

  fn usage {
-	echo 'usage: hpost [ -l ] [ -[gpm] action ] [ -u ] url [ field:value | 
field@file ... ]' >[1=2]
+	echo 'usage: hpost [ -l ] [ -[gpm] action ] [ -r ] header [ -u ] url [ 
field:value | field@file ... ]' >[1=2]
  	exit usage
  }

@@ -14,6 +17,7 @@
  	switch($1){
  	case -l;	l=($l $1)
  	case -u;	shift; url=$1
+	case -r;	shift; headers=($headers -r $1)
  	case -g;	shift; action=$1; method=mget
  	case -p;	shift; action=$1; method=mpost
  	case -m;	shift; action=$1; method=multi
@@ -94,8 +98,9 @@
  	menc $"f | $hget -r 'Content-Type: multipart/form-data; boundary='$"f 
-b $url -P $action
  }

+
  if(! ~ $action ''){
-	hget=(hget $l)
+	hget=(hget $headers $l)
  	$method
  	exit
  }
diff -r ac35c963f8e2 sys/man/1/hget
--- a/sys/man/1/hget	Sun Dec 13 20:23:03 2020 +0100
+++ b/sys/man/1/hget	Thu Dec 17 11:21:32 2020 +0000
@@ -38,6 +38,9 @@
  .B -m
  .I action
  ] [
+.B -r
+.I header
+] [
  .B -u
  ]
  .I url
@@ -119,6 +122,9 @@
  .B -r
  sends an arbitrary HTTP
  .IR header .
+The
+.B -r
+flag can be repeated to send multiple headers.
  .PP
  Option
  .B -m