aboutsummaryrefslogtreecommitdiff
path: root/src/cmd/acme/exec.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/cmd/acme/exec.c')
-rw-r--r--src/cmd/acme/exec.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/cmd/acme/exec.c b/src/cmd/acme/exec.c
index 3575c984..f6dc32f4 100644
--- a/src/cmd/acme/exec.c
+++ b/src/cmd/acme/exec.c
@@ -702,7 +702,7 @@ putfile(File *f, int q0, int q1, Rune *namer, int nname)
Rune *r;
Biobuf *b;
char *s, *name;
- int i, fd, q, ret;
+ int i, fd, q, ret, retc;
Dir *d, *d1;
Window *w;
int isapp;
@@ -766,9 +766,10 @@ putfile(File *f, int q0, int q1, Rune *namer, int nname)
goto Rescue2;
}
ret = Bterm(b);
+ retc = close(fd);
free(b);
b = nil;
- if(ret < 0) {
+ if(ret < 0 || retc < 0) {
warning(nil, "can't write file %s: %r\n", name);
goto Rescue2; // flush or close failed
}
@@ -788,10 +789,9 @@ putfile(File *f, int q0, int q1, Rune *namer, int nname)
// in case we don't have read permission.
// (The create above worked, so we probably
// still have write permission.)
- close(fd);
fd = open(name, OWRITE);
-
d1 = dirfstat(fd);
+ close(fd);
if(d1 != nil){
free(d);
d = d1;
@@ -824,11 +824,11 @@ putfile(File *f, int q0, int q1, Rune *namer, int nname)
if(b != nil) {
Bterm(b);
free(b);
+ close(fd);
}
free(h);
fbuffree(s);
fbuffree(r);
- close(fd);
/* fall through */
Rescue1: