diff options
| -rw-r--r-- | content/fetchers/about/Makefile | 1 | ||||
| -rw-r--r-- | content/fetchers/about/about.c | 68 | ||||
| -rw-r--r-- | content/fetchers/about/choices.c | 93 | ||||
| -rw-r--r-- | content/fetchers/about/choices.h | 35 |
4 files changed, 130 insertions, 67 deletions
diff --git a/content/fetchers/about/Makefile b/content/fetchers/about/Makefile index 700ac3947..52eaece3d 100644 --- a/content/fetchers/about/Makefile +++ b/content/fetchers/about/Makefile @@ -4,6 +4,7 @@ S_FETCHER_ABOUT := \ about.c \ blank.c \ certificate.c \ + choices.c \ config.c \ imagecache.c \ testament.c diff --git a/content/fetchers/about/about.c b/content/fetchers/about/about.c index e41e6c899..1bc382b57 100644 --- a/content/fetchers/about/about.c +++ b/content/fetchers/about/about.c @@ -53,6 +53,7 @@ #include "imagecache.h" #include "atestament.h" #include "config.h" +#include "choices.h" #include "about.h" typedef bool (*fetch_about_handler)(struct fetch_about_context *); @@ -289,8 +290,6 @@ static bool fetch_about_licence_handler(struct fetch_about_context *ctx) } - - /** * Handler to generate the nscolours stylesheet * @@ -337,71 +336,6 @@ aborted: /** - * Generate the text of a Choices file which represents the current - * in use options. - * - * \param ctx The fetcher context. - * \return true if handled false if aborted. - */ -static bool fetch_about_choices_handler(struct fetch_about_context *ctx) -{ - fetch_msg msg; - char buffer[1024]; - int code = 200; - int slen; - unsigned int opt_loop = 0; - int res = 0; - - /* content is going to return ok */ - fetch_set_http_code(ctx->fetchh, code); - - /* content type */ - if (fetch_about_send_header(ctx, "Content-Type: text/plain")) - goto fetch_about_choices_handler_aborted; - - msg.type = FETCH_DATA; - msg.data.header_or_data.buf = (const uint8_t *) buffer; - - slen = snprintf(buffer, sizeof buffer, - "# Automatically generated current NetSurf browser Choices\n"); - - do { - res = nsoption_snoptionf(buffer + slen, - sizeof buffer - slen, - opt_loop, - "%k:%v\n"); - if (res <= 0) - break; /* last option */ - - if (res >= (int) (sizeof buffer - slen)) { - /* last entry would not fit in buffer, submit buffer */ - msg.data.header_or_data.len = slen; - if (fetch_about_send_callback(&msg, ctx)) - goto fetch_about_choices_handler_aborted; - slen = 0; - } else { - /* normal addition */ - slen += res; - opt_loop++; - } - } while (res > 0); - - msg.data.header_or_data.len = slen; - if (fetch_about_send_callback(&msg, ctx)) - goto fetch_about_choices_handler_aborted; - - fetch_about_send_finished(ctx); - - return true; - -fetch_about_choices_handler_aborted: - return false; -} - - - - -/** * Handler to generate about scheme logo page * * \param ctx The fetcher context. diff --git a/content/fetchers/about/choices.c b/content/fetchers/about/choices.c new file mode 100644 index 000000000..a95502e6e --- /dev/null +++ b/content/fetchers/about/choices.c @@ -0,0 +1,93 @@ +/* + * Copyright 2020 Vincent Sanders <vince@netsurf-browser.org> + * + * This file is part of NetSurf. + * + * NetSurf is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * NetSurf is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +/** + * \file + * content generator for the about scheme blank page + */ + +#include <stdbool.h> +#include <stddef.h> +#include <stdio.h> + +#include "netsurf/types.h" +#include "utils/errors.h" +#include "utils/nsoption.h" + +#include "private.h" +#include "choices.h" + +/** + * Generate the text of a Choices file which represents the current + * in use options. + * + * \param ctx The fetcher context. + * \return true if handled false if aborted. + */ +bool fetch_about_choices_handler(struct fetch_about_context *ctx) +{ + char buffer[1024]; + int code = 200; + int slen; + unsigned int opt_loop = 0; + int res = 0; + + /* content is going to return ok */ + fetch_about_set_http_code(ctx, code); + + /* content type */ + if (fetch_about_send_header(ctx, "Content-Type: text/plain")) + goto fetch_about_choices_handler_aborted; + + slen = snprintf(buffer, sizeof buffer, + "# Automatically generated current NetSurf browser Choices\n"); + + do { + res = nsoption_snoptionf(buffer + slen, + sizeof buffer - slen, + opt_loop, + "%k:%v\n"); + if (res <= 0) + break; /* last option */ + + if (res >= (int) (sizeof buffer - slen)) { + /* last entry would not fit in buffer, submit buffer */ + res = fetch_about_senddata(ctx, (const uint8_t *)buffer, slen); + if (res != NSERROR_OK) { + goto fetch_about_choices_handler_aborted; + } + slen = 0; + } else { + /* normal addition */ + slen += res; + opt_loop++; + } + } while (res > 0); + + res = fetch_about_senddata(ctx, (const uint8_t *)buffer, slen); + if (res != NSERROR_OK) { + goto fetch_about_choices_handler_aborted; + } + + fetch_about_send_finished(ctx); + + return true; + +fetch_about_choices_handler_aborted: + return false; +} diff --git a/content/fetchers/about/choices.h b/content/fetchers/about/choices.h new file mode 100644 index 000000000..0548f5b9c --- /dev/null +++ b/content/fetchers/about/choices.h @@ -0,0 +1,35 @@ +/* + * Copyright 2020 Vincent Sanders <vince@netsurf-browser.org> + * + * This file is part of NetSurf. + * + * NetSurf is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * NetSurf is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +/** + * \file + * about scheme choices handler interface + */ + +#ifndef NETSURF_CONTENT_FETCHERS_ABOUT_CHOICES_H +#define NETSURF_CONTENT_FETCHERS_ABOUT_CHOICES_H + +/** + * Handler to generate about scheme choices page. + * + * \param ctx The fetcher context. + * \return true if handled false if aborted. + */ +bool fetch_about_choices_handler(struct fetch_about_context *ctx); + +#endif |