ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rcfile: at terminating points, verify that a defined syntax is not empty 

Whenever, in an rcfile, a command is encountered that is not part of a
syntax definition, a currently open syntax should be closed, but only
after checking that the syntax contains at least one color command.

This fixes https://savannah.gnu.org/bugs/?56501.

Bug existed since version 2.3.3.
master
Benno Schulenberg 2019-06-15 19:34:23 +02:00
parent 0af9ce926b
commit d82c753ba4
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/rcfile.c
View File

@ -141,6 +141,8 @@ static bool opensyntax = FALSE;
* or when a new syntax command is seen, this bool becomes FALSE. */ * or when a new syntax command is seen, this bool becomes FALSE. */
static syntaxtype *live_syntax; static syntaxtype *live_syntax;
/* The syntax that is currently being parsed. */ /* The syntax that is currently being parsed. */
static bool seen_color_command = FALSE;
/* Whether a syntax definition contains any color commands. */
static colortype *lastcolor = NULL; static colortype *lastcolor = NULL;
/* The end of the color list for the current syntax. */ /* The end of the color list for the current syntax. */
#endif #endif
@ -294,8 +296,6 @@ void begin_new_syntax(char *ptr)
{ {
char *nameptr = ptr; char *nameptr = ptr;
opensyntax = FALSE;
/* Check that the syntax name is not empty. */ /* Check that the syntax name is not empty. */
if (*ptr == '\0' || (*ptr == '"' && if (*ptr == '\0' || (*ptr == '"' &&
(*(ptr + 1) == '\0' || *(ptr + 1) == '"'))) { (*(ptr + 1) == '\0' || *(ptr + 1) == '"'))) {
@ -345,6 +345,7 @@ void begin_new_syntax(char *ptr)
syntaxes = live_syntax; syntaxes = live_syntax;
opensyntax = TRUE; opensyntax = TRUE;
seen_color_command = FALSE;
/* The default syntax should have no associated extensions. */ /* The default syntax should have no associated extensions. */
if (strcmp(live_syntax->name, "default") == 0 && *ptr != '\0') { if (strcmp(live_syntax->name, "default") == 0 && *ptr != '\0') {
@ -358,6 +359,17 @@ void begin_new_syntax(char *ptr)
} }
#endif /* ENABLE_COLOR */ #endif /* ENABLE_COLOR */
/* Verify that a syntax definition contains at least one color command. */
void check_for_nonempty_syntax(void)
{
#ifdef ENABLE_COLOR
if (opensyntax && !seen_color_command)
jot_error(N_("Syntax \"%s\" has no color commands"), live_syntax->name);
opensyntax = FALSE;
#endif
}
/* Return TRUE when the given function is present in almost all menus. */ /* Return TRUE when the given function is present in almost all menus. */
bool is_universal(void (*func)(void)) bool is_universal(void (*func)(void))
{ {
@ -379,9 +391,7 @@ void parse_binding(char *ptr, bool dobind)
int menu, mask = 0; int menu, mask = 0;
funcstruct *f; funcstruct *f;
#ifdef ENABLE_COLOR check_for_nonempty_syntax();
opensyntax = FALSE;
#endif
if (*ptr == '\0') { if (*ptr == '\0') {
jot_error(N_("Missing key name")); jot_error(N_("Missing key name"));
@ -975,7 +985,6 @@ bool parse_syntax_commands(char *keyword, char *ptr)
* to contain only color syntax commands. */ * to contain only color syntax commands. */
void parse_rcfile(FILE *rcstream, bool just_syntax, bool intros_only) void parse_rcfile(FILE *rcstream, bool just_syntax, bool intros_only)
{ {
bool seen_color_command = FALSE;
char *buffer = NULL; char *buffer = NULL;
ssize_t len; ssize_t len;
size_t size = 0; size_t size = 0;
@ -1014,7 +1023,7 @@ void parse_rcfile(FILE *rcstream, bool just_syntax, bool intros_only)
char *syntaxname = ptr; char *syntaxname = ptr;
syntaxtype *sint; syntaxtype *sint;
opensyntax = FALSE; check_for_nonempty_syntax();
ptr = parse_next_word(ptr); ptr = parse_next_word(ptr);
@ -1055,11 +1064,8 @@ void parse_rcfile(FILE *rcstream, bool just_syntax, bool intros_only)
/* Try to parse the keyword. */ /* Try to parse the keyword. */
if (strcasecmp(keyword, "syntax") == 0) { if (strcasecmp(keyword, "syntax") == 0) {
if (intros_only) { if (intros_only) {
if (opensyntax && !seen_color_command) check_for_nonempty_syntax();
jot_error(N_("Syntax \"%s\" has no color commands"),
live_syntax->name);
begin_new_syntax(ptr); begin_new_syntax(ptr);
seen_color_command = FALSE;
} else } else
break; break;
} else if (strcasecmp(keyword, "header") == 0) { } else if (strcasecmp(keyword, "header") == 0) {
@ -1111,9 +1117,7 @@ void parse_rcfile(FILE *rcstream, bool just_syntax, bool intros_only)
if (set == 0) if (set == 0)
continue; continue;
#ifdef ENABLE_COLOR check_for_nonempty_syntax();
opensyntax = FALSE;
#endif
if (*ptr == '\0') { if (*ptr == '\0') {
jot_error(N_("Missing option")); jot_error(N_("Missing option"));
@ -1267,12 +1271,8 @@ void parse_rcfile(FILE *rcstream, bool just_syntax, bool intros_only)
} }
} }
#ifdef ENABLE_COLOR if (intros_only)
if (opensyntax && intros_only && !seen_color_command) check_for_nonempty_syntax();
jot_error(N_("Syntax \"%s\" has no color commands"), live_syntax->name);
opensyntax = FALSE;
#endif
fclose(rcstream); fclose(rcstream);
free(buffer); free(buffer);