mirror of
https://github.com/ipxe/ipxe
synced 2025-12-13 07:20:47 +03:00
[settings] Remove "uristring" setting type
Commit b5f5f73 ("[cmdline] Expand settings within each command-line
token individually") effectively rendered the "uristring" setting type
obsolete, since strings containing whitespace no longer break the
command line parser. The concept of the "uristring" type is not well
defined, since URI escaping rules depend on which portion of a URI is
being escaped.
Remove the "uristring" type, converting it into an alias for the
"string" setting type so as to avoid breaking existing scripts.
Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
@@ -162,12 +162,6 @@ static struct setting test_string_setting = {
|
||||
.type = &setting_type_string,
|
||||
};
|
||||
|
||||
/** Test URI-encoded string setting */
|
||||
static struct setting test_uristring_setting = {
|
||||
.name = "test_uristring",
|
||||
.type = &setting_type_uristring,
|
||||
};
|
||||
|
||||
/** Test IPv4 address setting type */
|
||||
static struct setting test_ipv4_setting = {
|
||||
.name = "test_ipv4",
|
||||
@@ -261,13 +255,6 @@ static void settings_test_exec ( void ) {
|
||||
fetchf_ok ( &test_settings, &test_string_setting,
|
||||
RAW ( 'w', 'o', 'r', 'l', 'd' ), "world" );
|
||||
|
||||
/* "uristring" setting type */
|
||||
storef_ok ( &test_settings, &test_uristring_setting, "hello%20world",
|
||||
RAW ( 'h', 'e', 'l', 'l', 'o', ' ', 'w', 'o', 'r', 'l',
|
||||
'd' ) );
|
||||
fetchf_ok ( &test_settings, &test_uristring_setting,
|
||||
RAW ( 1, 2, 3, 4, 5 ), "%01%02%03%04%05" );
|
||||
|
||||
/* "ipv4" setting type */
|
||||
storef_ok ( &test_settings, &test_ipv4_setting, "192.168.0.1",
|
||||
RAW ( 192, 168, 0, 1 ) );
|
||||
|
||||
Reference in New Issue
Block a user