From 86ecde9a473deffdbb023317074a46c124477ca2 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Thu, 24 Sep 2020 23:07:40 +0100 Subject: split out about handler config handler --- content/fetchers/about/Makefile | 8 ++- content/fetchers/about/about.c | 101 +----------------------------- content/fetchers/about/config.c | 133 ++++++++++++++++++++++++++++++++++++++++ content/fetchers/about/config.h | 35 +++++++++++ 4 files changed, 176 insertions(+), 101 deletions(-) create mode 100644 content/fetchers/about/config.c create mode 100644 content/fetchers/about/config.h (limited to 'content/fetchers/about') diff --git a/content/fetchers/about/Makefile b/content/fetchers/about/Makefile index 142c53398..700ac3947 100644 --- a/content/fetchers/about/Makefile +++ b/content/fetchers/about/Makefile @@ -1,6 +1,12 @@ # about fetcher sources -S_FETCHER_ABOUT := about.c imagecache.c blank.c certificate.c testament.c +S_FETCHER_ABOUT := \ + about.c \ + blank.c \ + certificate.c \ + config.c \ + imagecache.c \ + testament.c # The following files depend on the testament content/fetchers/about/testament.c: testament $(OBJROOT)/testament.h diff --git a/content/fetchers/about/about.c b/content/fetchers/about/about.c index 117bd6689..e41e6c899 100644 --- a/content/fetchers/about/about.c +++ b/content/fetchers/about/about.c @@ -52,6 +52,7 @@ #include "certificate.h" #include "imagecache.h" #include "atestament.h" +#include "config.h" #include "about.h" typedef bool (*fetch_about_handler)(struct fetch_about_context *); @@ -288,106 +289,6 @@ static bool fetch_about_licence_handler(struct fetch_about_context *ctx) } -/** - * Handler to generate about scheme config page - * - * \param ctx The fetcher context. - * \return true if handled false if aborted. - */ -static bool fetch_about_config_handler(struct fetch_about_context *ctx) -{ - fetch_msg msg; - char buffer[1024]; - int slen = 0; - unsigned int opt_loop = 0; - int elen = 0; /* entry length */ - nserror res; - bool even = false; - - /* content is going to return ok */ - fetch_set_http_code(ctx->fetchh, 200); - - /* content type */ - if (fetch_about_send_header(ctx, "Content-Type: text/html")) { - goto fetch_about_config_handler_aborted; - } - - res = fetch_about_ssenddataf(ctx, - "\n\n" - "NetSurf Browser Config\n" - "\n" - "\n" - "\n" - "

NetSurf Browser Config

\n" - "\n" - "" - "" - "" - "\n"); - if (res != NSERROR_OK) { - goto fetch_about_config_handler_aborted; - } - - msg.type = FETCH_DATA; - msg.data.header_or_data.buf = (const uint8_t *) buffer; - - do { - if (even) { - elen = nsoption_snoptionf(buffer + slen, - sizeof buffer - slen, - opt_loop, - "" - "" - "" - "" - "" - "\n"); - } else { - elen = nsoption_snoptionf(buffer + slen, - sizeof buffer - slen, - opt_loop, - "" - "" - "" - "" - "" - "\n"); - } - if (elen <= 0) - break; /* last option */ - - if (elen >= (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_config_handler_aborted; - slen = 0; - } else { - /* normal addition */ - slen += elen; - opt_loop++; - even = !even; - } - } while (elen > 0); - - slen += snprintf(buffer + slen, sizeof buffer - slen, - "
OptionTypeProvenanceSetting
%k%t%p%V
%k%t%p%V
\n\n\n"); - - msg.data.header_or_data.len = slen; - if (fetch_about_send_callback(&msg, ctx)) - goto fetch_about_config_handler_aborted; - - fetch_about_send_finished(ctx); - - return true; - -fetch_about_config_handler_aborted: - return false; -} /** diff --git a/content/fetchers/about/config.c b/content/fetchers/about/config.c new file mode 100644 index 000000000..a18af956f --- /dev/null +++ b/content/fetchers/about/config.c @@ -0,0 +1,133 @@ +/* + * Copyright 2020 Vincent Sanders + * + * 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 . + */ + +/** + * \file + * content generator for the about scheme blank page + */ + +#include +#include +#include + +#include "netsurf/types.h" +#include "utils/errors.h" +#include "utils/nsoption.h" + +#include "private.h" +#include "config.h" + +/** + * Handler to generate about scheme config page + * + * \param ctx The fetcher context. + * \return true if handled false if aborted. + */ +bool fetch_about_config_handler(struct fetch_about_context *ctx) +{ + char buffer[1024]; + int slen = 0; + unsigned int opt_loop = 0; + int elen = 0; /* entry length */ + nserror res; + bool even = false; + + /* content is going to return ok */ + fetch_about_set_http_code(ctx, 200); + + /* content type */ + if (fetch_about_send_header(ctx, "Content-Type: text/html")) { + goto fetch_about_config_handler_aborted; + } + + res = fetch_about_ssenddataf(ctx, + "\n\n" + "NetSurf Browser Config\n" + "\n" + "\n" + "\n" + "

NetSurf Browser Config

\n" + "\n" + "" + "" + "" + "\n"); + if (res != NSERROR_OK) { + goto fetch_about_config_handler_aborted; + } + + + do { + if (even) { + elen = nsoption_snoptionf(buffer + slen, + sizeof buffer - slen, + opt_loop, + "" + "" + "" + "" + "" + "\n"); + } else { + elen = nsoption_snoptionf(buffer + slen, + sizeof buffer - slen, + opt_loop, + "" + "" + "" + "" + "" + "\n"); + } + if (elen <= 0) + break; /* last option */ + + if (elen >= (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_config_handler_aborted; + } + slen = 0; + } else { + /* normal addition */ + slen += elen; + opt_loop++; + even = !even; + } + } while (elen > 0); + + slen += snprintf(buffer + slen, sizeof buffer - slen, + "
OptionTypeProvenanceSetting
%k%t%p%V
%k%t%p%V
\n\n\n"); + + res = fetch_about_senddata(ctx, (const uint8_t *)buffer, slen); + if (res != NSERROR_OK) { + goto fetch_about_config_handler_aborted; + } + + fetch_about_send_finished(ctx); + + return true; + +fetch_about_config_handler_aborted: + return false; +} diff --git a/content/fetchers/about/config.h b/content/fetchers/about/config.h new file mode 100644 index 000000000..efef23971 --- /dev/null +++ b/content/fetchers/about/config.h @@ -0,0 +1,35 @@ +/* + * Copyright 2020 Vincent Sanders + * + * 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 . + */ + +/** + * \file + * about scheme config handler interface + */ + +#ifndef NETSURF_CONTENT_FETCHERS_ABOUT_CONFIG_H +#define NETSURF_CONTENT_FETCHERS_ABOUT_CONFIG_H + +/** + * Handler to generate about scheme config page. + * + * \param ctx The fetcher context. + * \return true if handled false if aborted. + */ +bool fetch_about_config_handler(struct fetch_about_context *ctx); + +#endif -- cgit v1.2.3