Helper function to set Lbufname

smaclennan · smaclennan · commit e45bc43d3c38 · 2018-07-15T11:29:02.000-04:00
diff --git a/bcmds.c b/bcmds.c
@@ -30,6 +30,12 @@ static struct zbuff *Bufflist_tail;
 struct zbuff *Curbuff;		/* the current buffer */
 struct buff *Bbuff;         /* the current low-level buffer */
 
+/* Set Lbufname */
+void set_last_bufname(struct zbuff *buff)
+{
+	strlcpy(Lbufname, buff->bname, sizeof(Lbufname));
+}
+
 /* Get the word at the current buffer point and store in 'word'.
  * Get at the most 'max' characters.
  * Leaves the point alone.
@@ -86,15 +92,15 @@ static void switchto_part(void)
 void Zswitch_to_buffer(void)
 {
 	int rc;
-	char *was = Curbuff->bname;
+	struct zbuff *was = Curbuff;
 
 	Arg = 0;
 	Nextpart = switchto_part;
 	rc = getplete("Buffer: ", Lbufname, Bnames, sizeof(char *), Numbnames);
 	Nextpart = NULL;
 	if (rc == -1)
 		return;
-	strlcpy(Lbufname, was, sizeof(Lbufname));
+	set_last_bufname(was);
 	uncomment(Curbuff);
 	cswitchto(cfindbuff(Bnames[rc]));
 }
@@ -106,7 +112,7 @@ void Znext_buffer(void)
 	if (!next)
 		next = Bufflist;
 	if (next) {
-		strlcpy(Lbufname, Curbuff->bname, sizeof(Lbufname));
+		set_last_bufname(Curbuff);
 		uncomment(Curbuff);
 		cswitchto(next);
 		reframe();
diff --git a/file.c b/file.c
@@ -320,18 +320,17 @@ static bool readone(char *bname, char *path)
 	else if (access(path, R_OK | W_OK) == EOF)
 		Curbuff->bmode |= VIEW;
 #endif
-	strcpy(Lbufname, was->bname);
+	set_last_bufname(was);
 	return true;
 }
 
 bool findfile(char *path)
 {
 	char tbname[BUFNAMMAX + 1];
-	char *was;
 	struct zbuff *tbuff;
+	struct zbuff *was = Curbuff;
 
 	Arg = 0;
-	was = Curbuff->bname;
 
 	/* limit name to BUFNAMMAX */
 	strncpy(tbname, lastpart(path), BUFNAMMAX);
@@ -345,7 +344,7 @@ bool findfile(char *path)
 			zswitchto(tbuff);
 			if (Initializing)
 				return true;
-			strcpy(Lbufname, was);
+			set_last_bufname(was);
 			break;
 		}
 
diff --git a/tags.c b/tags.c
@@ -194,7 +194,7 @@ void Znext_bookmark(void)
 	}
 
 	if (Bookmrks[Bookmark]->mbuff != Bbuff) {
-		strcpy(Lbufname, Curbuff->bname);
+		set_last_bufname(Curbuff);
 		wgoto(Bookmrks[Bookmark]->mbuff);
 	}
 	bpnttomrk(Bbuff, Bookmrks[Bookmark]);
diff --git a/z.c b/z.c
@@ -264,9 +264,7 @@ int main(int argc, char **argv)
 	if (tbuff) {
 		zswitchto(tbuff);
 
-		strlcpy(Lbufname,
-				Curbuff->prev ? Curbuff->prev->bname : MAINBUFF,
-				BUFNAMMAX + 1);
+		set_last_bufname(Curbuff->prev ? Curbuff->prev : Curbuff);
 	}
 
 	winit();
diff --git a/z.h b/z.h
@@ -189,7 +189,6 @@ extern int raw_mode;
 
 #define CMD(n) (*Cmds[n][Curcmds])()
 
-extern char Lbufname[];
 extern struct zbuff *Bufflist;
 extern struct zbuff *Buff_save;
 extern struct mark *Sstart;
@@ -215,6 +214,8 @@ extern void (*Nextpart)(void);
 #endif
 #define T_REGION		T_REVERSE
 
+void set_last_bufname(struct zbuff *buff);
+
 char *zgetcwd(char *cwd, int len);
 #ifdef WIN32
 char *gethomedir(void);

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ void Znext_bookmark(void)`
`194`	`194`	`}`
`195`	`195`
`196`	`196`	`if (Bookmrks[Bookmark]->mbuff != Bbuff) {`
`197`		`- strcpy(Lbufname, Curbuff->bname);`
	`197`	`+ set_last_bufname(Curbuff);`
`198`	`198`	`wgoto(Bookmrks[Bookmark]->mbuff);`
`199`	`199`	`}`
`200`	`200`	`bpnttomrk(Bbuff, Bookmrks[Bookmark]);`
Original file line number	Diff line number	Diff line change
`@@ -264,9 +264,7 @@ int main(int argc, char **argv)`
`264`	`264`	`if (tbuff) {`
`265`	`265`	`zswitchto(tbuff);`
`266`	`266`
`267`		`- strlcpy(Lbufname,`
`268`		`- Curbuff->prev ? Curbuff->prev->bname : MAINBUFF,`
`269`		`- BUFNAMMAX + 1);`
	`267`	`+ set_last_bufname(Curbuff->prev ? Curbuff->prev : Curbuff);`
`270`	`268`	`}`
`271`	`269`
`272`	`270`	`winit();`