diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2014-06-21 19:48:03 +0100 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2014-06-21 19:48:03 +0100 |
| commit | f8481f93c5fc92f5503a2bdd94c60375a2c81bb5 (patch) | |
| tree | e8cd0d3a0cfc16a5d602a9143d301b818953ec68 /paste.c | |
| parent | cddf50b715be8732ffd0732d33a886b788a231c5 (diff) | |
| parent | 0c5ed177c4e5178127dc8fe3528985df8ff988a6 (diff) | |
| download | rtmux-f8481f93c5fc92f5503a2bdd94c60375a2c81bb5.tar.gz rtmux-f8481f93c5fc92f5503a2bdd94c60375a2c81bb5.tar.bz2 rtmux-f8481f93c5fc92f5503a2bdd94c60375a2c81bb5.zip | |
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
Diffstat (limited to 'paste.c')
| -rw-r--r-- | paste.c | 11 |
1 files changed, 9 insertions, 2 deletions
@@ -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); } |