From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from cn.fujitsu.com ([59.151.112.132]:55171 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1751000AbaFXCny (ORCPT ); Mon, 23 Jun 2014 22:43:54 -0400 From: Gui Hecheng To: CC: , Gui Hecheng Subject: [PATCH v2 3/4] btrfs-progs: delete invalid output file when btrfs-image failed Date: Tue, 24 Jun 2014 10:38:33 +0800 Message-ID: <1403577513-6201-1-git-send-email-guihc.fnst@cn.fujitsu.com> In-Reply-To: <20140623141557.GG1553@twin.jikos.cz> References: <20140623141557.GG1553@twin.jikos.cz> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-btrfs-owner@vger.kernel.org List-ID: When btrfs-image failed to create an image, the invalid output file had better be deleted to prevent being used mistakenly in the future. Signed-off-by: Gui Hecheng --- changelog v1->v2: use a new local variable to avoid return value overwritten --- btrfs-image.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/btrfs-image.c b/btrfs-image.c index c18dff1..321c331 100644 --- a/btrfs-image.c +++ b/btrfs-image.c @@ -2604,8 +2604,18 @@ int main(int argc, char *argv[]) out: if (out == stdout) fflush(out); - else + else { fclose(out); + if (ret && create) { + int unlink_ret; + + unlink_ret = unlink(target); + if (unlink_ret) + fprintf(stderr, + "unlink output file failed : %s\n", + strerror(errno)); + } + } return !!ret; } -- 1.8.1.4