From 6c52f1400516d38624a003714aec6a94e9e89bfd Mon Sep 17 00:00:00 2001 From: Ashish Gupta Date: Sun, 24 Sep 2017 23:47:04 +0200 Subject: Revert "Revert file.c to master" This reverts commit 1843934b37c6731fbb60665cd78bcd3f2c82d80d. --- content/fetchers/file.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/content/fetchers/file.c b/content/fetchers/file.c index 4fa1a2138..f200eee19 100644 --- a/content/fetchers/file.c +++ b/content/fetchers/file.c @@ -42,6 +42,7 @@ #ifdef HAVE_MMAP #include #endif + #include #include "netsurf/inttypes.h" @@ -191,6 +192,11 @@ static void fetch_file_free(void *ctx) /** callback to start a file fetch */ static bool fetch_file_start(void *ctx) { +#ifdef _TARGET_IS_KOLIBRIOS + struct fetch_file_context *c = ctx; + debug_board_printf("[%u] Starting file fetch : %s\n", sys_uptime(), nsurl_access(c->url)); +#endif + return true; } @@ -250,6 +256,9 @@ static void fetch_file_process_error(struct fetch_file_context *ctx, int code) if (fetch_file_send_callback(&msg, ctx)) goto fetch_file_process_error_aborted; +#ifdef _TARGET_IS_KOLIBRIOS + debug_board_printf("[%u] Finished file fetch : %s\n", sys_uptime(), nsurl_access(ctx->url)); +#endif msg.type = FETCH_FINISHED; fetch_file_send_callback(&msg, ctx); @@ -332,6 +341,9 @@ static void fetch_file_process_plain(struct fetch_file_context *ctx, fetch_file_send_callback(&msg, ctx); if (ctx->aborted == false) { +#ifdef _TARGET_IS_KOLIBRIOS + debug_board_printf("[%u] Finished file fetch : %s\n", sys_uptime(), nsurl_access(ctx->url)); +#endif msg.type = FETCH_FINISHED; fetch_file_send_callback(&msg, ctx); } @@ -435,6 +447,9 @@ fetch_file_process_aborted: } if (ctx->aborted == false) { +#ifdef _TARGET_IS_KOLIBRIOS + debug_board_printf("[%u] Finished file fetch : %s\n", sys_uptime(), nsurl_access(ctx->url)); +#endif msg.type = FETCH_FINISHED; fetch_file_send_callback(&msg, ctx); } @@ -656,7 +671,13 @@ static void fetch_file_process_dir(struct fetch_file_context *ctx, int i; /* directory entry index */ int n; /* number of directory entries */ +#ifndef _TARGET_IS_KOLIBRIOS n = scandir(ctx->path, &listing, 0, dir_sort_alpha); +#else + /* Don't have scandir yet */ + n = 1; +#endif + if (n < 0) { fetch_file_process_error(ctx, fetch_file_errno_to_http_code(errno)); @@ -735,6 +756,10 @@ static void fetch_file_process_dir(struct fetch_file_context *ctx, if (fetch_file_send_callback(&msg, ctx)) goto fetch_file_process_dir_aborted; +#ifdef _TARGET_IS_KOLIBRIOS + debug_board_printf("[%u] Finished file fetch : %s\n", sys_uptime(), nsurl_access(ctx->url)); +#endif + msg.type = FETCH_FINISHED; fetch_file_send_callback(&msg, ctx); -- cgit v1.2.3