proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 23:58:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vtysh --markfile needs to ignore the "end" lines

Browse Source 
Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Reviewed-by:   Donald Sharp <sharpd@cumulusnetworks.com>

Ticket: CM-12515
This commit is contained in:
Daniel Walton 2016-08-18 17:47:01 +00:00
parent c05795b16b
commit a5b89524bc
1 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
vtysh/vtysh.c
View File

@ -504,6 +504,28 @@ vtysh_execute (const char *line)
return vtysh_execute_func (line, 1); return vtysh_execute_func (line, 1);
} }
static char *
trim (char *s)
{
size_t size;
char *end;
size = strlen(s);
if (!size)
return s;
end = s + size - 1;
while (end >= s && isspace(*end))
end--;
*(end + 1) = '\0';
while (*s && isspace(*s))
s++;
return s;
}
int int
vtysh_mark_file (const char *filename) vtysh_mark_file (const char *filename)
{ {
@ -515,6 +537,8 @@ vtysh_mark_file (const char *filename)
struct cmd_element *cmd; struct cmd_element *cmd;
int saved_ret, prev_node; int saved_ret, prev_node;
int lineno = 0; int lineno = 0;
char *vty_buf_copy = NULL;
char *vty_buf_trimmed = NULL;
if (strncmp("-", filename, 1) == 0) if (strncmp("-", filename, 1) == 0)
confp = stdin; confp = stdin;
@ -535,13 +559,16 @@ vtysh_mark_file (const char *filename)
vtysh_execute_no_pager ("enable"); vtysh_execute_no_pager ("enable");
vtysh_execute_no_pager ("configure terminal"); vtysh_execute_no_pager ("configure terminal");
vty_buf_copy = XCALLOC (MTYPE_VTY, VTY_BUFSIZ);
while (fgets (vty->buf, VTY_BUFSIZ, confp)) while (fgets (vty->buf, VTY_BUFSIZ, confp))
{ {
lineno++; lineno++;
tried = 0; tried = 0;
strcpy(vty_buf_copy, vty->buf);
vty_buf_trimmed = trim(vty_buf_copy);
if (vty->buf[0] == '!' || vty->buf[1] == '#') if (vty_buf_trimmed[0] == '!' || vty_buf_trimmed[0] == '#')
{ {
fprintf(stdout, "%s", vty->buf); fprintf(stdout, "%s", vty->buf);
continue; continue;
@ -556,6 +583,12 @@ vtysh_mark_file (const char *filename)
continue; continue;
} }
/* Ignore the "end" lines, we will generate these where appropriate */
if (strlen(vty_buf_trimmed) == 3 && strncmp("end", vty_buf_trimmed, 3) == 0)
{
continue;
}
prev_node = vty->node; prev_node = vty->node;
saved_ret = ret = cmd_execute_command_strict (vline, vty, &cmd); saved_ret = ret = cmd_execute_command_strict (vline, vty, &cmd);
@ -606,21 +639,25 @@ vtysh_mark_file (const char *filename)
fprintf (stderr,"line %d: Warning...: %s\n", lineno, vty->buf); fprintf (stderr,"line %d: Warning...: %s\n", lineno, vty->buf);
fclose(confp); fclose(confp);
vty_close(vty); vty_close(vty);
XFREE(MTYPE_VTY, vty_buf_copy);
return CMD_WARNING; return CMD_WARNING;
case CMD_ERR_AMBIGUOUS: case CMD_ERR_AMBIGUOUS:
fprintf (stderr,"line %d: %% Ambiguous command: %s\n", lineno, vty->buf); fprintf (stderr,"line %d: %% Ambiguous command: %s\n", lineno, vty->buf);
fclose(confp); fclose(confp);
vty_close(vty); vty_close(vty);
XFREE(MTYPE_VTY, vty_buf_copy);
return CMD_ERR_AMBIGUOUS; return CMD_ERR_AMBIGUOUS;
case CMD_ERR_NO_MATCH: case CMD_ERR_NO_MATCH:
fprintf (stderr,"line %d: %% Unknown command: %s\n", lineno, vty->buf); fprintf (stderr,"line %d: %% Unknown command: %s\n", lineno, vty->buf);
fclose(confp); fclose(confp);
vty_close(vty); vty_close(vty);
XFREE(MTYPE_VTY, vty_buf_copy);
return CMD_ERR_NO_MATCH; return CMD_ERR_NO_MATCH;
case CMD_ERR_INCOMPLETE: case CMD_ERR_INCOMPLETE:
fprintf (stderr,"line %d: %% Command incomplete: %s\n", lineno, vty->buf); fprintf (stderr,"line %d: %% Command incomplete: %s\n", lineno, vty->buf);
fclose(confp); fclose(confp);
vty_close(vty); vty_close(vty);
XFREE(MTYPE_VTY, vty_buf_copy);
return CMD_ERR_INCOMPLETE; return CMD_ERR_INCOMPLETE;
case CMD_SUCCESS: case CMD_SUCCESS:
fprintf(stdout, "%s", vty->buf); fprintf(stdout, "%s", vty->buf);
@ -652,6 +689,7 @@ vtysh_mark_file (const char *filename)
/* This is the end */ /* This is the end */
fprintf(stdout, "end\n"); fprintf(stdout, "end\n");
vty_close(vty); vty_close(vty);
XFREE(MTYPE_VTY, vty_buf_copy);
if (confp != stdin) if (confp != stdin)
fclose(confp); fclose(confp);