mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-10-29 05:21:00 +01:00
Code Releases Activity

15780: rename **arg to **dargs

Browse source
This commit is contained in:
Clint Adams 2001-09-10 19:19:15 +00:00
parent 2e174804c8
commit ab205e5bb9
2 changed files with 22 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

38
Src/Modules/tcp.c
View file

@ -386,7 +386,7 @@ static int
bin_ztcp(char *nam, char **args, char *ops, int func)
{
int herrno, err=1, destport, force=0, verbose=0, test=0, targetfd=0, len;
char **addrp, *desthost, *localname, *remotename, **arg = args;
char **addrp, *desthost, *localname, *remotename, **dargs;
struct hostent *zthost = NULL, *ztpeer = NULL;
struct servent *srv;
Tcp_session sess = NULL;
@ -401,25 +401,27 @@ bin_ztcp(char *nam, char **args, char *ops, int func)
test = 1;
if (ops['d']) {
targetfd = atoi(arg[0]);
arg++;
targetfd = atoi(args[0]);
dargs = args + 1;
if (!targetfd) {
zwarnnam(nam, "%s is an invalid argument to -d", args[0], 0);
return 1;
}
}
else
dargs = args;
if (ops['c']) {
if (!arg[0]) {
if (!dargs[0]) {
tcp_cleanup();
}
else {
targetfd = atoi(arg[0]);
targetfd = atoi(dargs[0]);
sess = zts_byfd(targetfd);
if(!targetfd) {
zwarnnam(nam, "%s is an invalid argument to -c", arg[0], 0);
zwarnnam(nam, "%s is an invalid argument to -c", dargs[0], 0);
return 1;
}
@ -435,7 +437,7 @@ bin_ztcp(char *nam, char **args, char *ops, int func)
}
else
{
zwarnnam(nam, "fd %s not found in tcp table", arg[0], 0);
zwarnnam(nam, "fd %s not found in tcp table", dargs[0], 0);
return 1;
}
}
@ -443,16 +445,16 @@ bin_ztcp(char *nam, char **args, char *ops, int func)
else if (ops['l']) {
int lport = 0;
if (!arg[0]) {
if (!dargs[0]) {
zwarnnam(nam, "-l requires an argument", NULL, 0);
return 1;
}
srv = getservbyname(arg[0], "tcp");
srv = getservbyname(dargs[0], "tcp");
if (srv)
lport = srv->s_port;
else
lport = htons(atoi(arg[0]));
lport = htons(atoi(dargs[0]));
if (!lport) { zwarnnam(nam, "bad service name or port number", NULL, 0);
return 1;
}
@ -511,12 +513,12 @@ bin_ztcp(char *nam, char **args, char *ops, int func)
{
int lfd, rfd;
if (!arg[0]) {
if (!dargs[0]) {
zwarnnam(nam, "-a requires an argument", NULL, 0);
return 1;
}
lfd = atoi(arg[0]);
lfd = atoi(dargs[0]);
if (!lfd) {
zwarnnam(nam, "invalid numerical argument", NULL, 0);
@ -525,7 +527,7 @@ bin_ztcp(char *nam, char **args, char *ops, int func)
sess = zts_byfd(lfd);
if (!sess) {
zwarnnam(nam, "fd %s is not registered as a tcp connection", arg[0], 0);
zwarnnam(nam, "fd %s is not registered as a tcp connection", dargs[0], 0);
return 1;
}
@ -575,7 +577,7 @@ bin_ztcp(char *nam, char **args, char *ops, int func)
else
{
if (!arg[0]) {
if (!dargs[0]) {
for(sess = zts_head(); sess != NULL; sess = zts_next(sess))
{
if (sess->fd != -1)
@ -595,19 +597,19 @@ bin_ztcp(char *nam, char **args, char *ops, int func)
}
return 0;
}
else if (!arg[1]) {
else if (!dargs[1]) {
destport = htons(23);
}
else {
srv = getservbyname(arg[1],"tcp");
srv = getservbyname(dargs[1],"tcp");
if (srv)
destport = srv->s_port;
else
destport = htons(atoi(arg[1]));
destport = htons(atoi(dargs[1]));
}
desthost = ztrdup(arg[0]);
desthost = ztrdup(dargs[0]);
zthost = zsh_getipnodebyname(desthost, AF_INET, 0, &herrno);
if (!zthost || errflag) {