From: Quentin Young <qlyoung@cumulusnetworks.com>
Date: Wed, 27 Sep 2017 02:41:47 +0000 (-0400)
Subject: vtysh: remove extra / in config path
X-Git-Tag: frr-4.0-dev~262^2~1
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=e82314b1bf75ee7240e70a8e97aac8dccbe5d061;p=mirror%2Ffrr.git

vtysh: remove extra / in config path

before:

frrdev# do wr
Note: this version of vtysh never writes vtysh.conf
Building Configuration...
Integrated configuration saved to /etc/frr//frr.conf
[OK]
frrdev#

after:

frrdev# do wr
Note: this version of vtysh never writes vtysh.conf
Building Configuration...
Integrated configuration saved to /etc/frr/frr.conf
[OK]
frrdev#

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

diff --git a/vtysh/vtysh_main.c b/vtysh/vtysh_main.c
index 003853571f..99c05ef79b 100644
--- a/vtysh/vtysh_main.c
+++ b/vtysh/vtysh_main.c
@@ -404,9 +404,9 @@ int main(int argc, char **argv, char **env)
 			"NOT SUPPORTED since its\nresults are inconsistent!\n");
 	}
 
-	snprintf(vtysh_config, sizeof(vtysh_config), "%s%s/%s", sysconfdir,
+	snprintf(vtysh_config, sizeof(vtysh_config), "%s%s%s", sysconfdir,
 		 pathspace, VTYSH_CONFIG_NAME);
-	snprintf(frr_config, sizeof(frr_config), "%s%s/%s", sysconfdir,
+	snprintf(frr_config, sizeof(frr_config), "%s%s%s", sysconfdir,
 		 pathspace, FRR_CONFIG_NAME);
 	strlcat(vtydir, pathspace, sizeof(vtydir));