h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-16 18:31:14 -03:00
Code Issues Packages Projects Releases Wiki Activity

use consistent mechanism to validate var names

Browse Source 
Builtin commands that validate var names should use a consistent
mechanism. I noticed that builtin_read() had it's own custom code that
differed slightly from wcsvarname().

Fixes #3569
This commit is contained in:
Kurtis Rader
2016-11-21 18:10:15 -08:00
parent 320cb6857f
commit aad2848e80
6 changed files with 34 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/parse_util.cpp
View File

@@ -847,7 +847,7 @@ void parse_util_expand_variable_error(const wcstring &token, size_t global_token
if (closing_bracket != wcstring::npos) {
size_t var_start = dollar_pos + 2, var_end = closing_bracket;
var_name = wcstring(token, var_start, var_end - var_start);
looks_like_variable = !var_name.empty() && wcsvarname(var_name.c_str()) == NULL;
looks_like_variable = wcsvarname(var_name) == NULL;
}
if (looks_like_variable) {
append_syntax_error(