RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 08:58:11 +00:00
Code Issues Activity Actions

Userland: Fix stty not setting control characters

Browse source 
`AK::Result` does not work if both the error and value types are
integers.
This commit is contained in:
Daniel Bertalan 2021-05-24 16:23:33 +02:00 • committed by Linus Groh
parent 7982f9aa70
commit e401ff0802
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Userland/Utilities/stty.cpp
View file

@ -318,25 +318,25 @@ Result<void, int> apply_modes(size_t parameter_count, char** raw_parameters, ter
return contains_colon; return contains_colon;
}; };
auto parse_control_character = [&](size_t idx) -> Result<cc_t, int> { auto parse_control_character = [&](size_t idx) -> Optional<cc_t> {
VERIFY(!parameters[idx].is_empty()); VERIFY(!parameters[idx].is_empty());
if (parameters[idx] == "^-" || parameters[idx] == "undef") { if (parameters[idx] == "^-" || parameters[idx] == "undef") {
// FIXME: disabling characters is a bit wonky right now in TTY. // FIXME: disabling characters is a bit wonky right now in TTY.
// We should add the _POSIX_VDISABLE macro. // We should add the _POSIX_VDISABLE macro.
return (cc_t)0; return 0;
} else if (parameters[idx][0] == '^' && parameters[idx].length() == 2) { } else if (parameters[idx][0] == '^' && parameters[idx].length() == 2) {
return (cc_t)toupper(parameters[idx][1]) - 0x40; return toupper(parameters[idx][1]) - 0x40;
} else if (parameters[idx].starts_with("0x")) { } else if (parameters[idx].starts_with("0x")) {
cc_t value = 0; cc_t value = 0;
if (parameters[idx].length() == 2) { if (parameters[idx].length() == 2) {
warnln("Invalid hexadecimal character code {}", parameters[idx]); warnln("Invalid hexadecimal character code {}", parameters[idx]);
return (int)1; return {};
} }
for (size_t i = 2; i < parameters[idx].length(); ++i) { for (size_t i = 2; i < parameters[idx].length(); ++i) {
char ch = tolower(parameters[idx][i]); char ch = tolower(parameters[idx][i]);
if (!isdigit(ch) && !(ch >= 'a' && ch <= 'f')) { if (!isdigit(ch) && !(ch >= 'a' && ch <= 'f')) {
warnln("Invalid hexadecimal character code {}", parameters[idx]); warnln("Invalid hexadecimal character code {}", parameters[idx]);
return (int)1; return {};
} }
value = 16 * value + (isdigit(ch)) ? (ch - '0') : (ch - 'a'); value = 16 * value + (isdigit(ch)) ? (ch - '0') : (ch - 'a');
} }
@ -347,7 +347,7 @@ Result<void, int> apply_modes(size_t parameter_count, char** raw_parameters, ter
char ch = parameters[idx][i]; char ch = parameters[idx][i];
if (!(ch >= '0' && ch <= '7')) { if (!(ch >= '0' && ch <= '7')) {
warnln("Invalid octal character code {}", parameters[idx]); warnln("Invalid octal character code {}", parameters[idx]);
return (int)1; return {};
} }
value = 8 * value + (ch - '0'); value = 8 * value + (ch - '0');
} }
@ -356,14 +356,14 @@ Result<void, int> apply_modes(size_t parameter_count, char** raw_parameters, ter
auto maybe_value = parameters[idx].to_uint<cc_t>(); auto maybe_value = parameters[idx].to_uint<cc_t>();
if (!maybe_value.has_value()) { if (!maybe_value.has_value()) {
warnln("Invalid decimal character code {}", parameters[idx]); warnln("Invalid decimal character code {}", parameters[idx]);
return (int)1; return {};
} }
return maybe_value.value(); return maybe_value.value();
} else if (parameters[idx].length() == 1) { } else if (parameters[idx].length() == 1) {
return parameters[idx][0]; return parameters[idx][0];
} }
warnln("Invalid control character {}", parameters[idx]); warnln("Invalid control character {}", parameters[idx]);
return (int)1; return {};
}; };
size_t parameter_idx = 0; size_t parameter_idx = 0;
@ -391,10 +391,10 @@ Result<void, int> apply_modes(size_t parameter_count, char** raw_parameters, ter
warnln("No control character specified for {}", cc.name); warnln("No control character specified for {}", cc.name);
return 1; return 1;
} }
auto control_character_or_error = parse_control_character(++parameter_idx); auto maybe_control_character = parse_control_character(++parameter_idx);
if (control_character_or_error.is_error()) if (!maybe_control_character.has_value())
return control_character_or_error.error(); return 1;
t.c_cc[cc.index] = control_character_or_error.value(); t.c_cc[cc.index] = maybe_control_character.value();
return {}; return {};
} }
} }