diff options
| author | Peter Stephenson <p.w.stephenson@ntlworld.com> | 2015-10-24 20:48:47 +0100 |
|---|---|---|
| committer | Peter Stephenson <p.w.stephenson@ntlworld.com> | 2015-10-24 20:48:47 +0100 |
| commit | 15490398d7553605c422d8ab0e59e69e25111df4 (patch) | |
| tree | 3a98fd7979403ee3b5b7c39b437eff0f8dcc0a1d /Src/Modules/socket.c | |
| parent | 1f6dcf9bcdade41886e36826196e79502a9afa26 (diff) | |
| download | zsh-15490398d7553605c422d8ab0e59e69e25111df4.tar.gz zsh-15490398d7553605c422d8ab0e59e69e25111df4.zip | |
36944: extend fd management to zsocket
Diffstat (limited to 'Src/Modules/socket.c')
| -rw-r--r-- | Src/Modules/socket.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/Src/Modules/socket.c b/Src/Modules/socket.c index 65b87d7dd..f683496df 100644 --- a/Src/Modules/socket.c +++ b/Src/Modules/socket.c @@ -115,6 +115,8 @@ bin_zsocket(char *nam, char **args, Options ops, UNUSED(int func)) return 1; } + addmodulefd(sfd, FDT_EXTERNAL); + if (targetfd) { sfd = redup(sfd, targetfd); } @@ -127,6 +129,9 @@ bin_zsocket(char *nam, char **args, Options ops, UNUSED(int func)) return 1; } + /* allow to be closed explicitly */ + fdtable[sfd] = FDT_EXTERNAL; + setiparam("REPLY", sfd); if (verbose) @@ -200,12 +205,16 @@ bin_zsocket(char *nam, char **args, Options ops, UNUSED(int func)) return 1; } + addmodulefd(rfd, FDT_EXTERNAL); + if (targetfd) { sfd = redup(rfd, targetfd); if (sfd < 0) { zerrnam(nam, "could not duplicate socket fd to %d: %e", targetfd, errno); + zclose(rfd); return 1; } + fdtable[sfd] = FDT_EXTERNAL; } else { sfd = rfd; @@ -240,12 +249,16 @@ bin_zsocket(char *nam, char **args, Options ops, UNUSED(int func)) } else { + addmodulefd(sfd, FDT_EXTERNAL); + if (targetfd) { - sfd = redup(sfd, targetfd); - if (sfd < 0) { + if (redup(sfd, targetfd) < 0) { zerrnam(nam, "could not duplicate socket fd to %d: %e", targetfd, errno); + zclose(sfd); return 1; } + sfd = targetfd; + fdtable[sfd] = FDT_EXTERNAL; } setiparam("REPLY", sfd); |