split out choices about scheme handler

This commit is contained in:
Vincent Sanders 2020-09-27 00:39:56 +01:00
parent 86ecde9a47
commit ff3b948ac0
4 changed files with 130 additions and 67 deletions

View File

@ -4,6 +4,7 @@ S_FETCHER_ABOUT := \
about.c \
blank.c \
certificate.c \
choices.c \
config.c \
imagecache.c \
testament.c

View File

@ -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
*
@ -336,71 +335,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
*

View File

@ -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;
}

View File

@ -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