From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 5560 invoked by alias); 30 Dec 2017 15:41:20 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: List-Unsubscribe: X-Seq: 42188 Received: (qmail 4419 invoked by uid 1010); 30 Dec 2017 15:41:20 -0000 X-Qmail-Scanner-Diagnostics: from aok120.rev.netart.pl by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.99.2/21882. spamassassin: 3.4.1. Clear:RC:0(85.128.245.120):SA:0(-1.9/5.0):. Processed in 11.658896 secs); 30 Dec 2017 15:41:20 -0000 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham autolearn_force=no version=3.4.1 X-Envelope-From: psprint@zdharma.org X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | X-Virus-Scanned: by amavisd-new using ClamAV (18) Date: Sat, 30 Dec 2017 16:32:34 +0100 From: Sebastian Gniazdowski To: zsh-workers@zsh.org Message-ID: Subject: [PATCH] zsystem flock: zclose descriptor after unsuccessful lock X-Mailer: Airmail (442) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="5a47b193_27703ec2_13d7" --5a47b193_27703ec2_13d7 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline Hello I have background scripts using zsystem flock. After a few hours OS X is out of descriptors. Turns out system.c doesn't close descriptor initially opened and passed to movefd(), when lock doesn't succeed. The patch adds preceding zclose(flock_fd) to all return 1 and return 2 code paths. Just to mention, I might still resolve the script issues by changing code to use subshell closed on unsuccessful lock, unsure yet. -- Sebastian Gniazdowski psprint /at/ zdharma.org --5a47b193_27703ec2_13d7 Content-Type: text/plain Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="=?utf-8?Q?zsystem=5Fzclose.diff.txt?=" ZGlmZiAtLWdpdCBhL1NyYy9Nb2R1bGVzL3N5c3RlbS5jIGIvU3JjL01vZHVsZXMvc3lzdGVtLmMK aW5kZXggM2VlY2Q3ZS4uOWZkNGQyNSAxMDA2NDQKLS0tIGEvU3JjL01vZHVsZXMvc3lzdGVtLmMK KysrIGIvU3JjL01vZHVsZXMvc3lzdGVtLmMKQEAgLTY0OSwyMiArNjQ5LDMwIEBAIGJpbl96c3lz dGVtX2Zsb2NrKGNoYXIgKm5hbSwgY2hhciAqKmFyZ3MsIFVOVVNFRChPcHRpb25zIG9wcyksIFVO VVNFRChpbnQgZnVuYykpCiAgICAgaWYgKHRpbWVvdXQgPiAwKSB7CiAJdGltZV90IGVuZCA9IHRp bWUoTlVMTCkgKyAodGltZV90KXRpbWVvdXQ7CiAJd2hpbGUgKGZjbnRsKGZsb2NrX2ZkLCBGX1NF VExLLCAmbGNrKSA8IDApIHsKLQkgICAgaWYgKGVycmZsYWcpCisJICAgIGlmIChlcnJmbGFnKSB7 CisgICAgICAgICAgICAgICAgemNsb3NlKGZsb2NrX2ZkKTsKIAkJcmV0dXJuIDE7CisgICAgICAg ICAgICB9CiAJICAgIGlmIChlcnJubyAhPSBFSU5UUiAmJiBlcnJubyAhPSBFQUNDRVMgJiYgZXJy bm8gIT0gRUFHQUlOKSB7CisgICAgICAgICAgICAgICAgemNsb3NlKGZsb2NrX2ZkKTsKIAkJendh cm5uYW0obmFtLCAiZmFpbGVkIHRvIGxvY2sgZmlsZSAlczogJWUiLCBhcmdzWzBdLCBlcnJubyk7 CiAJCXJldHVybiAxOwogCSAgICB9Ci0JICAgIGlmICh0aW1lKE5VTEwpID49IGVuZCkKKwkgICAg aWYgKHRpbWUoTlVMTCkgPj0gZW5kKSB7CisgICAgICAgICAgICAgICAgemNsb3NlKGZsb2NrX2Zk KTsKIAkJcmV0dXJuIDI7CisgICAgICAgICAgICB9CiAJICAgIHNsZWVwKDEpOwogCX0KICAgICB9 IGVsc2UgewogCXdoaWxlIChmY250bChmbG9ja19mZCwgdGltZW91dCA9PSAwID8gRl9TRVRMSyA6 IEZfU0VUTEtXLCAmbGNrKSA8IDApIHsKLQkgICAgaWYgKGVycmZsYWcpCisJICAgIGlmIChlcnJm bGFnKSB7CisgICAgICAgICAgICAgICAgemNsb3NlKGZsb2NrX2ZkKTsKIAkJcmV0dXJuIDE7Cisg ICAgICAgICAgICB9CiAJICAgIGlmIChlcnJubyA9PSBFSU5UUikKIAkJY29udGludWU7CisgICAg ICAgICAgICB6Y2xvc2UoZmxvY2tfZmQpOwogCSAgICB6d2Fybm5hbShuYW0sICJmYWlsZWQgdG8g bG9jayBmaWxlICVzOiAlZSIsIGFyZ3NbMF0sIGVycm5vKTsKIAkgICAgcmV0dXJuIDE7CiAJfQo= --5a47b193_27703ec2_13d7--