From 277f341d2bf818a90a0466e043c5e2bb011480ed Mon Sep 17 00:00:00 2001
From: Witold Filipczyk <witekfl@poczta.onet.pl>
Date: Sun, 30 Jan 2022 18:12:38 +0100
Subject: [PATCH] [terminal] exec_on_terminal and related rewritten a bit to
 allow const param

---
 src/osdep/osdep.c       | 18 ++++++++++++++----
 src/osdep/osdep.h       |  2 +-
 src/terminal/kbd.c      | 15 ++++++++++++---
 src/terminal/kbd.h      |  2 +-
 src/terminal/terminal.c |  8 ++++----
 src/terminal/terminal.h |  2 +-
 6 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/src/osdep/osdep.c b/src/osdep/osdep.c
index 346b8538..e1437ace 100644
--- a/src/osdep/osdep.c
+++ b/src/osdep/osdep.c
@@ -463,7 +463,7 @@ set_clipboard_text(char *data)
 
 /* Set xterm-like term window's title. */
 void
-set_window_title(char *title, int codepage)
+set_window_title(const char *ctitle, int codepage)
 {
 	struct string filtered;
 
@@ -472,10 +472,19 @@ set_window_title(char *title, int codepage)
 	if (!is_xterm()) return;
 #endif
 
-	if (!init_string(&filtered)) return;
+	if (!init_string(&filtered)) {
+		return;
+	}
 
 	/* Copy title to filtered if different from NULL */
-	if (title) {
+	if (ctitle) {
+		char *title = stracpy(ctitle);
+
+		if (!title) {
+			done_string(&filtered);
+			return;
+		}
+
 		char *scan = title;
 		char *end = title + strlen(title);
 
@@ -488,7 +497,7 @@ set_window_title(char *title, int codepage)
 		 * potential alternative set_window_title() routines might
 		 * want to take different precautions. */
 		for (;;) {
-			char *charbegin = scan;
+			const char *charbegin = scan;
 			unicode_val_T unicode
 				= cp_to_unicode(codepage, &scan, end);
 			int charlen = scan - charbegin;
@@ -519,6 +528,7 @@ set_window_title(char *title, int codepage)
 
 			add_bytes_to_string(&filtered, charbegin, charlen);
 		}
+		mem_free(title);
 	}
 
 	/* Send terminal escape sequence + title string */
diff --git a/src/osdep/osdep.h b/src/osdep/osdep.h
index 92f56dd7..ebc839bb 100644
--- a/src/osdep/osdep.h
+++ b/src/osdep/osdep.h
@@ -42,7 +42,7 @@ void resume_mouse(void *);
 int start_thread(void (*)(void *, int), void *, int);
 char *get_clipboard_text(void);
 void set_clipboard_text(char *);
-void set_window_title(char *, int codepage);
+void set_window_title(const char *, int codepage);
 char *get_window_title(int codepage);
 void block_stdin(void);
 void unblock_stdin(void);
diff --git a/src/terminal/kbd.c b/src/terminal/kbd.c
index b6d3d393..4734ab84 100644
--- a/src/terminal/kbd.c
+++ b/src/terminal/kbd.c
@@ -483,15 +483,22 @@ free_itrm(struct itrm *itrm)
  * @a text should look like "width,height,old-width,old-height"
  * where width and height are integers. */
 static inline void
-resize_terminal_from_str(char *text)
+resize_terminal_from_str(const char *text_)
 {
 	enum { NEW_WIDTH = 0, NEW_HEIGHT, OLD_WIDTH, OLD_HEIGHT, NUMBERS };
 	int numbers[NUMBERS];
 	int i;
+	char *text2, *text;
 
-	assert(text && *text);
+	assert(text_ && *text_);
 	if_assert_failed return;
 
+	text2 = stracpy(text_);
+	if (!text2) {
+		return;
+	}
+	text = text2;
+
 	for (i = 0; i < NUMBERS; i++) {
 		char *p = strchr(text, ',');
 
@@ -499,6 +506,7 @@ resize_terminal_from_str(char *text)
 			*p++ = '\0';
 
 		} else if (i < OLD_HEIGHT) {
+			mem_free(text2);
 			return;
 		}
 
@@ -510,10 +518,11 @@ resize_terminal_from_str(char *text)
 	resize_window(numbers[NEW_WIDTH], numbers[NEW_HEIGHT],
 		      numbers[OLD_WIDTH], numbers[OLD_HEIGHT]);
 	resize_terminal();
+	mem_free(text2);
 }
 
 void
-dispatch_special(char *text)
+dispatch_special(const char *text)
 {
 	switch (text[0]) {
 		case TERM_FN_TITLE:
diff --git a/src/terminal/kbd.h b/src/terminal/kbd.h
index e561b57b..f7ff8272 100644
--- a/src/terminal/kbd.h
+++ b/src/terminal/kbd.h
@@ -139,7 +139,7 @@ void block_itrm(void);
 int unblock_itrm(void);
 void free_all_itrms(void);
 void resize_terminal(void);
-void dispatch_special(char *);
+void dispatch_special(const char *);
 void kbd_ctrl_c(void);
 int is_blocked(void);
 void get_terminal_name(char[MAX_TERM_LEN]);
diff --git a/src/terminal/terminal.c b/src/terminal/terminal.c
index d46db4f8..03a09b09 100644
--- a/src/terminal/terminal.c
+++ b/src/terminal/terminal.c
@@ -278,7 +278,7 @@ assert_terminal_ptr_not_dangling(const struct terminal *suspect)
 static void
 exec_on_master_terminal(struct terminal *term,
 			char *path, int plen,
-		 	char *delete_, int dlen,
+			const char *delete_, int dlen,
 			term_exec_T fg)
 {
 	int blockh;
@@ -320,8 +320,8 @@ exec_on_master_terminal(struct terminal *term,
 
 static void
 exec_on_slave_terminal( struct terminal *term,
-		 	char *path, int plen,
-		 	char *delete_, int dlen,
+			char *path, int plen,
+			const char *delete_, int dlen,
 			term_exec_T fg)
 {
 	int data_size = plen + dlen + 1 /* 0 */ + 1 /* fg */ + 2 /* 2 null char */;
@@ -339,7 +339,7 @@ exec_on_slave_terminal( struct terminal *term,
 
 void
 exec_on_terminal(struct terminal *term, char *path,
-		 char *delete_, term_exec_T fg)
+		 const char *delete_, term_exec_T fg)
 {
 	if (path) {
 		if (!*path) return;
diff --git a/src/terminal/terminal.h b/src/terminal/terminal.h
index 67230f4a..65c1be28 100644
--- a/src/terminal/terminal.h
+++ b/src/terminal/terminal.h
@@ -232,7 +232,7 @@ enum term_exec {
 
 typedef int term_exec_T;
 
-void exec_on_terminal(struct terminal *, char *, char *, term_exec_T);
+void exec_on_terminal(struct terminal *, char *, const char *, term_exec_T);
 void exec_shell(struct terminal *term);
 
 int set_terminal_title(struct terminal *, char *);