if (!parse_set (lexer, ds, &cmd, NULL))
{
- free_set (&cmd);
return CMD_FAILURE;
}
lex_match (lexer, T_EQUALS);
if (lex_match_id (lexer, "VALUES"))
- {
- settings_set_value_style (SETTINGS_VAL_STYLE_VALUES);
- }
+ settings_set_show_values (SETTINGS_VALUE_SHOW_VALUE);
else if (lex_match_id (lexer, "LABELS"))
- {
- settings_set_value_style (SETTINGS_VAL_STYLE_LABELS);
- }
+ settings_set_show_values (SETTINGS_VALUE_SHOW_LABEL);
else if (lex_match_id (lexer, "BOTH"))
- {
- settings_set_value_style (SETTINGS_VAL_STYLE_BOTH);
- }
+ settings_set_show_values (SETTINGS_VALUE_SHOW_BOTH);
else
{
- lex_error_expecting (lexer, "VALUES", "LABELS", "BOTH", NULL_SENTINEL);
+ lex_error_expecting (lexer, "VALUES", "LABELS", "BOTH");
return 0;
}
lex_match (lexer, T_EQUALS);
if (lex_match_id (lexer, "NAMES"))
- {
- settings_set_var_style (SETTINGS_VAR_STYLE_NAMES);
- }
+ settings_set_show_variables (SETTINGS_VALUE_SHOW_VALUE);
else if (lex_match_id (lexer, "LABELS"))
- {
- settings_set_var_style (SETTINGS_VAR_STYLE_LABELS);
- }
+ settings_set_show_variables (SETTINGS_VALUE_SHOW_LABEL);
else if (lex_match_id (lexer, "BOTH"))
- {
- settings_set_var_style (SETTINGS_VAR_STYLE_BOTH);
- }
+ settings_set_show_variables (SETTINGS_VALUE_SHOW_BOTH);
else
{
- lex_error_expecting (lexer, "NAMES", "LABELS", "BOTH", NULL_SENTINEL);
+ lex_error_expecting (lexer, "NAMES", "LABELS", "BOTH");
return 0;
}
if (!fmt_check_output (&fmt))
return 0;
-
+
if (fmt_is_string (fmt.type))
{
char str[FMT_STRING_LEN_MAX + 1];
{
len <<= 1;
buf = xrealloc (buf, len);
- }
+ }
while (NULL == (wd = getcwd (buf, len)));
return wd;