about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMikael Magnusson <mikachu@gmail.com>2015-10-03 00:04:09 +0200
committerMikael Magnusson <mikachu@gmail.com>2015-10-03 00:05:40 +0200
commit64061e504fe9145c34911622a9fec6ec43869cea (patch)
tree3e4787e1e59db4ca4233e81050ac279f9d4560aa
parent0626be9e3c02ca9171cd4e0975c208e0c3d6ec2b (diff)
downloadzsh-64061e504fe9145c34911622a9fec6ec43869cea.tar.gz
zsh-64061e504fe9145c34911622a9fec6ec43869cea.tar.xz
zsh-64061e504fe9145c34911622a9fec6ec43869cea.zip
36754: Functions/TCP: Tweak some usage output in the tcp_* functions
-rw-r--r--ChangeLog6
-rw-r--r--Functions/TCP/tcp_open2
-rw-r--r--Functions/TCP/tcp_read2
-rw-r--r--Functions/TCP/tcp_send2
-rw-r--r--Functions/TCP/tcp_shoot4
5 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 87a2ce490..1061d1d94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-10-03  Mikael Magnusson  <mikachu@gmail.com>
+
+	* 36754: Functions/TCP/tcp_open, Functions/TCP/tcp_read,
+	Functions/TCP/tcp_send, Functions/TCP/tcp_shoot: Tweak some
+	usage output in the tcp_* functions
+
 2015-10-02  Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>
 
 	* 36732: Completion/Unix/Command/_zsh: support -s and -b,
diff --git a/Functions/TCP/tcp_open b/Functions/TCP/tcp_open
index 091217788..a04403c76 100644
--- a/Functions/TCP/tcp_open
+++ b/Functions/TCP/tcp_open
@@ -152,7 +152,7 @@ fi
 
 if (( $# )); then
   print "Usage: $0 [-z] [-a fd | -f fd | host port [ session ] ]
-  $0 [-z] [ -s session | -l sesslist ] ..." >&2
+       $0 [-z] [ -s session | -l sesslist ] ..." >&2
   return 1
 fi
 
diff --git a/Functions/TCP/tcp_read b/Functions/TCP/tcp_read
index f880395dd..ba9185ed5 100644
--- a/Functions/TCP/tcp_read
+++ b/Functions/TCP/tcp_read
@@ -116,7 +116,7 @@ while getopts "abdl:qs:t:T:u:" opt; do
 	  read_fds[$((read_fd))]=1
 	done
 	;;
-    (*) [[ $opt != \? ]] && print Unhandled option, complain: $opt >&2
+    (*) [[ $opt != \? ]] && print "Unhandled option, complain: $opt" >&2
 	return 1
        ;;
   esac
diff --git a/Functions/TCP/tcp_send b/Functions/TCP/tcp_send
index c976a2fb7..86dda6403 100644
--- a/Functions/TCP/tcp_send
+++ b/Functions/TCP/tcp_send
@@ -29,7 +29,7 @@ while getopts "acl:nqs:" opt; do
 	    fi
 	    sessions+=($OPTARG)
 	    ;;
-	(*) [[ $opt != '?' ]] && print Unhandled option, complain: $opt >&2
+	(*) [[ $opt != '?' ]] && print "Unhandled option, complain: $opt" >&2
             return 1
 	    ;;
     esac
diff --git a/Functions/TCP/tcp_shoot b/Functions/TCP/tcp_shoot
index 8ff9866ba..c485c140a 100644
--- a/Functions/TCP/tcp_shoot
+++ b/Functions/TCP/tcp_shoot
@@ -4,8 +4,8 @@ setopt extendedglob
 local REPLY tfd
 
 if [[ $# -ne 2 ]]; then
-    print "Usage: tcp_dump host port
-Connect to the given host and port; send standard input.">&2
+    print "Usage: $0 host port
+Connect to the given host and port; send standard input." >&2
     return 1
 fi