diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/command.c | 30 | ||||
| -rw-r--r-- | lib/if.c | 2 | ||||
| -rw-r--r-- | lib/routemap.c | 2 | ||||
| -rw-r--r-- | lib/vty.c | 5 |
4 files changed, 18 insertions, 21 deletions
diff --git a/lib/command.c b/lib/command.c index ad197468a5..c9fbaf47be 100644 --- a/lib/command.c +++ b/lib/command.c @@ -1349,7 +1349,7 @@ DEFUN (show_version, vty_out (vty, "%s %s (%s).\n", FRR_FULL_NAME, FRR_VERSION, host.name ? host.name : ""); vty_out (vty, "%s%s\n", FRR_COPYRIGHT, GIT_INFO); - vty_out (vty, "configured with:%s %s\n", VTYNL, + vty_out (vty, "configured with:\n %s\n", FRR_CONFIG_ARGS); return CMD_SUCCESS; @@ -1374,20 +1374,18 @@ DEFUN (config_help, "Description of the interactive help system\n") { vty_out (vty, - "Quagga VTY provides advanced help feature. When you need help,%s\ -anytime at the command line please press '?'.%s\ -%s\ -If nothing matches, the help list will be empty and you must backup%s\ - until entering a '?' shows the available options.%s\ -Two styles of help are provided:%s\ -1. Full help is available when you are ready to enter a%s\ -command argument (e.g. 'show ?') and describes each possible%s\ -argument.%s\ -2. Partial help is provided when an abbreviated argument is entered%s\ - and you want to know what arguments match the input%s\ - (e.g. 'show me?'.)%s\n", VTYNL, VTYNL, VTYNL, - VTYNL, VTYNL, VTYNL, VTYNL, VTYNL, - VTYNL, VTYNL, VTYNL, VTYNL); + "Quagga VTY provides advanced help feature. When you need help,\n\ +anytime at the command line please press '?'.\n\ +\n\ +If nothing matches, the help list will be empty and you must backup\n\ + until entering a '?' shows the available options.\n\ +Two styles of help are provided:\n\ +1. Full help is available when you are ready to enter a\n\ +command argument (e.g. 'show ?') and describes each possible\n\ +argument.\n\ +2. Partial help is provided when an abbreviated argument is entered\n\ + and you want to know what arguments match the input\n\ + (e.g. 'show me?'.)\n\n"); return CMD_SUCCESS; } @@ -1488,7 +1486,7 @@ vty_write_config (struct vty *vty) if (vty->type == VTY_TERM) { - vty_out (vty, "%sCurrent configuration:\n",VTYNL); + vty_out (vty, "\nCurrent configuration:\n"); vty_out (vty, "!\n"); } @@ -818,7 +818,7 @@ DEFUN (show_address_vrf_all, if (!vrf->iflist || !listcount (vrf->iflist)) continue; - vty_out (vty, "%sVRF %u%s%s", VTYNL, vrf->vrf_id, VTYNL, + vty_out (vty, "\nVRF %u%s%s", vrf->vrf_id, VTYNL, VTYNL); for (ALL_LIST_ELEMENTS_RO (vrf->iflist, node, ifp)) diff --git a/lib/routemap.c b/lib/routemap.c index 6e483234a6..5e5f804bf0 100644 --- a/lib/routemap.c +++ b/lib/routemap.c @@ -1003,7 +1003,7 @@ vty_show_route_map_entry (struct vty *vty, struct route_map *map) /* Description */ if (index->description) - vty_out (vty, " Description:%s %s\n", VTYNL, + vty_out (vty, " Description:\n %s\n", index->description); /* Match clauses */ @@ -1759,8 +1759,7 @@ vty_create (int vty_sock, union sockunion *su) /* Say hello to the world. */ vty_hello (vty); if (! no_password_check) - vty_out (vty, "%sUser Access Verification%s\n", VTYNL, - VTYNL); + vty_out (vty, "\nUser Access Verification\n\n"); /* Setting up terminal. */ vty_will_echo (vty); @@ -2320,7 +2319,7 @@ vty_timeout (struct thread *thread) /* Clear buffer*/ buffer_reset (vty->obuf); - vty_out (vty, "%sVty connection is timed out.\n", VTYNL); + vty_out (vty, "\nVty connection is timed out.\n"); /* Close connection. */ vty->status = VTY_CLOSE; |