commit 9e985c2bb2afea0f7fcd221b0359201cb121296d
parent 8ef9b38e56b9b03fed5c1e4d5cb4a4cb66713868
Author: Michael Forney <mforney@mforney.org>
Date: Sun, 24 May 2020 20:58:36 -0700
install: Unlink destination file on failure
Diffstat:
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/xinstall.c b/xinstall.c
@@ -54,16 +54,24 @@ install(const char *s1, const char *s2, int depth)
eprintf("creat %s:", s2);
}
if (concat(f1, s1, f2, s2) < 0)
- exit(1);
- if (fchmod(f2, mode) < 0)
- eprintf("fchmod %s:", s2);
- if (fchown(f2, owner, group) < 0)
- eprintf("lchown %s:", s2);
+ goto fail;
+ if (fchmod(f2, mode) < 0) {
+ weprintf("fchmod %s:", s2);
+ goto fail;
+ }
+ if (fchown(f2, owner, group) < 0) {
+ weprintf("fchown %s:", s2);
+ goto fail;
+ }
close(f1);
close(f2);
return 0;
+
+fail:
+ unlink(s2);
+ exit(1);
}
static void