circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-03 06:17:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2014-06-20 12:59:43 +01:00
parent 1544c688e6 c8efffb4db
commit 814e40522c
14 changed files with 220 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
paste.c
View File

@ -175,7 +175,7 @@ paste_add(char *data, size_t size)
int
paste_rename(const char *oldname, const char *newname, char **cause)
{
struct paste_buffer *pb;
struct paste_buffer *pb, *pb_new;
if (cause != NULL)
*cause = NULL;
@ -194,7 +194,14 @@ paste_rename(const char *oldname, const char *newname, char **cause)
pb = paste_get_name(oldname);
if (pb == NULL) {
if (cause != NULL)
xasprintf(cause, "no buffer %s", oldname);
xasprintf(cause, "no buffer %s", oldname);
return (-1);
}
pb_new = paste_get_name(newname);
if (pb_new != NULL) {
if (cause != NULL)
xasprintf(cause, "buffer %s already exists", newname);
return (-1);
}