[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[groff] 09/21: [troff]: Trivially refactor (unsafe reqs Boolean).
From: |
G. Branden Robinson |
Subject: |
[groff] 09/21: [troff]: Trivially refactor (unsafe reqs Boolean). |
Date: |
Sat, 16 Sep 2023 18:39:38 -0400 (EDT) |
gbranden pushed a commit to branch master
in repository groff.
commit bec8d2e73ffa4d62a9029309ea7d279969bd8ccc
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Thu Sep 14 23:25:45 2023 -0500
[troff]: Trivially refactor (unsafe reqs Boolean).
* src/roff/troff/input.cpp: Trivially refactor. Rename `unsafe_flag` to
`want_unsafe_requests`.
(pipe_source, open_request, opena_request, pipe_output):
(system_request, main, init_input_requests): Do it.
(init_input_requests): Migrate from `readonly_register` to
`readonly_boolean_register`.
---
ChangeLog | 9 +++++++++
src/roff/troff/input.cpp | 18 +++++++++---------
2 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 4ec010a9a..3376e7e62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2023-09-14 G. Branden Robinson <g.branden.robinson@gmail.com>
+
+ * src/roff/troff/input.cpp: Trivially refactor. Rename
+ `unsafe_flag` to `want_unsafe_requests`.
+ (pipe_source, open_request, opena_request, pipe_output):
+ (system_request, main, init_input_requests): Do it.
+ (init_input_requests): Migrate from `readonly_register` to
+ `readonly_boolean_register`.
+
2023-09-14 G. Branden Robinson <g.branden.robinson@gmail.com>
[troff]: Add class for Boolean-valued read-only registers.
diff --git a/src/roff/troff/input.cpp b/src/roff/troff/input.cpp
index 47daf483d..02d78053b 100644
--- a/src/roff/troff/input.cpp
+++ b/src/roff/troff/input.cpp
@@ -116,7 +116,7 @@ bool have_formattable_input = false;
bool old_have_formattable_input = false;
bool device_has_tcommand = false; // 't' output command supported
-int unsafe_flag = 0; // safer by default
+bool want_unsafe_requests = false; // be safer by default
bool have_multiple_params = false; // e.g., \[e aa], \*[foo bar]
@@ -6172,7 +6172,7 @@ void source_quietly()
void pipe_source()
{
- if (!unsafe_flag) {
+ if (!want_unsafe_requests) {
error("'pso' request is not allowed in safer mode");
skip_line();
}
@@ -6927,7 +6927,7 @@ void do_open(int append)
void open_request()
{
- if (!unsafe_flag) {
+ if (!want_unsafe_requests) {
error("'open' request is not allowed in safer mode");
skip_line();
}
@@ -6937,7 +6937,7 @@ void open_request()
void opena_request()
{
- if (!unsafe_flag) {
+ if (!want_unsafe_requests) {
error("'opena' request is not allowed in safer mode");
skip_line();
}
@@ -7744,7 +7744,7 @@ char *read_string()
void pipe_output()
{
- if (!unsafe_flag) {
+ if (!want_unsafe_requests) {
error("'pi' request is not allowed in safer mode");
skip_line();
}
@@ -7776,7 +7776,7 @@ static int system_status;
void system_request()
{
- if (!unsafe_flag) {
+ if (!want_unsafe_requests) {
error("'sy' request is not allowed in safer mode");
skip_line();
}
@@ -8299,7 +8299,7 @@ int main(int argc, char **argv)
// silently ignore these
break;
case 'U':
- unsafe_flag = 1; // unsafe behaviour
+ want_unsafe_requests = true;
break;
#if defined(DEBUGGING)
case 'D':
@@ -8317,7 +8317,7 @@ int main(int argc, char **argv)
default:
assert(0);
}
- if (unsafe_flag)
+ if (want_unsafe_requests)
mac_path = ¯o_path;
set_string(".T", device);
init_charset_table();
@@ -8583,7 +8583,7 @@ void init_input_requests()
register_dictionary.define(".g", new readonly_text_register("1"));
register_dictionary.define(".H", new readonly_register(&hresolution));
register_dictionary.define(".R", new readonly_text_register("10000"));
- register_dictionary.define(".U", new readonly_register(&unsafe_flag));
+ register_dictionary.define(".U", new
readonly_boolean_register(&want_unsafe_requests));
register_dictionary.define(".V", new readonly_register(&vresolution));
register_dictionary.define(".warn", new readonly_register(&warning_mask));
extern const char *major_version;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [groff] 09/21: [troff]: Trivially refactor (unsafe reqs Boolean).,
G. Branden Robinson <=