From 146f24e5de94759349d0b1cdc54daca6514da79d Mon Sep 17 00:00:00 2001
From: Arun Prakash Jana <engineerarun@gmail.com>
Date: Sun, 1 Mar 2020 21:00:45 +0530
Subject: [PATCH] Use target vars to create dirs

---
 src/nnn.c | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/nnn.c b/src/nnn.c
index 48df0b05..1443e671 100644
--- a/src/nnn.c
+++ b/src/nnn.c
@@ -6508,10 +6508,8 @@ static bool setup_config(void)
 	DPRINTF_S(cfgdir);
 
 	/* Create ~/.config/nnn/plugins */
-	xstrlcpy(cfgdir + r + 4 - 1, "/plugins", 9); /* subtract length of "/nnn" (4) */
-	DPRINTF_S(cfgdir);
-
-	xstrlcpy(plugindir, cfgdir, len);
+	xstrlcpy(plugindir, cfgdir, PATH_MAX);
+	xstrlcpy(plugindir + r + 4 - 1, "/plugins", 9); /* subtract length of "/nnn" (4) */
 	DPRINTF_S(plugindir);
 
 	if (access(plugindir, F_OK) && !xmktree(plugindir, TRUE)) {
@@ -6520,10 +6518,8 @@ static bool setup_config(void)
 	}
 
 	/* Create ~/.config/nnn/sessions */
-	xstrlcpy(cfgdir + r + 4 - 1, "/sessions", 10); /* subtract length of "/nnn" (4) */
-	DPRINTF_S(cfgdir);
-
-	xstrlcpy(sessiondir, cfgdir, len);
+	xstrlcpy(sessiondir, cfgdir, PATH_MAX);
+	xstrlcpy(sessiondir + r + 4 - 1, "/sessions", 10); /* subtract length of "/nnn" (4) */
 	DPRINTF_S(sessiondir);
 
 	if (access(sessiondir, F_OK) && !xmktree(sessiondir, TRUE)) {
@@ -6531,10 +6527,6 @@ static bool setup_config(void)
 		return FALSE;
 	}
 
-	/* Reset to config path */
-	cfgdir[r + 3] = '\0';
-	DPRINTF_S(cfgdir);
-
 	/* Set selection file path */
 	if (!cfg.picker) {
 		/* Length of "/.config/nnn/.selection" */