mirrors/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-05-23 21:30:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2026-04-28 12:01:08 +01:00
parent c2659401b0 746dd91e86
commit 8da41bdc2b
5 changed files with 41 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
paste.c
View File

@@ -204,6 +204,7 @@ int
paste_rename(const char *oldname, const char *newname, char **cause)
{
struct paste_buffer *pb, *pb_new;
char *name;
if (cause != NULL)
*cause = NULL;
@@ -219,23 +220,33 @@ paste_rename(const char *oldname, const char *newname, char **cause)
return (-1);
}
name = clean_name(newname, "");
if (name == NULL) {
if (cause != NULL)
xasprintf(cause, "invalid buffer name: %s", newname);
return (-1);
}
pb = paste_get_name(oldname);
if (pb == NULL) {
if (cause != NULL)
xasprintf(cause, "no buffer %s", oldname);
free(name);
return (-1);
}
pb_new = paste_get_name(newname);
if (pb_new == pb)
pb_new = paste_get_name(name);
if (pb_new == pb) {
free(name);
return (0);
}
if (pb_new != NULL)
paste_free(pb_new);
RB_REMOVE(paste_name_tree, &paste_by_name, pb);
free(pb->name);
pb->name = xstrdup(newname);
pb->name = name;
if (pb->automatic)
paste_num_automatic--;
@@ -244,7 +255,7 @@ paste_rename(const char *oldname, const char *newname, char **cause)
RB_INSERT(paste_name_tree, &paste_by_name, pb);
notify_paste_buffer(oldname, 1);
notify_paste_buffer(newname, 0);
notify_paste_buffer(pb->name, 0);
return (0);
}
@@ -257,6 +268,7 @@ int
paste_set(char *data, size_t size, const char *name, char **cause)
{
struct paste_buffer *pb, *old;
char *newname;
if (cause != NULL)
*cause = NULL;
@@ -276,9 +288,16 @@ paste_set(char *data, size_t size, const char *name, char **cause)
return (-1);
}
newname = clean_name(name, "");
if (newname == NULL) {
if (cause != NULL)
xasprintf(cause, "invalid buffer name: %s", name);
return (-1);
}
pb = xmalloc(sizeof *pb);
pb->name = xstrdup(name);
pb->name = newname;
pb->data = data;
pb->size = size;
@@ -288,13 +307,13 @@ paste_set(char *data, size_t size, const char *name, char **cause)
pb->created = time(NULL);
if ((old = paste_get_name(name)) != NULL)
if ((old = paste_get_name(pb->name)) != NULL)
paste_free(old);
RB_INSERT(paste_name_tree, &paste_by_name, pb);
RB_INSERT(paste_time_tree, &paste_by_time, pb);
notify_paste_buffer(name, 0);
notify_paste_buffer(pb->name, 0);
return (0);
}