lib: lib compiles

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

3 files changed, 60 insertions, 62 deletions

diff --git a/lib/command.c b/lib/command.c
index f18338589..ed2c30ad6 100644
--- a/lib/command.c
+++ b/lib/command.c
@@ -1128,18 +1128,7 @@ DEFUN (config_list,
 }
 
 /* Write current configuration into file. */
-/*
- * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "copy running-config startup-config",
- *     "Copy configuration\n"
- *     "Copy running config to... \n"
- *     "Copy running config to startup config (same as write file)\n"
- *
- * "show running-config",
- *     SHOW_STR
- *     "running configuration\n"
- *
- */
+
 DEFUN (config_write,
        config_write_cmd,
        "write [<file|memory|terminal>]",
@@ -1159,9 +1148,10 @@ DEFUN (config_write,
   struct vty *file_vty;
   struct stat conf_stat;
 
-  // if command was 'write terminal' or 'show running-config'
-  if (argc == 2 && (!strcmp(argv[idx_type]->arg, "terminal") ||
-                    !strcmp(argv[idx_type]->arg, "running-config")))
+  // if command was 'write terminal', 'write memory' or 'show running-config'
+  if (argc == 2 && (!strcmp(argv[idx_type]->text, "terminal") ||
+                    !strcmp(argv[idx_type]->text, "memory") ||
+                    !strcmp(argv[0]->text, "show")))
   {
     if (vty->type == VTY_SHELL_SERV)
       {
@@ -1285,8 +1275,27 @@ finished:
   return ret;
 }
 
+/* ALIAS_FIXME for 'write <terminal|memory>' */
+DEFUN (show_running_config,
+       show_running_config_cmd,
+       "show running-config",
+       SHOW_STR
+       "running configuration (same as write terminal/memory)\n")
+{
+  return config_write (self, vty, argc, argv);
+}
 
-/* Write current configuration into the terminal. */
+/* ALIAS_FIXME for 'write file' */
+DEFUN (copy_runningconf_startupconf,
+       copy_runningconf_startupconf_cmd,
+       "copy running-config startup-config",
+       "Copy configuration\n"
+       "Copy running config to... \n"
+       "Copy running config to startup config (same as write file)\n")
+{
+  return config_write (self, vty, argc, argv);
+}
+/** -- **/
 
 /* Write startup configuration into the terminal. */
 DEFUN (show_startup_config,
@@ -2113,11 +2122,13 @@ void
 install_default (enum node_type node)
 {
   install_element (node, &config_exit_cmd);
+  install_element (node, &config_quit_cmd);
   install_element (node, &config_end_cmd);
   install_element (node, &config_help_cmd);
   install_element (node, &config_list_cmd);
 
   install_element (node, &config_write_cmd);
+  install_element (node, &show_running_config_cmd);
 }
 
 /* Initialize command interface. Install basic nodes and commands. */
@@ -2151,6 +2162,7 @@ cmd_init (int terminal)
     {
       install_element (VIEW_NODE, &config_list_cmd);
       install_element (VIEW_NODE, &config_exit_cmd);
+      install_element (VIEW_NODE, &config_quit_cmd);
       install_element (VIEW_NODE, &config_help_cmd);
       install_element (VIEW_NODE, &config_enable_cmd);
       install_element (VIEW_NODE, &config_terminal_length_cmd);
@@ -2174,6 +2186,7 @@ cmd_init (int terminal)
       install_default (ENABLE_NODE);
       install_element (ENABLE_NODE, &config_disable_cmd);
       install_element (ENABLE_NODE, &config_terminal_cmd);
+      install_element (ENABLE_NODE, &copy_runningconf_startupconf_cmd);
     }
   install_element (ENABLE_NODE, &show_startup_config_cmd);
   install_element (ENABLE_NODE, &show_version_cmd);
diff --git a/lib/if_rmap.c b/lib/if_rmap.c
index 070d55d4b..2afb08c7c 100644
--- a/lib/if_rmap.c
+++ b/lib/if_rmap.c
@@ -209,16 +209,6 @@ if_rmap_unset (const char *ifname, enum if_rmap_type type,
   return 1;
 }
 
-/*
- * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "route-map RMAP_NAME (in|out) IFNAME",
- *     "Route map set\n"
- *     "Route map name\n"
- *     "Route map set for input filtering\n"
- *     "Route map set for output filtering\n"
- *     "Route map interface name\n"
- *
- */
 DEFUN (if_rmap,
        if_rmap_cmd,
        "route-map RMAP_NAME <in|out> IFNAME",
@@ -233,9 +223,9 @@ DEFUN (if_rmap,
   int idx_ifname = 3;
   enum if_rmap_type type;
 
-  if (strncmp (argv[idx_in_out]->arg, "i", 1) == 0)
+  if (strncmp (argv[idx_in_out]->text, "in", 1) == 0)
     type = IF_RMAP_IN;
-  else if (strncmp (argv[idx_in_out]->arg, "o", 1) == 0)
+  else if (strncmp (argv[idx_in_out]->text, "out", 1) == 0)
     type = IF_RMAP_OUT;
   else
     {
@@ -248,18 +238,6 @@ DEFUN (if_rmap,
   return CMD_SUCCESS;
 }
 
-
-/*
- * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "no route-map ROUTEMAP_NAME (in|out) IFNAME",
- *     NO_STR
- *     "Route map unset\n"
- *     "Route map name\n"
- *     "Route map for input filtering\n"
- *     "Route map for output filtering\n"
- *     "Route map interface name\n"
- *
- */
 DEFUN (no_if_rmap,
        no_if_rmap_cmd,
        "no route-map ROUTEMAP_NAME <in|out> IFNAME",
diff --git a/lib/plist.c b/lib/plist.c
index 538660597..5911d6cf7 100644
--- a/lib/plist.c
+++ b/lib/plist.c
@@ -1920,17 +1920,6 @@ DEFUN (ip_prefix_list_description,
   return CMD_SUCCESS;
 }
 
-/*
- * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "no ip prefix-list WORD description .LINE",
- *     NO_STR
- *     IP_STR
- *     PREFIX_LIST_STR
- *     "Name of a prefix list\n"
- *     "Prefix-list specific description\n"
- *     "Up to 80 characters describing this prefix-list\n"
- *
- */
 DEFUN (no_ip_prefix_list_description,
        no_ip_prefix_list_description_cmd,
        "no ip prefix-list WORD description",
@@ -1944,6 +1933,19 @@ DEFUN (no_ip_prefix_list_description,
   return vty_prefix_list_desc_unset (vty, AFI_IP, argv[idx_word]->arg);
 }
 
+/* ALIAS_FIXME */
+DEFUN (no_ip_prefix_list_description_comment,
+       no_ip_prefix_list_description_comment_cmd,
+       "no ip prefix-list WORD description LINE...",
+       NO_STR
+       IP_STR
+       PREFIX_LIST_STR
+       "Name of a prefix list\n"
+       "Prefix-list specific description\n"
+       "Up to 80 characters describing this prefix-list\n")
+{
+  return no_ip_prefix_list_description (self, vty, argc, argv);
+}
 
 DEFUN (show_ip_prefix_list,
        show_ip_prefix_list_cmd,
@@ -2629,17 +2631,6 @@ DEFUN (ipv6_prefix_list_description,
   return CMD_SUCCESS;
 }
 
-/*
- * CHECK ME - The following ALIASes need to be implemented in this DEFUN
- * "no ipv6 prefix-list WORD description .LINE",
- *     NO_STR
- *     IPV6_STR
- *     PREFIX_LIST_STR
- *     "Name of a prefix list\n"
- *     "Prefix-list specific description\n"
- *     "Up to 80 characters describing this prefix-list\n"
- *
- */
 DEFUN (no_ipv6_prefix_list_description,
        no_ipv6_prefix_list_description_cmd,
        "no ipv6 prefix-list WORD description",
@@ -2653,6 +2644,20 @@ DEFUN (no_ipv6_prefix_list_description,
   return vty_prefix_list_desc_unset (vty, AFI_IP6, argv[idx_word]->arg);
 }
 
+/* ALIAS_FIXME */
+DEFUN (no_ipv6_prefix_list_description_comment,
+       no_ipv6_prefix_list_description_comment_cmd,
+       "no ipv6 prefix-list WORD description LINE...",
+       NO_STR
+       IPV6_STR
+       PREFIX_LIST_STR
+       "Name of a prefix list\n"
+       "Prefix-list specific description\n"
+       "Up to 80 characters describing this prefix-list\n")
+{
+  return no_ipv6_prefix_list_description_comment (self, vty, argc, argv);
+}
+
 
 DEFUN (show_ipv6_prefix_list,
        show_ipv6_prefix_list_cmd,
@@ -3172,6 +3177,7 @@ prefix_list_init_ipv4 (void)
 
   install_element (CONFIG_NODE, &ip_prefix_list_description_cmd);
   install_element (CONFIG_NODE, &no_ip_prefix_list_description_cmd);
+  install_element (CONFIG_NODE, &no_ip_prefix_list_description_comment_cmd);
 
   install_element (CONFIG_NODE, &ip_prefix_list_sequence_number_cmd);
   install_element (CONFIG_NODE, &no_ip_prefix_list_sequence_number_cmd);
@@ -3248,6 +3254,7 @@ prefix_list_init_ipv6 (void)
 
   install_element (CONFIG_NODE, &ipv6_prefix_list_description_cmd);
   install_element (CONFIG_NODE, &no_ipv6_prefix_list_description_cmd);
+  install_element (CONFIG_NODE, &no_ipv6_prefix_list_description_comment_cmd);
 
   install_element (CONFIG_NODE, &ipv6_prefix_list_sequence_number_cmd);
   install_element (CONFIG_NODE, &no_ipv6_prefix_list_sequence_number_cmd);