diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2002-05-29 13:15:35 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2002-05-29 13:15:35 +0000 |
| commit | 7898d5b1989c88e67f349ecfc088d86429932979 (patch) | |
| tree | e51a606ed576c8db2df4ea0602a2df348758aa63 | |
| parent | d8d9181861b4c09d8e7350b5056ad54cb253ac8d (diff) | |
| download | zsh-7898d5b1989c88e67f349ecfc088d86429932979.tar.gz zsh-7898d5b1989c88e67f349ecfc088d86429932979.tar.xz zsh-7898d5b1989c88e67f349ecfc088d86429932979.zip | |
17249: fix user output from ztcp
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/Modules/tcp.c | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index d88acf088..ed1718f39 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-05-29 Peter Stephenson <pws@csr.com> + + * 17249: Src/Modules/tcp.c: send output from `ztcp' or `ztcp -v' + to stdout, not the zle file descriptor. + 2002-05-28 Oliver Kiddle <opk@zsh.org> * 17245: Completion/Unix/Command/_texinfo: add handling for diff --git a/Src/Modules/tcp.c b/Src/Modules/tcp.c index 27d11aea6..a6af6ed8d 100644 --- a/Src/Modules/tcp.c +++ b/Src/Modules/tcp.c @@ -461,7 +461,7 @@ bin_ztcp(char *nam, char **args, char *ops, int func) setiparam("REPLY", sess->fd); if (verbose) - fprintf(shout, "%d listener is on fd %d\n", ntohs(sess->sock.in.sin_port), sess->fd); + printf("%d listener is on fd %d\n", ntohs(sess->sock.in.sin_port), sess->fd); return 0; @@ -553,7 +553,7 @@ bin_ztcp(char *nam, char **args, char *ops, int func) setiparam("REPLY", sess->fd); if (verbose) - fprintf(shout, "%d is on fd %d\n", ntohs(sess->peer.in.sin_port), sess->fd); + printf("%d is on fd %d\n", ntohs(sess->peer.in.sin_port), sess->fd); } else { @@ -575,7 +575,7 @@ bin_ztcp(char *nam, char **args, char *ops, int func) remotename = ztpeer->h_name; else remotename = ztrdup(inet_ntoa(sess->peer.in.sin_addr)); - fprintf(shout, "%s:%d %s %s:%d is on fd %d%s\n", + printf("%s:%d %s %s:%d is on fd %d%s\n", localname, ntohs(sess->sock.in.sin_port), ((sess->flags & ZTCP_LISTEN) ? "-<" : ((sess->flags & ZTCP_INBOUND) ? "<-" : "->")), @@ -649,7 +649,7 @@ bin_ztcp(char *nam, char **args, char *ops, int func) setiparam("REPLY", sess->fd); if (verbose) - fprintf(shout, "%s:%d is now on fd %d\n", + printf("%s:%d is now on fd %d\n", desthost, destport, sess->fd); } |