Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

new Function initPrompt defined; preparation for bug fix

This commit is contained in:
Esteban Lombeyda 2014-04-08 21:45:45 +02:00
parent 0829bc490b
commit 2f3f5f6f5f
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
3rdParty/linenoise/linenoise.c vendored
View File

@ -197,6 +197,7 @@ static void initLinenoiseLine(struct current *current);
static size_t new_line_numbers(size_t pos, int cols, size_t pchars); static size_t new_line_numbers(size_t pos, int cols, size_t pchars);
static int next_allowed_x(size_t pos, int cols, int pchars); static int next_allowed_x(size_t pos, int cols, int pchars);
static void setCursorPosXY(struct current *current, int x, int y); static void setCursorPosXY(struct current *current, int x, int y);
static void initPrompt(struct current *current, const char *prompt);
void linenoiseHistoryFree(void) { void linenoiseHistoryFree(void) {
if (history) { if (history) {
@ -1817,7 +1818,6 @@ int linenoiseColumns(void)
disableRawMode (&current); disableRawMode (&current);
return current.cols; return current.cols;
} }
char *linenoise(const char *prompt) char *linenoise(const char *prompt)
{ {
size_t count; size_t count;
@ -1838,18 +1838,12 @@ char *linenoise(const char *prompt)
} }
else else
{ {
size_t pchars = utf8_strlen(prompt, strlen(prompt));
/* Scan the prompt for embedded ansi color control sequences and
* discount them as characters/columns.
*/
pchars -= countColorControlChars(prompt);
current.buf = buf; current.buf = buf;
current.bufmax = sizeof(buf); current.bufmax = sizeof(buf);
current.len = 0; current.len = 0;
current.chars = 0; current.chars = 0;
current.pos = 0; current.pos = 0;
current.prompt = prompt; initPrompt(&current, prompt);
current.pchars = pchars;
current.capture = NULL; current.capture = NULL;
initLinenoiseLine(&current); initLinenoiseLine(&current);
@ -1866,6 +1860,15 @@ char *linenoise(const char *prompt)
return strdup(buf); return strdup(buf);
} }
static void initPrompt(struct current *current, const char *prompt) {
size_t pchars = utf8_strlen(prompt, strlen(prompt));
/* Scan the prompt for embedded ansi color control sequences and
* discount them as characters/columns.
*/
pchars -= countColorControlChars(prompt);
current->prompt = prompt;
current->pchars = pchars;
}
/* Using a circular buffer is smarter, but a bit more complex to handle. */ /* Using a circular buffer is smarter, but a bit more complex to handle. */
int linenoiseHistoryAdd(const char *line) { int linenoiseHistoryAdd(const char *line) {
char *linecopy; char *linecopy;