commit 847e80dc98553be652f597e6ea8b910a1dc68208
from: Omar Polo <op@omarpolo.com>
date: Wed Dec 21 14:37:17 2022 UTC

kamiftp: refactor ftp_remote_files

no functional changes

commit - 4c9b5bd42a49733fa228b2f478c242d3c45d780a
commit + 847e80dc98553be652f597e6ea8b910a1dc68208
blob - b9aaab8a1db0dda67324e25e2634cf638026f330
blob + c6ca0698eca3411a0a87480049a1ca87160ab027
--- kamiftp/rl.c
+++ kamiftp/rl.c
@@ -282,14 +282,12 @@ ftp_dirent_generator(const char *text, int state)
 static char **
 ftp_remote_files(const char *text, int start, int end)
 {
-	const char	*dir;
-	char		 t[PATH_MAX];
-	char		*s, *e;
+	char		*t, dir[PATH_MAX];
 
-	strlcpy(t, text, sizeof(t));
-	cleanword(t, 0);
+	strlcpy(dir, text, sizeof(dir));
+	cleanword(dir, 0);
 
-	if (!strcmp(t, "..")) {
+	if (!strcmp(dir, "..")) {
 		char **cs;
 		if ((cs = calloc(2, sizeof(*cs))) == NULL)
 			return NULL;
@@ -297,16 +295,17 @@ ftp_remote_files(const char *text, int start, int end)
 		return cs;
 	}
 
-	s = t;
-	if (!strncmp(s, "./", 2)) {
-		s++;
-		while (*s == '/')
-			s++;
+	t = dir;
+	if (!strncmp(t, "./", 2)) {
+		t++;
+		while (*t == '/')
+			t++;
 	}
+	if (t != dir)
+		memmove(dir, t, strlen(t) + 1);
 
-	if ((e = strrchr(s, '/')) != NULL)
-		e[1] = '\0';
-	dir = t;
+	if ((t = strrchr(dir, '/')) != NULL)
+		t[1] = '\0';
 
 	if (!strcmp(dir, "."))
 		strlcpy(compl_prfx, "", sizeof(compl_prfx));