Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-28 13:53:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

fish_indent: skip past illegal byte sequences

Browse source 
garbage input, indented garbage output.
We print a warning, and will eventually exit 1
This commit is contained in:
Aaron Gyes 2018-12-11 05:40:57 -08:00
parent e0d7f0bc96
commit d080182686
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/fish_indent.cpp
View file

@ -47,16 +47,27 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
// An indent_t represents an abstract indent depth. 2 means we are in a doubly-nested block, etc. // An indent_t represents an abstract indent depth. 2 means we are in a doubly-nested block, etc.
typedef unsigned int indent_t; typedef unsigned int indent_t;
static bool dump_parse_tree = false; static bool dump_parse_tree = false;
static int ret = 0;
// Read the entire contents of a file into the specified string. // Read the entire contents of a file into the specified string.
static wcstring read_file(FILE *f) { static wcstring read_file(FILE *f) {
wcstring result; wcstring result;
while (1) { while (1) {
wint_t c = fgetwc(f); wint_t c = fgetwc(f);
if (c == WEOF) { if (c == WEOF) {
if (ferror(f)) { if (ferror(f)) {
wperror(L"fgetwc"); if (errno == EILSEQ) {
exit(1); // Illegal byte sequence. Try to skip past it.
clearerr(f);
int ch = fgetc(f); // for printing the warning, and seeks forward 1 byte.
debug(1, "%s (byte=%X)", strerror(errno), ch);
ret = 1;
continue;
} else {
wperror(L"fgetwc");
exit(1);
}
} }
break; break;
} }
@ -551,5 +562,5 @@ int main(int argc, char *argv[]) {
} }
fputws(str2wcstring(colored_output).c_str(), stdout); fputws(str2wcstring(colored_output).c_str(), stdout);
return 0; return ret;
} }