diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-05-02 20:58:45 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-05-02 20:58:45 +0300 |
| commit | e415ba0fb2c57eaf370e84a3a9c8d831f820a560 (patch) | |
| tree | f113a8024de4ee4f1bc19aae98c19a2835f5b4e7 /cmd-line-utils | |
| parent | 046418ad956c98c3788d79650fcb50479844df3b (diff) | |
| parent | a1f7ceb281f9d87c9baea125ebab26f99a0370f8 (diff) | |
| download | mariadb-git-e415ba0fb2c57eaf370e84a3a9c8d831f820a560.tar.gz | |
Merge with MySQL 5.1.57/58
Moved some BSD string functions from Unireg
Diffstat (limited to 'cmd-line-utils')
| -rw-r--r-- | cmd-line-utils/libedit/vi.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/cmd-line-utils/libedit/vi.c b/cmd-line-utils/libedit/vi.c index b1827fc98f1..beffc7b40b5 100644 --- a/cmd-line-utils/libedit/vi.c +++ b/cmd-line-utils/libedit/vi.c @@ -1012,9 +1012,10 @@ vi_histedit(EditLine *el, int c __attribute__((__unused__))) if (fd < 0) return CC_ERROR; cp = el->el_line.buffer; - if (write(fd, cp, el->el_line.lastchar - cp +0u) == -1 || - write(fd, "\n", 1) == -1) - return CC_ERROR; + if (write(fd, cp, el->el_line.lastchar - cp +0u) == -1) + goto error; + if (write(fd, "\n", 1) == -1) + goto error; pid = fork(); switch (pid) { case -1: @@ -1042,6 +1043,12 @@ vi_histedit(EditLine *el, int c __attribute__((__unused__))) unlink(tempfile); /* return CC_REFRESH; */ return ed_newline(el, 0); + +/* XXXMYSQL: Avoid compiler warnings. */ +error: + close(fd); + unlink(tempfile); + return CC_ERROR; } /* vi_history_word(): |