yan/archived-rtty
1
0
Fork 0
mirror of https://github.com/zhaojh329/rtty.git synced 2026-02-27 09:53:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug: File not closed when downloads was cancelled

Browse Source 
Signed-off-by: Jianhui Zhao <zhaojh329@gmail.com>
This commit is contained in:
Jianhui Zhao
2020-02-29 19:44:32 +08:00
parent f0ad5af0e6
commit 7e0461c3f7
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/file.c
+11 -2
View File
@@ -81,6 +81,7 @@ static void on_file_read(struct ev_loop *loop, struct ev_io *w, int revents)
ctx->busy = false;
ev_io_stop(loop, w);
close(w->fd);
w->fd = -1;
} else {
notify_progress(ctx);
}
@@ -169,8 +170,15 @@ static void on_socket_read(struct ev_loop *loop, struct ev_io *w, int revents)
start_upload_file(ctx, &b);
break;
case RTTY_FILE_MSG_CANCELED:
ev_io_stop(loop, &ctx->iof);
close(ctx->iof.fd);
if (ctx->iof.fd > -1) {
close(ctx->iof.fd);
ctx->iof.fd = -1;
ev_io_stop(loop, &ctx->iof);
}
if (ctx->fd > -1) {
close(ctx->fd);
ctx->fd = -1;
}
ctx->busy = false;
buffer_put_u8(&rtty->wb, MSG_TYPE_FILE);
@@ -276,6 +284,7 @@ void parse_file_msg(struct file_context *ctx, int type, struct buffer *data, int
case RTTY_FILE_MSG_DATA:
if (len == 0) {
close(ctx->fd);
ctx->fd = -1;
ctx->busy = false;
return;
}