*
* You can find the latest source code at:
*
- * http://github.com/antirez/linenoise
+ * http://github.com/msteveb/linenoise
+ * (forked from http://github.com/antirez/linenoise)
*
* Does a number of crazy assumptions that happen to be true in 99.9999% of
* the 2010 UNIX computers around.
*
* Copyright (c) 2010, Salvatore Sanfilippo <antirez at gmail dot com>
* Copyright (c) 2010, Pieter Noordhuis <pcnoordhuis at gmail dot com>
+ * Copyright (c) 2011, Steve Bennett <steveb at workware dot net dot au>
*
* All rights reserved.
*
* - http://invisible-island.net/xterm/ctlseqs/ctlseqs.html
* - http://www.3waylabs.com/nw/WWW/products/wizcon/vt220.html
*
- * Todo list:
- * - Win32 support
- * - Save and load history containing newlines
- *
* Bloat:
* - Completion?
*
+ * Unix/termios
+ * ------------
* List of escape sequences used by this program, we do everything just
* a few sequences. In order to be so cheap we may have some
* flickering effect with some slow terminal, but the lesser sequences
* the more compatible.
*
- * CHA (Cursor Horizontal Absolute)
- * Sequence: ESC [ n G
- * Effect: moves cursor to column n (1 based)
- *
* EL (Erase Line)
- * Sequence: ESC [ n K
- * Effect: if n is 0 or missing, clear from cursor to end of line
- * Effect: if n is 1, clear from beginning of line to cursor
- * Effect: if n is 2, clear entire line
+ * Sequence: ESC [ 0 K
+ * Effect: clear from cursor to end of line
*
* CUF (CUrsor Forward)
* Sequence: ESC [ n C
- * Effect: moves cursor forward of n chars
+ * Effect: moves cursor forward n chars
+ *
+ * CR (Carriage Return)
+ * Sequence: \r
+ * Effect: moves cursor to column 1
*
* The following are used to clear the screen: ESC [ H ESC [ 2 J
* This is actually composed of two sequences:
* DSR/CPR (Report cursor position)
* Sequence: ESC [ 6 n
* Effect: reports current cursor position as ESC [ NNN ; MMM R
+ *
+ * == Only used in multiline mode ==
+ * CUU (Cursor Up)
+ * Sequence: ESC [ n A
+ * Effect: moves cursor up n chars.
+ *
+ * CUD (Cursor Down)
+ * Sequence: ESC [ n B
+ * Effect: moves cursor down n chars.
+ *
+ * win32/console
+ * -------------
+ * If __MINGW32__ is defined, the win32 console API is used.
+ * This could probably be made to work for the msvc compiler too.
+ * This support based in part on work by Jon Griffiths.
*/
+#ifdef _WIN32 /* Windows platform, either MinGW or Visual Studio (MSVC) */
+#include <windows.h>
+#include <fcntl.h>
+#define USE_WINCONSOLE
+#ifdef __MINGW32__
+#define HAVE_UNISTD_H
+#else
+/* Microsoft headers don't like old POSIX names */
+#define strdup _strdup
+#define snprintf _snprintf
+#endif
+#else
#include <termios.h>
+#include <sys/ioctl.h>
+#include <poll.h>
+#define USE_TERMIOS
+#define HAVE_UNISTD_H
+#endif
+
+#ifdef HAVE_UNISTD_H
#include <unistd.h>
+#endif
#include <stdlib.h>
#include <stdarg.h>
#include <stdio.h>
+#include <assert.h>
#include <errno.h>
#include <string.h>
+#include <signal.h>
#include <stdlib.h>
#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/poll.h>
-#include <unistd.h>
-#include "linenoise.h"
#include "linenoise.h"
+#ifndef STRINGBUF_H
+#include "stringbuf.h"
+#endif
+#ifndef UTF8_UTIL_H
#include "utf8.h"
+#endif
#define LINENOISE_DEFAULT_HISTORY_MAX_LEN 100
-#define LINENOISE_MAX_LINE 4096
-static const char *unsupported_term[] = {"dumb","cons25",NULL};
-static struct termios orig_termios; /* in order to restore at exit */
-static int rawmode = 0; /* for atexit() function to check if restore is needed*/
-static int atexit_registered = 0; /* register atexit just 1 time */
+#define ctrl(C) ((C) - '@')
+
+/* Use -ve numbers here to co-exist with normal unicode chars */
+enum {
+ SPECIAL_NONE,
+ /* don't use -1 here since that indicates error */
+ SPECIAL_UP = -20,
+ SPECIAL_DOWN = -21,
+ SPECIAL_LEFT = -22,
+ SPECIAL_RIGHT = -23,
+ SPECIAL_DELETE = -24,
+ SPECIAL_HOME = -25,
+ SPECIAL_END = -26,
+ SPECIAL_INSERT = -27,
+ SPECIAL_PAGE_UP = -28,
+ SPECIAL_PAGE_DOWN = -29,
+
+ /* Some handy names for other special keycodes */
+ CHAR_ESCAPE = 27,
+ CHAR_DELETE = 127,
+};
+
static int history_max_len = LINENOISE_DEFAULT_HISTORY_MAX_LEN;
static int history_len = 0;
static char **history = NULL;
-static void linenoiseAtExit(void);
-static int fd_read(int fd);
-static void getColumns(int fd, int *cols);
-
-static int isUnsupportedTerm(void) {
- char *term = getenv("TERM");
- int j;
-
- if (term == NULL) return 0;
- for (j = 0; unsupported_term[j]; j++)
- if (!strcasecmp(term,unsupported_term[j])) return 1;
- return 0;
-}
+/* Structure to contain the status of the current (being edited) line */
+struct current {
+ stringbuf *buf; /* Current buffer. Always null terminated */
+ int pos; /* Cursor position, measured in chars */
+ int cols; /* Size of the window, in chars */
+ int nrows; /* How many rows are being used in multiline mode (>= 1) */
+ int rpos; /* The current row containing the cursor - multiline mode only */
+ int colsright; /* refreshLine() cached cols for insert_char() optimisation */
+ int colsleft; /* refreshLine() cached cols for remove_char() optimisation */
+ const char *prompt;
+ stringbuf *capture; /* capture buffer, or NULL for none. Always null terminated */
+ stringbuf *output; /* used only during refreshLine() - output accumulator */
+#if defined(USE_TERMIOS)
+ int fd; /* Terminal fd */
+#elif defined(USE_WINCONSOLE)
+ HANDLE outh; /* Console output handle */
+ HANDLE inh; /* Console input handle */
+ int rows; /* Screen rows */
+ int x; /* Current column during output */
+ int y; /* Current row */
+#ifdef USE_UTF8
+ #define UBUF_MAX_CHARS 132
+ WORD ubuf[UBUF_MAX_CHARS + 1]; /* Accumulates utf16 output - one extra for final surrogate pairs */
+ int ubuflen; /* length used in ubuf */
+ int ubufcols; /* how many columns are represented by the chars in ubuf? */
+#endif
+#endif
+};
-static void freeHistory(void) {
+static int fd_read(struct current *current);
+static int getWindowSize(struct current *current);
+static void cursorDown(struct current *current, int n);
+static void cursorUp(struct current *current, int n);
+static void eraseEol(struct current *current);
+static void refreshLine(struct current *current);
+static void refreshLineAlt(struct current *current, const char *prompt, const char *buf, int cursor_pos);
+static void setCursorPos(struct current *current, int x);
+static void setOutputHighlight(struct current *current, const int *props, int nprops);
+static void set_current(struct current *current, const char *str);
+
+void linenoiseHistoryFree(void) {
if (history) {
int j;
for (j = 0; j < history_len; j++)
free(history[j]);
free(history);
+ history = NULL;
+ history_len = 0;
+ }
+}
+
+typedef enum {
+ EP_START, /* looking for ESC */
+ EP_ESC, /* looking for [ */
+ EP_DIGITS, /* parsing digits */
+ EP_PROPS, /* parsing digits or semicolons */
+ EP_END, /* ok */
+ EP_ERROR, /* error */
+} ep_state_t;
+
+struct esc_parser {
+ ep_state_t state;
+ int props[5]; /* properties are stored here */
+ int maxprops; /* size of the props[] array */
+ int numprops; /* number of properties found */
+ int termchar; /* terminator char, or 0 for any alpha */
+ int current; /* current (partial) property value */
+};
+
+/**
+ * Initialise the escape sequence parser at *parser.
+ *
+ * If termchar is 0 any alpha char terminates ok. Otherwise only the given
+ * char terminates successfully.
+ * Run the parser state machine with calls to parseEscapeSequence() for each char.
+ */
+static void initParseEscapeSeq(struct esc_parser *parser, int termchar)
+{
+ parser->state = EP_START;
+ parser->maxprops = sizeof(parser->props) / sizeof(*parser->props);
+ parser->numprops = 0;
+ parser->current = 0;
+ parser->termchar = termchar;
+}
+
+/**
+ * Pass character 'ch' into the state machine to parse:
+ * 'ESC' '[' <digits> (';' <digits>)* <termchar>
+ *
+ * The first character must be ESC.
+ * Returns the current state. The state machine is done when it returns either EP_END
+ * or EP_ERROR.
+ *
+ * On EP_END, the "property/attribute" values can be read from parser->props[]
+ * of length parser->numprops.
+ */
+static int parseEscapeSequence(struct esc_parser *parser, int ch)
+{
+ switch (parser->state) {
+ case EP_START:
+ parser->state = (ch == '\x1b') ? EP_ESC : EP_ERROR;
+ break;
+ case EP_ESC:
+ parser->state = (ch == '[') ? EP_DIGITS : EP_ERROR;
+ break;
+ case EP_PROPS:
+ if (ch == ';') {
+ parser->state = EP_DIGITS;
+donedigits:
+ if (parser->numprops + 1 < parser->maxprops) {
+ parser->props[parser->numprops++] = parser->current;
+ parser->current = 0;
+ }
+ break;
+ }
+ /* fall through */
+ case EP_DIGITS:
+ if (ch >= '0' && ch <= '9') {
+ parser->current = parser->current * 10 + (ch - '0');
+ parser->state = EP_PROPS;
+ break;
+ }
+ /* must be terminator */
+ if (parser->termchar != ch) {
+ if (parser->termchar != 0 || !((ch >= 'A' && ch <= 'Z') || (ch >= 'a' && ch <= 'z'))) {
+ parser->state = EP_ERROR;
+ break;
+ }
+ }
+ parser->state = EP_END;
+ goto donedigits;
+ case EP_END:
+ parser->state = EP_ERROR;
+ break;
+ case EP_ERROR:
+ break;
+ }
+ return parser->state;
+}
+
+/*#define DEBUG_REFRESHLINE*/
+
+#ifdef DEBUG_REFRESHLINE
+#define DRL(ARGS...) fprintf(dfh, ARGS)
+static FILE *dfh;
+
+static void DRL_CHAR(int ch)
+{
+ if (ch < ' ') {
+ DRL("^%c", ch + '@');
+ }
+ else if (ch > 127) {
+ DRL("\\u%04x", ch);
+ }
+ else {
+ DRL("%c", ch);
+ }
+}
+static void DRL_STR(const char *str)
+{
+ while (*str) {
+ int ch;
+ int n = utf8_tounicode(str, &ch);
+ str += n;
+ DRL_CHAR(ch);
+ }
+}
+#else
+#define DRL(...)
+#define DRL_CHAR(ch)
+#define DRL_STR(str)
+#endif
+
+#if defined(USE_WINCONSOLE)
+#include "linenoise-win32.c"
+#endif
+
+#if defined(USE_TERMIOS)
+static void linenoiseAtExit(void);
+static struct termios orig_termios; /* in order to restore at exit */
+static int rawmode = 0; /* for atexit() function to check if restore is needed*/
+static int atexit_registered = 0; /* register atexit just 1 time */
+
+static const char *unsupported_term[] = {"dumb","cons25","emacs",NULL};
+
+static int isUnsupportedTerm(void) {
+ char *term = getenv("TERM");
+
+ if (term) {
+ int j;
+ for (j = 0; unsupported_term[j]; j++) {
+ if (strcmp(term, unsupported_term[j]) == 0) {
+ return 1;
+ }
+ }
}
+ return 0;
}
-static int enableRawMode(int fd) {
+static int enableRawMode(struct current *current) {
struct termios raw;
- if (!isatty(STDIN_FILENO)) goto fatal;
+ current->fd = STDIN_FILENO;
+ current->cols = 0;
+
+ if (!isatty(current->fd) || isUnsupportedTerm() ||
+ tcgetattr(current->fd, &orig_termios) == -1) {
+fatal:
+ errno = ENOTTY;
+ return -1;
+ }
+
if (!atexit_registered) {
atexit(linenoiseAtExit);
atexit_registered = 1;
}
- if (tcgetattr(fd,&orig_termios) == -1) goto fatal;
raw = orig_termios; /* modify the original mode */
/* input modes: no break, no CR to NL, no parity check, no strip char,
* no start/stop output control. */
raw.c_iflag &= ~(BRKINT | ICRNL | INPCK | ISTRIP | IXON);
- /* output modes - disable post processing */
- raw.c_oflag &= ~(OPOST);
+ /* output modes - actually, no need to disable post processing */
+ /*raw.c_oflag &= ~(OPOST);*/
/* control modes - set 8 bit chars */
raw.c_cflag |= (CS8);
/* local modes - choing off, canonical off, no extended functions,
raw.c_cc[VMIN] = 1; raw.c_cc[VTIME] = 0; /* 1 byte, no timer */
/* put terminal in raw mode after flushing */
- if (tcsetattr(fd,TCSADRAIN,&raw) < 0) goto fatal;
+ if (tcsetattr(current->fd,TCSADRAIN,&raw) < 0) {
+ goto fatal;
+ }
rawmode = 1;
return 0;
-
-fatal:
- errno = ENOTTY;
- return -1;
}
-static void disableRawMode(int fd) {
+static void disableRawMode(struct current *current) {
/* Don't even check the return value as it's too late. */
- if (rawmode && tcsetattr(fd,TCSADRAIN,&orig_termios) != -1)
+ if (rawmode && tcsetattr(current->fd,TCSADRAIN,&orig_termios) != -1)
rawmode = 0;
}
/* At exit we'll try to fix the terminal to the initial conditions. */
static void linenoiseAtExit(void) {
- disableRawMode(STDIN_FILENO);
- freeHistory();
+ if (rawmode) {
+ tcsetattr(STDIN_FILENO, TCSADRAIN, &orig_termios);
+ }
+ linenoiseHistoryFree();
}
-/* Structure to contain the status of the current (being edited) line */
-struct current {
- int fd; /* Terminal fd */
- char *buf; /* Current buffer. Always null terminated */
- int bufmax; /* Size of the buffer, including space for the null termination */
- int len; /* Number of bytes in 'buf' */
- int chars; /* Number of chars in 'buf' (utf-8 chars) */
- int pos; /* Cursor position, measured in chars */
- int cols; /* Size of the window, in chars */
- const char *prompt;
-};
-
-/* gcc/glibc insists that we care about the return code of write! */
+/* gcc/glibc insists that we care about the return code of write!
+ * Clarification: This means that a void-cast like "(void) (EXPR)"
+ * does not work.
+ */
#define IGNORE_RC(EXPR) if (EXPR) {}
-/* This is fd_printf() on some systems, but use a different
- * name to avoid conflicts
+/**
+ * Output bytes directly, or accumulate output (if current->output is set)
+ */
+static void outputChars(struct current *current, const char *buf, int len)
+{
+ if (len < 0) {
+ len = strlen(buf);
+ }
+ if (current->output) {
+ sb_append_len(current->output, buf, len);
+ }
+ else {
+ IGNORE_RC(write(current->fd, buf, len));
+ }
+}
+
+/* Like outputChars, but using printf-style formatting
*/
-static void fd_printf(int fd, const char *format, ...)
+static void outputFormatted(struct current *current, const char *format, ...)
{
va_list args;
char buf[64];
va_start(args, format);
n = vsnprintf(buf, sizeof(buf), format, args);
+ /* This will never happen because we are sure to use outputFormatted() only for short sequences */
+ assert(n < (int)sizeof(buf));
va_end(args);
- IGNORE_RC(write(fd, buf, n));
+ outputChars(current, buf, n);
}
-static int utf8_getchars(char *buf, int c)
+static void cursorToLeft(struct current *current)
{
-#ifdef USE_UTF8
- return utf8_fromunicode(buf, c);
-#else
- *buf = c;
- return 1;
-#endif
+ outputChars(current, "\r", -1);
}
-/**
- * Returns the unicode character at the given offset,
- * or -1 if none.
- */
-static int get_char(struct current *current, int pos)
+static void setOutputHighlight(struct current *current, const int *props, int nprops)
{
- if (pos >= 0 && pos < current->chars) {
- int c;
- int i = utf8_index(current->buf, pos);
- (void)utf8_tounicode(current->buf + i, &c);
- return c;
+ outputChars(current, "\x1b[", -1);
+ while (nprops--) {
+ outputFormatted(current, "%d%c", *props, (nprops == 0) ? 'm' : ';');
+ props++;
}
- return -1;
}
-static void refreshLine(const char *prompt, struct current *current) {
- int plen;
- int pchars;
- int backup = 0;
- int i;
- const char *buf = current->buf;
- int chars = current->chars;
- int pos = current->pos;
- int b;
- int ch;
- int n;
-
- /* Should intercept SIGWINCH. For now, just get the size every time */
- getColumns(current->fd, ¤t->cols);
-
- plen = strlen(prompt);
- pchars = utf8_strlen(prompt, plen);
-
- /* Account for a line which is too long to fit in the window.
- * Note that control chars require an extra column
- */
-
- /* How many cols are required to the left of 'pos'?
- * The prompt, plus one extra for each control char
- */
- n = pchars + utf8_strlen(buf, current->len);
- b = 0;
- for (i = 0; i < pos; i++) {
- b += utf8_tounicode(buf + b, &ch);
- if (ch < ' ') {
- n++;
- }
- }
+static void eraseEol(struct current *current)
+{
+ outputChars(current, "\x1b[0K", -1);
+}
- /* If too many are need, strip chars off the front of 'buf'
- * until it fits. Note that if the current char is a control character,
- * we need one extra col.
- */
- if (current->pos < current->chars && get_char(current, current->pos) < ' ') {
- n++;
+static void setCursorPos(struct current *current, int x)
+{
+ if (x == 0) {
+ cursorToLeft(current);
}
-
- while (n >= current->cols) {
- b = utf8_tounicode(buf, &ch);
- if (ch < ' ') {
- n--;
- }
- n--;
- buf += b;
- pos--;
- chars--;
+ else {
+ outputFormatted(current, "\r\x1b[%dC", x);
}
+}
- /* Cursor to left edge, then the prompt */
- fd_printf(current->fd, "\x1b[1G");
- IGNORE_RC(write(current->fd, prompt, plen));
-
- /* Now the current buffer content */
-
- /* Need special handling for control characters.
- * If we hit 'cols', stop.
- */
- b = 0; /* unwritted bytes */
- n = 0; /* How many control chars were written */
- for (i = 0; i < chars; i++) {
- int ch;
- int w = utf8_tounicode(buf + b, &ch);
- if (ch < ' ') {
- n++;
- }
- if (pchars + i + n >= current->cols) {
- break;
- }
- if (ch < ' ') {
- /* A control character, so write the buffer so far */
- IGNORE_RC(write(current->fd, buf, b));
- buf += b + w;
- b = 0;
- fd_printf(current->fd, "\033[7m^%c\033[0m", ch + '@');
- if (i < pos) {
- backup++;
- }
- }
- else {
- b += w;
- }
+static void cursorUp(struct current *current, int n)
+{
+ if (n) {
+ outputFormatted(current, "\x1b[%dA", n);
}
- IGNORE_RC(write(current->fd, buf, b));
-
- /* Erase to right, move cursor to original position */
- fd_printf(current->fd, "\x1b[0K" "\x1b[1G\x1b[%dC", pos + pchars + backup);
}
-static void set_current(struct current *current, const char *str)
+static void cursorDown(struct current *current, int n)
{
- strncpy(current->buf, str, current->bufmax);
- current->buf[current->bufmax - 1] = 0;
- current->len = strlen(current->buf);
- current->pos = current->chars = utf8_strlen(current->buf, current->len);
+ if (n) {
+ outputFormatted(current, "\x1b[%dB", n);
+ }
}
-static int has_room(struct current *current, int bytes)
+void linenoiseClearScreen(void)
{
- return current->len + bytes < current->bufmax - 1;
+ IGNORE_RC(write(STDOUT_FILENO, "\x1b[H\x1b[2J", 7));
}
/**
- * Removes the char at 'pos'.
- *
- * Returns 1 if the line needs to be refreshed, 2 if not
- * and 0 if nothing was removed
+ * Reads a char from 'fd', waiting at most 'timeout' milliseconds.
+ *
+ * A timeout of -1 means to wait forever.
+ *
+ * Returns -1 if no char is received within the time or an error occurs.
*/
-static int remove_char(struct current *current, int pos)
+static int fd_read_char(int fd, int timeout)
{
- if (pos >= 0 && pos < current->chars) {
- int p1, p2;
- int ret = 1;
- p1 = utf8_index(current->buf, pos);
- p2 = p1 + utf8_index(current->buf + p1, 1);
-
- /* optimise remove char in the case of removing the last char */
- if (current->pos == pos + 1 && current->pos == current->chars) {
- if (current->buf[pos] >= ' ' && utf8_strlen(current->prompt, -1) + utf8_strlen(current->buf, current->len) < current->cols - 1) {
- ret = 2;
- fd_printf(current->fd, "\b \b");
- }
- }
+ struct pollfd p;
+ unsigned char c;
- /* Move the null char too */
- memmove(current->buf + p1, current->buf + p2, current->len - p2 + 1);
- current->len -= (p2 - p1);
- current->chars--;
+ p.fd = fd;
+ p.events = POLLIN;
- if (current->pos > pos) {
- current->pos--;
- }
- return ret;
+ if (poll(&p, 1, timeout) == 0) {
+ /* timeout */
+ return -1;
}
- return 0;
+ if (read(fd, &c, 1) != 1) {
+ return -1;
+ }
+ return c;
}
/**
- * Insert 'ch' at position 'pos'
- *
- * Returns 1 if the line needs to be refreshed, 2 if not
- * and 0 if nothing was inserted (no room)
+ * Reads a complete utf-8 character
+ * and returns the unicode value, or -1 on error.
*/
-static int insert_char(struct current *current, int pos, int ch)
+static int fd_read(struct current *current)
{
- char buf[3];
- int n = utf8_getchars(buf, ch);
-
- if (has_room(current, n) && pos >= 0 && pos <= current->chars) {
- int p1, p2;
- int ret = 1;
- p1 = utf8_index(current->buf, pos);
- p2 = p1 + n;
-
- /* optimise the case where adding a single char to the end and no scrolling is needed */
- if (current->pos == pos && current->chars == pos) {
- if (ch >= ' ' && utf8_strlen(current->prompt, -1) + utf8_strlen(current->buf, current->len) < current->cols - 1) {
- IGNORE_RC(write(current->fd, buf, n));
- ret = 2;
- }
+#ifdef USE_UTF8
+ char buf[MAX_UTF8_LEN];
+ int n;
+ int i;
+ int c;
+
+ if (read(current->fd, &buf[0], 1) != 1) {
+ return -1;
+ }
+ n = utf8_charlen(buf[0]);
+ if (n < 1) {
+ return -1;
+ }
+ for (i = 1; i < n; i++) {
+ if (read(current->fd, &buf[i], 1) != 1) {
+ return -1;
}
+ }
+ /* decode and return the character */
+ utf8_tounicode(buf, &c);
+ return c;
+#else
+ return fd_read_char(current->fd, -1);
+#endif
+}
- memmove(current->buf + p2, current->buf + p1, current->len - p1);
- memcpy(current->buf + p1, buf, n);
- current->len += n;
- current->chars++;
- if (current->pos >= pos) {
- current->pos++;
+/**
+ * Stores the current cursor column in '*cols'.
+ * Returns 1 if OK, or 0 if failed to determine cursor pos.
+ */
+static int queryCursor(struct current *current, int* cols)
+{
+ struct esc_parser parser;
+ int ch;
+
+ /* Should not be buffering this output, it needs to go immediately */
+ assert(current->output == NULL);
+
+ /* control sequence - report cursor location */
+ outputChars(current, "\x1b[6n", -1);
+
+ /* Parse the response: ESC [ rows ; cols R */
+ initParseEscapeSeq(&parser, 'R');
+ while ((ch = fd_read_char(current->fd, 100)) > 0) {
+ switch (parseEscapeSequence(&parser, ch)) {
+ default:
+ continue;
+ case EP_END:
+ if (parser.numprops == 2 && parser.props[1] < 1000) {
+ *cols = parser.props[1];
+ return 1;
+ }
+ break;
+ case EP_ERROR:
+ break;
}
- return ret;
+ /* failed */
+ break;
}
return 0;
}
+/**
+ * Updates current->cols with the current window size (width)
+ */
+static int getWindowSize(struct current *current)
+{
+ struct winsize ws;
+
+ if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws) == 0 && ws.ws_col != 0) {
+ current->cols = ws.ws_col;
+ return 0;
+ }
+
+ /* Failed to query the window size. Perhaps we are on a serial terminal.
+ * Try to query the width by sending the cursor as far to the right
+ * and reading back the cursor position.
+ * Note that this is only done once per call to linenoise rather than
+ * every time the line is refreshed for efficiency reasons.
+ *
+ * In more detail, we:
+ * (a) request current cursor position,
+ * (b) move cursor far right,
+ * (c) request cursor position again,
+ * (d) at last move back to the old position.
+ * This gives us the width without messing with the externally
+ * visible cursor position.
+ */
+
+ if (current->cols == 0) {
+ int here;
+
+ /* If anything fails => default 80 */
+ current->cols = 80;
+
+ /* (a) */
+ if (queryCursor (current, &here)) {
+ /* (b) */
+ setCursorPos(current, 999);
+
+ /* (c). Note: If (a) succeeded, then (c) should as well.
+ * For paranoia we still check and have a fallback action
+ * for (d) in case of failure..
+ */
+ if (queryCursor (current, ¤t->cols)) {
+ /* (d) Reset the cursor back to the original location. */
+ if (current->cols > here) {
+ setCursorPos(current, here);
+ }
+ }
+ }
+ }
+
+ return 0;
+}
+
+/**
+ * If CHAR_ESCAPE was received, reads subsequent
+ * chars to determine if this is a known special key.
+ *
+ * Returns SPECIAL_NONE if unrecognised, or -1 if EOF.
+ *
+ * If no additional char is received within a short time,
+ * CHAR_ESCAPE is returned.
+ */
+static int check_special(int fd)
+{
+ int c = fd_read_char(fd, 50);
+ int c2;
+
+ if (c < 0) {
+ return CHAR_ESCAPE;
+ }
+
+ c2 = fd_read_char(fd, 50);
+ if (c2 < 0) {
+ return c2;
+ }
+ if (c == '[' || c == 'O') {
+ /* Potential arrow key */
+ switch (c2) {
+ case 'A':
+ return SPECIAL_UP;
+ case 'B':
+ return SPECIAL_DOWN;
+ case 'C':
+ return SPECIAL_RIGHT;
+ case 'D':
+ return SPECIAL_LEFT;
+ case 'F':
+ return SPECIAL_END;
+ case 'H':
+ return SPECIAL_HOME;
+ }
+ }
+ if (c == '[' && c2 >= '1' && c2 <= '8') {
+ /* extended escape */
+ c = fd_read_char(fd, 50);
+ if (c == '~') {
+ switch (c2) {
+ case '2':
+ return SPECIAL_INSERT;
+ case '3':
+ return SPECIAL_DELETE;
+ case '5':
+ return SPECIAL_PAGE_UP;
+ case '6':
+ return SPECIAL_PAGE_DOWN;
+ case '7':
+ return SPECIAL_HOME;
+ case '8':
+ return SPECIAL_END;
+ }
+ }
+ while (c != -1 && c != '~') {
+ /* .e.g \e[12~ or '\e[11;2~ discard the complete sequence */
+ c = fd_read_char(fd, 50);
+ }
+ }
+
+ return SPECIAL_NONE;
+}
+#endif
+
+static void clearOutputHighlight(struct current *current)
+{
+ int nohighlight = 0;
+ setOutputHighlight(current, &nohighlight, 1);
+}
+
+static void outputControlChar(struct current *current, char ch)
+{
+ int reverse = 7;
+ setOutputHighlight(current, &reverse, 1);
+ outputChars(current, "^", 1);
+ outputChars(current, &ch, 1);
+ clearOutputHighlight(current);
+}
+
+#ifndef utf8_getchars
+static int utf8_getchars(char *buf, int c)
+{
+#ifdef USE_UTF8
+ return utf8_fromunicode(buf, c);
+#else
+ *buf = c;
+ return 1;
+#endif
+}
+#endif
+
+/**
+ * Returns the unicode character at the given offset,
+ * or -1 if none.
+ */
+static int get_char(struct current *current, int pos)
+{
+ if (pos >= 0 && pos < sb_chars(current->buf)) {
+ int c;
+ int i = utf8_index(sb_str(current->buf), pos);
+ (void)utf8_tounicode(sb_str(current->buf) + i, &c);
+ return c;
+ }
+ return -1;
+}
+
+static int char_display_width(int ch)
+{
+ if (ch < ' ') {
+ /* control chars take two positions */
+ return 2;
+ }
+ else {
+ return utf8_width(ch);
+ }
+}
+
#ifndef NO_COMPLETION
static linenoiseCompletionCallback *completionCallback = NULL;
+static void *completionUserdata = NULL;
+static int showhints = 1;
+static linenoiseHintsCallback *hintsCallback = NULL;
+static linenoiseFreeHintsCallback *freeHintsCallback = NULL;
+static void *hintsUserdata = NULL;
static void beep() {
+#ifdef USE_TERMIOS
fprintf(stderr, "\x7");
fflush(stderr);
+#endif
}
static void freeCompletions(linenoiseCompletions *lc) {
linenoiseCompletions lc = { 0, NULL };
int c = 0;
- completionCallback(current->buf,&lc);
+ completionCallback(sb_str(current->buf),&lc,completionUserdata);
if (lc.len == 0) {
beep();
} else {
while(!stop) {
/* Show completion or original buffer */
if (i < lc.len) {
- struct current tmp = *current;
- tmp.buf = lc.cvec[i];
- tmp.pos = tmp.len = strlen(tmp.buf);
- tmp.chars = utf8_strlen(tmp.buf, tmp.len);
- refreshLine(current->prompt, &tmp);
+ int chars = utf8_strlen(lc.cvec[i], -1);
+ refreshLineAlt(current, current->prompt, lc.cvec[i], chars);
} else {
- refreshLine(current->prompt, current);
+ refreshLine(current);
}
- c = fd_read(current->fd);
- if (c < 0) {
+ c = fd_read(current);
+ if (c == -1) {
break;
}
i = (i+1) % (lc.len+1);
if (i == lc.len) beep();
break;
- case 27: /* escape */
+ case CHAR_ESCAPE: /* escape */
/* Re-show original buffer */
if (i < lc.len) {
- refreshLine(current->prompt, current);
+ refreshLine(current);
}
stop = 1;
break;
}
}
}
-
- freeCompletions(&lc);
- return c; /* Return last read character */
+
+ freeCompletions(&lc);
+ return c; /* Return last read character */
+}
+
+/* Register a callback function to be called for tab-completion.
+ Returns the prior callback so that the caller may (if needed)
+ restore it when done. */
+linenoiseCompletionCallback * linenoiseSetCompletionCallback(linenoiseCompletionCallback *fn, void *userdata) {
+ linenoiseCompletionCallback * old = completionCallback;
+ completionCallback = fn;
+ completionUserdata = userdata;
+ return old;
+}
+
+void linenoiseAddCompletion(linenoiseCompletions *lc, const char *str) {
+ lc->cvec = (char **)realloc(lc->cvec,sizeof(char*)*(lc->len+1));
+ lc->cvec[lc->len++] = strdup(str);
+}
+
+void linenoiseSetHintsCallback(linenoiseHintsCallback *callback, void *userdata)
+{
+ hintsCallback = callback;
+ hintsUserdata = userdata;
+}
+
+void linenoiseSetFreeHintsCallback(linenoiseFreeHintsCallback *callback)
+{
+ freeHintsCallback = callback;
+}
+
+#endif
+
+
+static const char *reduceSingleBuf(const char *buf, int availcols, int *cursor_pos)
+{
+ /* We have availcols columns available.
+ * If necessary, strip chars off the front of buf until *cursor_pos
+ * fits within availcols
+ */
+ int needcols = 0;
+ int pos = 0;
+ int new_cursor_pos = *cursor_pos;
+ const char *pt = buf;
+
+ DRL("reduceSingleBuf: availcols=%d, cursor_pos=%d\n", availcols, *cursor_pos);
+
+ while (*pt) {
+ int ch;
+ int n = utf8_tounicode(pt, &ch);
+ pt += n;
+
+ needcols += char_display_width(ch);
+
+ /* If we need too many cols, strip
+ * chars off the front of buf to make it fit.
+ * We keep 3 extra cols to the right of the cursor.
+ * 2 for possible wide chars, 1 for the last column that
+ * can't be used.
+ */
+ while (needcols >= availcols - 3) {
+ n = utf8_tounicode(buf, &ch);
+ buf += n;
+ needcols -= char_display_width(ch);
+ DRL_CHAR(ch);
+
+ /* and adjust the apparent cursor position */
+ new_cursor_pos--;
+
+ if (buf == pt) {
+ /* can't remove more than this */
+ break;
+ }
+ }
+
+ if (pos++ == *cursor_pos) {
+ break;
+ }
+
+ }
+ DRL("<snip>");
+ DRL_STR(buf);
+ DRL("\nafter reduce, needcols=%d, new_cursor_pos=%d\n", needcols, new_cursor_pos);
+
+ /* Done, now new_cursor_pos contains the adjusted cursor position
+ * and buf points to he adjusted start
+ */
+ *cursor_pos = new_cursor_pos;
+ return buf;
+}
+
+static int mlmode = 0;
+
+void linenoiseSetMultiLine(int enableml)
+{
+ mlmode = enableml;
+}
+
+/* Helper of refreshSingleLine() and refreshMultiLine() to show hints
+ * to the right of the prompt.
+ * Returns 1 if a hint was shown, or 0 if not
+ * If 'display' is 0, does no output. Just returns the appropriate return code.
+ */
+static int refreshShowHints(struct current *current, const char *buf, int availcols, int display)
+{
+ int rc = 0;
+ if (showhints && hintsCallback && availcols > 0) {
+ int bold = 0;
+ int color = -1;
+ char *hint = hintsCallback(buf, &color, &bold, hintsUserdata);
+ if (hint) {
+ rc = 1;
+ if (display) {
+ const char *pt;
+ if (bold == 1 && color == -1) color = 37;
+ if (bold || color > 0) {
+ int props[3] = { bold, color, 49 }; /* bold, color, fgnormal */
+ setOutputHighlight(current, props, 3);
+ }
+ DRL("<hint bold=%d,color=%d>", bold, color);
+ pt = hint;
+ while (*pt) {
+ int ch;
+ int n = utf8_tounicode(pt, &ch);
+ int width = char_display_width(ch);
+
+ if (width >= availcols) {
+ DRL("<hinteol>");
+ break;
+ }
+ DRL_CHAR(ch);
+
+ availcols -= width;
+ outputChars(current, pt, n);
+ pt += n;
+ }
+ if (bold || color > 0) {
+ clearOutputHighlight(current);
+ }
+ /* Call the function to free the hint returned. */
+ if (freeHintsCallback) freeHintsCallback(hint, hintsUserdata);
+ }
+ }
+ }
+ return rc;
+}
+
+#ifdef USE_TERMIOS
+static void refreshStart(struct current *current)
+{
+ /* We accumulate all output here */
+ assert(current->output == NULL);
+ current->output = sb_alloc();
+}
+
+static void refreshEnd(struct current *current)
+{
+ /* Output everything at once */
+ IGNORE_RC(write(current->fd, sb_str(current->output), sb_len(current->output)));
+ sb_free(current->output);
+ current->output = NULL;
+}
+
+static void refreshStartChars(struct current *current)
+{
+ (void)current;
+}
+
+static void refreshNewline(struct current *current)
+{
+ DRL("<nl>");
+ outputChars(current, "\n", 1);
+}
+
+static void refreshEndChars(struct current *current)
+{
+ (void)current;
+}
+#endif
+
+static void refreshLineAlt(struct current *current, const char *prompt, const char *buf, int cursor_pos)
+{
+ int i;
+ const char *pt;
+ int displaycol;
+ int displayrow;
+ int visible;
+ int currentpos;
+ int notecursor;
+ int cursorcol = 0;
+ int cursorrow = 0;
+ int hint;
+ struct esc_parser parser;
+
+#ifdef DEBUG_REFRESHLINE
+ dfh = fopen("linenoise.debuglog", "a");
+#endif
+
+ /* Should intercept SIGWINCH. For now, just get the size every time */
+ getWindowSize(current);
+
+ refreshStart(current);
+
+ DRL("wincols=%d, cursor_pos=%d, nrows=%d, rpos=%d\n", current->cols, cursor_pos, current->nrows, current->rpos);
+
+ /* Here is the plan:
+ * (a) move the the bottom row, going down the appropriate number of lines
+ * (b) move to beginning of line and erase the current line
+ * (c) go up one line and do the same, until we have erased up to the first row
+ * (d) output the prompt, counting cols and rows, taking into account escape sequences
+ * (e) output the buffer, counting cols and rows
+ * (e') when we hit the current pos, save the cursor position
+ * (f) move the cursor to the saved cursor position
+ * (g) save the current cursor row and number of rows
+ */
+
+ /* (a) - The cursor is currently at row rpos */
+ cursorDown(current, current->nrows - current->rpos - 1);
+ DRL("<cud=%d>", current->nrows - current->rpos - 1);
+
+ /* (b), (c) - Erase lines upwards until we get to the first row */
+ for (i = 0; i < current->nrows; i++) {
+ if (i) {
+ DRL("<cup>");
+ cursorUp(current, 1);
+ }
+ DRL("<clearline>");
+ cursorToLeft(current);
+ eraseEol(current);
+ }
+ DRL("\n");
+
+ /* (d) First output the prompt. control sequences don't take up display space */
+ pt = prompt;
+ displaycol = 0; /* current display column */
+ displayrow = 0; /* current display row */
+ visible = 1;
+
+ refreshStartChars(current);
+
+ while (*pt) {
+ int width;
+ int ch;
+ int n = utf8_tounicode(pt, &ch);
+
+ if (visible && ch == CHAR_ESCAPE) {
+ /* The start of an escape sequence, so not visible */
+ visible = 0;
+ initParseEscapeSeq(&parser, 'm');
+ DRL("<esc-seq-start>");
+ }
+
+ if (ch == '\n' || ch == '\r') {
+ /* treat both CR and NL the same and force wrap */
+ refreshNewline(current);
+ displaycol = 0;
+ displayrow++;
+ }
+ else {
+ width = visible * utf8_width(ch);
+
+ displaycol += width;
+ if (displaycol >= current->cols) {
+ /* need to wrap to the next line because of newline or if it doesn't fit
+ * XXX this is a problem in single line mode
+ */
+ refreshNewline(current);
+ displaycol = width;
+ displayrow++;
+ }
+
+ DRL_CHAR(ch);
+#ifdef USE_WINCONSOLE
+ if (visible) {
+ outputChars(current, pt, n);
+ }
+#else
+ outputChars(current, pt, n);
+#endif
+ }
+ pt += n;
+
+ if (!visible) {
+ switch (parseEscapeSequence(&parser, ch)) {
+ case EP_END:
+ visible = 1;
+ setOutputHighlight(current, parser.props, parser.numprops);
+ DRL("<esc-seq-end,numprops=%d>", parser.numprops);
+ break;
+ case EP_ERROR:
+ DRL("<esc-seq-err>");
+ visible = 1;
+ break;
+ }
+ }
+ }
+
+ /* Now we are at the first line with all lines erased */
+ DRL("\nafter prompt: displaycol=%d, displayrow=%d\n", displaycol, displayrow);
+
+
+ /* (e) output the buffer, counting cols and rows */
+ if (mlmode == 0) {
+ /* In this mode we may need to trim chars from the start of the buffer until the
+ * cursor fits in the window.
+ */
+ pt = reduceSingleBuf(buf, current->cols - displaycol, &cursor_pos);
+ }
+ else {
+ pt = buf;
+ }
+
+ currentpos = 0;
+ notecursor = -1;
+
+ while (*pt) {
+ int ch;
+ int n = utf8_tounicode(pt, &ch);
+ int width = char_display_width(ch);
+
+ if (currentpos == cursor_pos) {
+ /* (e') wherever we output this character is where we want the cursor */
+ notecursor = 1;
+ }
+
+ if (displaycol + width >= current->cols) {
+ if (mlmode == 0) {
+ /* In single line mode stop once we print as much as we can on one line */
+ DRL("<slmode>");
+ break;
+ }
+ /* need to wrap to the next line since it doesn't fit */
+ refreshNewline(current);
+ displaycol = 0;
+ displayrow++;
+ }
+
+ if (notecursor == 1) {
+ /* (e') Save this position as the current cursor position */
+ cursorcol = displaycol;
+ cursorrow = displayrow;
+ notecursor = 0;
+ DRL("<cursor>");
+ }
+
+ displaycol += width;
+
+ if (ch < ' ') {
+ outputControlChar(current, ch + '@');
+ }
+ else {
+ outputChars(current, pt, n);
+ }
+ DRL_CHAR(ch);
+ if (width != 1) {
+ DRL("<w=%d>", width);
+ }
+
+ pt += n;
+ currentpos++;
+ }
+
+ /* If we didn't see the cursor, it is at the current location */
+ if (notecursor) {
+ DRL("<cursor>");
+ cursorcol = displaycol;
+ cursorrow = displayrow;
+ }
+
+ DRL("\nafter buf: displaycol=%d, displayrow=%d, cursorcol=%d, cursorrow=%d\n", displaycol, displayrow, cursorcol, cursorrow);
+
+ /* (f) show hints */
+ hint = refreshShowHints(current, buf, current->cols - displaycol, 1);
+
+ /* Remember how many many cols are available for insert optimisation */
+ if (prompt == current->prompt && hint == 0) {
+ current->colsright = current->cols - displaycol;
+ current->colsleft = displaycol;
+ }
+ else {
+ /* Can't optimise */
+ current->colsright = 0;
+ current->colsleft = 0;
+ }
+ DRL("\nafter hints: colsleft=%d, colsright=%d\n\n", current->colsleft, current->colsright);
+
+ refreshEndChars(current);
+
+ /* (g) move the cursor to the correct place */
+ cursorUp(current, displayrow - cursorrow);
+ setCursorPos(current, cursorcol);
+
+ /* (h) Update the number of rows if larger, but never reduce this */
+ if (displayrow >= current->nrows) {
+ current->nrows = displayrow + 1;
+ }
+ /* And remember the row that the cursor is on */
+ current->rpos = cursorrow;
+
+ refreshEnd(current);
+
+#ifdef DEBUG_REFRESHLINE
+ fclose(dfh);
+#endif
+}
+
+static void refreshLine(struct current *current)
+{
+ refreshLineAlt(current, current->prompt, sb_str(current->buf), current->pos);
+}
+
+static void set_current(struct current *current, const char *str)
+{
+ sb_clear(current->buf);
+ sb_append(current->buf, str);
+ current->pos = sb_chars(current->buf);
+}
+
+/**
+ * Removes the char at 'pos'.
+ *
+ * Returns 1 if the line needs to be refreshed, 2 if not
+ * and 0 if nothing was removed
+ */
+static int remove_char(struct current *current, int pos)
+{
+ if (pos >= 0 && pos < sb_chars(current->buf)) {
+ int offset = utf8_index(sb_str(current->buf), pos);
+ int nbytes = utf8_index(sb_str(current->buf) + offset, 1);
+ int rc = 1;
+
+ /* Now we try to optimise in the simple but very common case that:
+ * - outputChars() can be used directly (not win32)
+ * - we are removing the char at EOL
+ * - the buffer is not empty
+ * - there are columns available to the left
+ * - the char being deleted is not a wide or utf-8 character
+ * - no hints are being shown
+ */
+ if (current->output && current->pos == pos + 1 && current->pos == sb_chars(current->buf) && pos > 0) {
+#ifdef USE_UTF8
+ /* Could implement utf8_prev_len() but simplest just to not optimise this case */
+ char last = sb_str(current->buf)[offset];
+#else
+ char last = 0;
+#endif
+ if (current->colsleft > 0 && (last & 0x80) == 0) {
+ /* Have cols on the left and not a UTF-8 char or continuation */
+ /* Yes, can optimise */
+ current->colsleft--;
+ current->colsright++;
+ rc = 2;
+ }
+ }
+
+ sb_delete(current->buf, offset, nbytes);
+
+ if (current->pos > pos) {
+ current->pos--;
+ }
+ if (rc == 2) {
+ if (refreshShowHints(current, sb_str(current->buf), current->colsright, 0)) {
+ /* A hint needs to be shown, so can't optimise after all */
+ rc = 1;
+ }
+ else {
+ /* optimised output */
+ outputChars(current, "\b \b", 3);
+ }
+ }
+ return rc;
+ return 1;
+ }
+ return 0;
+}
+
+/**
+ * Insert 'ch' at position 'pos'
+ *
+ * Returns 1 if the line needs to be refreshed, 2 if not
+ * and 0 if nothing was inserted (no room)
+ */
+static int insert_char(struct current *current, int pos, int ch)
+{
+ if (pos >= 0 && pos <= sb_chars(current->buf)) {
+ char buf[MAX_UTF8_LEN + 1];
+ int offset = utf8_index(sb_str(current->buf), pos);
+ int n = utf8_getchars(buf, ch);
+ int rc = 1;
+
+ /* null terminate since sb_insert() requires it */
+ buf[n] = 0;
+
+ /* Now we try to optimise in the simple but very common case that:
+ * - outputChars() can be used directly (not win32)
+ * - we are inserting at EOL
+ * - there are enough columns available
+ * - no hints are being shown
+ */
+ if (current->output && pos == current->pos && pos == sb_chars(current->buf)) {
+ int width = char_display_width(ch);
+ if (current->colsright > width) {
+ /* Yes, can optimise */
+ current->colsright -= width;
+ current->colsleft -= width;
+ rc = 2;
+ }
+ }
+ sb_insert(current->buf, offset, buf);
+ if (current->pos >= pos) {
+ current->pos++;
+ }
+ if (rc == 2) {
+ if (refreshShowHints(current, sb_str(current->buf), current->colsright, 0)) {
+ /* A hint needs to be shown, so can't optimise after all */
+ rc = 1;
+ }
+ else {
+ /* optimised output */
+ outputChars(current, buf, n);
+ }
+ }
+ return rc;
+ }
+ return 0;
}
-/* Register a callback function to be called for tab-completion. */
-void linenoiseSetCompletionCallback(linenoiseCompletionCallback *fn) {
- completionCallback = fn;
-}
+/**
+ * Captures up to 'n' characters starting at 'pos' for the cut buffer.
+ *
+ * This replaces any existing characters in the cut buffer.
+ */
+static void capture_chars(struct current *current, int pos, int nchars)
+{
+ if (pos >= 0 && (pos + nchars - 1) < sb_chars(current->buf)) {
+ int offset = utf8_index(sb_str(current->buf), pos);
+ int nbytes = utf8_index(sb_str(current->buf) + offset, nchars);
-void linenoiseAddCompletion(linenoiseCompletions *lc, const char *str) {
- lc->cvec = (char **)realloc(lc->cvec,sizeof(char*)*(lc->len+1));
- lc->cvec[lc->len++] = strdup(str);
+ if (nbytes > 0) {
+ if (current->capture) {
+ sb_clear(current->capture);
+ }
+ else {
+ current->capture = sb_alloc();
+ }
+ sb_append_len(current->capture, sb_str(current->buf) + offset, nbytes);
+ }
+ }
}
-#endif
-
/**
+ * Removes up to 'n' characters at cursor position 'pos'.
+ *
* Returns 0 if no chars were removed or non-zero otherwise.
*/
static int remove_chars(struct current *current, int pos, int n)
{
int removed = 0;
+
+ /* First save any chars which will be removed */
+ capture_chars(current, pos, n);
+
while (n-- && remove_char(current, pos)) {
removed++;
}
return removed;
}
-
/**
- * Reads a char from 'fd', waiting at most 'timeout' milliseconds.
+ * Inserts the characters (string) 'chars' at the cursor position 'pos'.
*
- * A timeout of -1 means to wait forever.
- *
- * Returns -1 if no char is received within the time or an error occurs.
+ * Returns 0 if no chars were inserted or non-zero otherwise.
*/
-static int fd_read_char(int fd, int timeout)
+static int insert_chars(struct current *current, int pos, const char *chars)
{
- struct pollfd p;
- unsigned char c;
-
- p.fd = fd;
- p.events = POLLIN;
+ int inserted = 0;
- if (poll(&p, 1, timeout) == 0) {
- /* timeout */
- return -1;
- }
- if (read(fd, &c, 1) != 1) {
- return -1;
+ while (*chars) {
+ int ch;
+ int n = utf8_tounicode(chars, &ch);
+ if (insert_char(current, pos, ch) == 0) {
+ break;
+ }
+ inserted++;
+ pos++;
+ chars += n;
}
- return c;
+ return inserted;
}
/**
- * Reads a complete utf-8 character
- * and returns the unicode value, or -1 on error.
+ * Returns the keycode to process, or 0 if none.
*/
-static int fd_read(int fd)
+static int reverseIncrementalSearch(struct current *current)
{
-#ifdef USE_UTF8
- char buf[4];
- int n;
- int i;
+ /* Display the reverse-i-search prompt and process chars */
+ char rbuf[50];
+ char rprompt[80];
+ int rchars = 0;
+ int rlen = 0;
+ int searchpos = history_len - 1;
int c;
- if (read(fd, &buf[0], 1) != 1) {
- return -1;
- }
- n = utf8_charlen(buf[0]);
- if (n < 1 || n > 3) {
- return -1;
- }
- for (i = 1; i < n; i++) {
- if (read(fd, &buf[i], 1) != 1) {
- return -1;
+ rbuf[0] = 0;
+ while (1) {
+ int n = 0;
+ const char *p = NULL;
+ int skipsame = 0;
+ int searchdir = -1;
+
+ snprintf(rprompt, sizeof(rprompt), "(reverse-i-search)'%s': ", rbuf);
+ refreshLineAlt(current, rprompt, sb_str(current->buf), current->pos);
+ c = fd_read(current);
+ if (c == ctrl('H') || c == CHAR_DELETE) {
+ if (rchars) {
+ int p_ind = utf8_index(rbuf, --rchars);
+ rbuf[p_ind] = 0;
+ rlen = strlen(rbuf);
+ }
+ continue;
+ }
+#ifdef USE_TERMIOS
+ if (c == CHAR_ESCAPE) {
+ c = check_special(current->fd);
}
- }
- buf[n] = 0;
- /* decode and return the character */
- utf8_tounicode(buf, &c);
- return c;
-#else
- return fd_read_char(fd, -1);
#endif
-}
-
-static void getColumns(int fd, int *cols) {
- struct winsize ws;
-
- if (ioctl(1, TIOCGWINSZ, &ws) == 0 && ws.ws_col != 0) {
- *cols = ws.ws_col;
- return;
- }
- /* Failed to query the window size. Perhaps we are on a serial terminal.
- * Try to query the width by sending the cursor as far to the right
- * and reading back the cursor position.
- * Note that this is only done once per call to linenoise rather than
- * every time the line is refreshed for efficiency reasons.
- */
- if (*cols == 0) {
- *cols = 80;
-
- /* Move cursor far right and report cursor position */
- fd_printf(fd, "\x1b[999G" "\x1b[6n");
-
- /* Parse the response: ESC [ rows ; cols R */
- if (fd_read_char(fd, 100) == 0x1b && fd_read_char(fd, 100) == '[') {
- int n = 0;
- while (1) {
- int ch = fd_read_char(fd, 100);
- if (ch == ';') {
- /* Ignore rows */
- n = 0;
- }
- else if (ch == 'R') {
- /* Got cols */
- if (n != 0 && n < 1000) {
- *cols = n;
- }
- break;
- }
- else if (ch >= 0 && ch <= '9') {
- n = n * 10 + ch - '0';
- }
- else {
- break;
- }
+ if (c == ctrl('P') || c == SPECIAL_UP) {
+ /* Search for the previous (earlier) match */
+ if (searchpos > 0) {
+ searchpos--;
}
+ skipsame = 1;
}
- }
-}
-
-/* Use -ve numbers here to co-exist with normal unicode chars */
-enum {
- SPECIAL_NONE,
- SPECIAL_UP = -20,
- SPECIAL_DOWN = -21,
- SPECIAL_LEFT = -22,
- SPECIAL_RIGHT = -23,
- SPECIAL_DELETE = -24,
-};
-
-/**
- * If escape (27) was received, reads subsequent
- * chars to determine if this is a known special key.
- *
- * Returns SPECIAL_NONE if unrecognised, or -1 if EOF.
- *
- * If no additional char is received within a short time,
- * 27 is returned.
- */
-static int check_special(int fd)
-{
- int c = fd_read_char(fd, 50);
- int c2;
+ else if (c == ctrl('N') || c == SPECIAL_DOWN) {
+ /* Search for the next (later) match */
+ if (searchpos < history_len) {
+ searchpos++;
+ }
+ searchdir = 1;
+ skipsame = 1;
+ }
+ else if (c >= ' ') {
+ /* >= here to allow for null terminator */
+ if (rlen >= (int)sizeof(rbuf) - MAX_UTF8_LEN) {
+ continue;
+ }
- if (c < 0) {
- return 27;
- }
+ n = utf8_getchars(rbuf + rlen, c);
+ rlen += n;
+ rchars++;
+ rbuf[rlen] = 0;
- c2 = fd_read_char(fd, 50);
- if (c2 < 0) {
- return c2;
- }
- if (c == '[' || c == 'O') {
- /* Potential arrow key */
- switch (c2) {
- case 'A':
- return SPECIAL_UP;
- case 'B':
- return SPECIAL_DOWN;
- case 'C':
- return SPECIAL_RIGHT;
- case 'D':
- return SPECIAL_LEFT;
+ /* Adding a new char resets the search location */
+ searchpos = history_len - 1;
}
- }
- if (c == '[' && c2 >= '1' && c2 <= '6') {
- /* extended escape */
- int c3 = fd_read_char(fd, 50);
- if (c2 == '3' && c3 == '~') {
- /* delete char under cursor */
- return SPECIAL_DELETE;
+ else {
+ /* Exit from incremental search mode */
+ break;
}
- while (c3 != -1 && c3 != '~') {
- /* .e.g \e[12~ or '\e[11;2~ discard the complete sequence */
- c3 = fd_read_char(fd, 50);
+
+ /* Now search through the history for a match */
+ for (; searchpos >= 0 && searchpos < history_len; searchpos += searchdir) {
+ p = strstr(history[searchpos], rbuf);
+ if (p) {
+ /* Found a match */
+ if (skipsame && strcmp(history[searchpos], sb_str(current->buf)) == 0) {
+ /* But it is identical, so skip it */
+ continue;
+ }
+ /* Copy the matching line and set the cursor position */
+ set_current(current,history[searchpos]);
+ current->pos = utf8_strlen(history[searchpos], p - history[searchpos]);
+ break;
+ }
+ }
+ if (!p && n) {
+ /* No match, so don't add it */
+ rchars--;
+ rlen -= n;
+ rbuf[rlen] = 0;
}
}
+ if (c == ctrl('G') || c == ctrl('C')) {
+ /* ctrl-g terminates the search with no effect */
+ set_current(current, "");
+ c = 0;
+ }
+ else if (c == ctrl('J')) {
+ /* ctrl-j terminates the search leaving the buffer in place */
+ c = 0;
+ }
- return SPECIAL_NONE;
+ /* Go process the char normally */
+ refreshLine(current);
+ return c;
}
-#define ctrl(C) ((C) - '@')
-
-static int linenoisePrompt(struct current *current) {
+static int linenoiseEdit(struct current *current) {
int history_index = 0;
/* The latest history entry is always our current buffer, that
linenoiseHistoryAdd("");
set_current(current, "");
- refreshLine(current->prompt, current);
+ refreshLine(current);
while(1) {
- int c = fd_read(current->fd);
+ int dir = -1;
+ int c = fd_read(current);
#ifndef NO_COMPLETION
/* Only autocomplete when the callback is set. It returns < 0 when
* there was an error reading from fd. Otherwise it will return the
* character that should be handled next. */
- if (c == 9 && completionCallback != NULL) {
+ if (c == '\t' && current->pos == sb_chars(current->buf) && completionCallback != NULL) {
c = completeLine(current);
- /* Return on errors */
- if (c < 0) return current->len;
- /* Read next character when 0 */
- if (c == 0) continue;
}
#endif
+ if (c == ctrl('R')) {
+ /* reverse incremental search will provide an alternative keycode or 0 for none */
+ c = reverseIncrementalSearch(current);
+ /* go on to process the returned char normally */
+ }
+
+#ifdef USE_TERMIOS
+ if (c == CHAR_ESCAPE) { /* escape sequence */
+ c = check_special(current->fd);
+ }
+#endif
+ if (c == -1) {
+ /* Return on errors */
+ return sb_len(current->buf);
+ }
-process_char:
- if (c == -1) return current->len;
switch(c) {
- case '\r': /* enter */
+ case SPECIAL_NONE:
+ break;
+ case '\r': /* enter/CR */
+ case '\n': /* LF */
history_len--;
free(history[history_len]);
- return current->len;
+ current->pos = sb_chars(current->buf);
+ if (mlmode || hintsCallback) {
+ showhints = 0;
+ refreshLine(current);
+ showhints = 1;
+ }
+ return sb_len(current->buf);
case ctrl('C'): /* ctrl-c */
errno = EAGAIN;
return -1;
- case 127: /* backspace */
+ case ctrl('Z'): /* ctrl-z */
+#ifdef SIGTSTP
+ /* send ourselves SIGSUSP */
+ disableRawMode(current);
+ raise(SIGTSTP);
+ /* and resume */
+ enableRawMode(current);
+ refreshLine(current);
+#endif
+ continue;
+ case CHAR_DELETE: /* backspace */
case ctrl('H'):
if (remove_char(current, current->pos - 1) == 1) {
- refreshLine(current->prompt, current);
+ refreshLine(current);
}
break;
case ctrl('D'): /* ctrl-d */
- if (current->len == 0) {
+ if (sb_len(current->buf) == 0) {
/* Empty line, so EOF */
history_len--;
free(history[history_len]);
return -1;
}
- /* Otherwise delete char to right of cursor */
- if (remove_char(current, current->pos)) {
- refreshLine(current->prompt, current);
+ /* Otherwise fall through to delete char to right of cursor */
+ case SPECIAL_DELETE:
+ if (remove_char(current, current->pos) == 1) {
+ refreshLine(current);
}
break;
- case ctrl('W'): /* ctrl-w */
+ case SPECIAL_INSERT:
+ /* Ignore. Expansion Hook.
+ * Future possibility: Toggle Insert/Overwrite Modes
+ */
+ break;
+ case ctrl('W'): /* ctrl-w, delete word at left. save deleted chars */
/* eat any spaces on the left */
{
int pos = current->pos;
}
if (remove_chars(current, pos, current->pos - pos)) {
- refreshLine(current->prompt, current);
- }
- }
- break;
- case ctrl('R'): /* ctrl-r */
- {
- /* Display the reverse-i-search prompt and process chars */
- char rbuf[50];
- char rprompt[80];
- int rchars = 0;
- int rlen = 0;
- int searchpos = history_len - 1;
-
- rbuf[0] = 0;
- while (1) {
- int n = 0;
- const char *p = NULL;
- int skipsame = 0;
- int searchdir = -1;
-
- snprintf(rprompt, sizeof(rprompt), "(reverse-i-search)'%s': ", rbuf);
- refreshLine(rprompt, current);
- c = fd_read(current->fd);
- if (c == ctrl('H') || c == 127) {
- if (rchars) {
- int p = utf8_index(rbuf, --rchars);
- rbuf[p] = 0;
- rlen = strlen(rbuf);
- }
- continue;
- }
- if (c == 27) {
- c = check_special(current->fd);
- }
- if (c == ctrl('P') || c == SPECIAL_UP) {
- /* Search for the previous (earlier) match */
- if (searchpos > 0) {
- searchpos--;
- }
- skipsame = 1;
- }
- else if (c == ctrl('N') || c == SPECIAL_DOWN) {
- /* Search for the next (later) match */
- if (searchpos < history_len) {
- searchpos++;
- }
- searchdir = 1;
- skipsame = 1;
- }
- else if (c >= ' ') {
- if (rlen >= (int)sizeof(rbuf) + 3) {
- continue;
- }
-
- n = utf8_getchars(rbuf + rlen, c);
- rlen += n;
- rchars++;
- rbuf[rlen] = 0;
-
- /* Adding a new char resets the search location */
- searchpos = history_len - 1;
- }
- else {
- /* Exit from incremental search mode */
- break;
- }
-
- /* Now search through the history for a match */
- for (; searchpos >= 0 && searchpos < history_len; searchpos += searchdir) {
- p = strstr(history[searchpos], rbuf);
- if (p) {
- /* Found a match */
- if (skipsame && strcmp(history[searchpos], current->buf) == 0) {
- /* But it is identical, so skip it */
- continue;
- }
- /* Copy the matching line and set the cursor position */
- set_current(current,history[searchpos]);
- current->pos = utf8_strlen(history[searchpos], p - history[searchpos]);
- break;
- }
- }
- if (!p && n) {
- /* No match, so don't add it */
- rchars--;
- rlen -= n;
- rbuf[rlen] = 0;
- }
- }
- if (c == ctrl('G') || c == ctrl('C')) {
- /* ctrl-g terminates the search with no effect */
- set_current(current, "");
- c = 0;
+ refreshLine(current);
}
- else if (c == ctrl('J')) {
- /* ctrl-j terminates the search leaving the buffer in place */
- c = 0;
- }
- /* Go process the char normally */
- refreshLine(current->prompt, current);
- goto process_char;
}
break;
case ctrl('T'): /* ctrl-t */
- if (current->pos > 0 && current->pos < current->chars) {
- c = get_char(current, current->pos);
- remove_char(current, current->pos);
+ if (current->pos > 0 && current->pos <= sb_chars(current->buf)) {
+ /* If cursor is at end, transpose the previous two chars */
+ int fixer = (current->pos == sb_chars(current->buf));
+ c = get_char(current, current->pos - fixer);
+ remove_char(current, current->pos - fixer);
insert_char(current, current->pos - 1, c);
- refreshLine(current->prompt, current);
+ refreshLine(current);
}
break;
case ctrl('V'): /* ctrl-v */
- if (has_room(current, 3)) {
- /* Insert the ^V first */
- if (insert_char(current, current->pos, c)) {
- refreshLine(current->prompt, current);
- /* Now wait for the next char. Can insert anything except \0 */
- c = fd_read(current->fd);
-
- /* Remove the ^V first */
- remove_char(current, current->pos - 1);
- if (c != -1) {
- /* Insert the actual char */
- insert_char(current, current->pos, c);
- }
- refreshLine(current->prompt, current);
+ /* Insert the ^V first */
+ if (insert_char(current, current->pos, c)) {
+ refreshLine(current);
+ /* Now wait for the next char. Can insert anything except \0 */
+ c = fd_read(current);
+
+ /* Remove the ^V first */
+ remove_char(current, current->pos - 1);
+ if (c > 0) {
+ /* Insert the actual char, can't be error or null */
+ insert_char(current, current->pos, c);
}
+ refreshLine(current);
}
break;
- case ctrl('B'): /* ctrl-b */
- case ctrl('F'): /* ctrl-f */
- case ctrl('P'): /* ctrl-p */
- case ctrl('N'): /* ctrl-n */
- case 27: { /* escape sequence */
- int dir = -1;
- if (c == 27) {
- c = check_special(current->fd);
- }
- switch (c) {
- case ctrl('B'):
- case SPECIAL_LEFT:
- if (current->pos > 0) {
- current->pos--;
- refreshLine(current->prompt, current);
- }
- break;
- case ctrl('F'):
- case SPECIAL_RIGHT:
- if (current->pos < current->chars) {
- current->pos++;
- refreshLine(current->prompt, current);
- }
- break;
- case ctrl('P'):
- case SPECIAL_UP:
- dir = 1;
- case ctrl('N'):
- case SPECIAL_DOWN:
- if (history_len > 1) {
- /* Update the current history entry before to
- * overwrite it with tne next one. */
- free(history[history_len-1-history_index]);
- history[history_len-1-history_index] = strdup(current->buf);
- /* Show the new entry */
- history_index += dir;
- if (history_index < 0) {
- history_index = 0;
- break;
- } else if (history_index >= history_len) {
- history_index = history_len-1;
- break;
- }
- set_current(current, history[history_len-1-history_index]);
- refreshLine(current->prompt, current);
- }
- break;
-
- case SPECIAL_DELETE:
- if (remove_char(current, current->pos) == 1) {
- refreshLine(current->prompt, current);
- }
- break;
+ case ctrl('B'):
+ case SPECIAL_LEFT:
+ if (current->pos > 0) {
+ current->pos--;
+ refreshLine(current);
}
+ break;
+ case ctrl('F'):
+ case SPECIAL_RIGHT:
+ if (current->pos < sb_chars(current->buf)) {
+ current->pos++;
+ refreshLine(current);
}
break;
- default:
- /* Only tab is allowed without ^V */
- if (c == '\t' || c >= ' ') {
- if (insert_char(current, current->pos, c) == 1) {
- refreshLine(current->prompt, current);
+ case SPECIAL_PAGE_UP:
+ dir = history_len - history_index - 1; /* move to start of history */
+ goto history_navigation;
+ case SPECIAL_PAGE_DOWN:
+ dir = -history_index; /* move to 0 == end of history, i.e. current */
+ goto history_navigation;
+ case ctrl('P'):
+ case SPECIAL_UP:
+ dir = 1;
+ goto history_navigation;
+ case ctrl('N'):
+ case SPECIAL_DOWN:
+history_navigation:
+ if (history_len > 1) {
+ /* Update the current history entry before to
+ * overwrite it with tne next one. */
+ free(history[history_len - 1 - history_index]);
+ history[history_len - 1 - history_index] = strdup(sb_str(current->buf));
+ /* Show the new entry */
+ history_index += dir;
+ if (history_index < 0) {
+ history_index = 0;
+ break;
+ } else if (history_index >= history_len) {
+ history_index = history_len - 1;
+ break;
}
+ set_current(current, history[history_len - 1 - history_index]);
+ refreshLine(current);
}
break;
- case ctrl('U'): /* Ctrl+u, delete to beginning of line. */
+ case ctrl('A'): /* Ctrl+a, go to the start of the line */
+ case SPECIAL_HOME:
+ current->pos = 0;
+ refreshLine(current);
+ break;
+ case ctrl('E'): /* ctrl+e, go to the end of the line */
+ case SPECIAL_END:
+ current->pos = sb_chars(current->buf);
+ refreshLine(current);
+ break;
+ case ctrl('U'): /* Ctrl+u, delete to beginning of line, save deleted chars. */
if (remove_chars(current, 0, current->pos)) {
- refreshLine(current->prompt, current);
+ refreshLine(current);
}
break;
- case ctrl('K'): /* Ctrl+k, delete from current to end of line. */
- if (remove_chars(current, current->pos, current->chars - current->pos)) {
- refreshLine(current->prompt, current);
+ case ctrl('K'): /* Ctrl+k, delete from current to end of line, save deleted chars. */
+ if (remove_chars(current, current->pos, sb_chars(current->buf) - current->pos)) {
+ refreshLine(current);
}
break;
- case ctrl('A'): /* Ctrl+a, go to the start of the line */
- current->pos = 0;
- refreshLine(current->prompt, current);
- break;
- case ctrl('E'): /* ctrl+e, go to the end of the line */
- current->pos = current->chars;
- refreshLine(current->prompt, current);
+ case ctrl('Y'): /* Ctrl+y, insert saved chars at current position */
+ if (current->capture && insert_chars(current, current->pos, sb_str(current->capture))) {
+ refreshLine(current);
+ }
break;
case ctrl('L'): /* Ctrl+L, clear screen */
- /* clear screen */
- fd_printf(current->fd, "\x1b[H\x1b[2J");
+ linenoiseClearScreen();
/* Force recalc of window size for serial terminals */
current->cols = 0;
- refreshLine(current->prompt, current);
+ current->rpos = 0;
+ refreshLine(current);
+ break;
+ default:
+ /* Only tab is allowed without ^V */
+ if (c == '\t' || c >= ' ') {
+ if (insert_char(current, current->pos, c) == 1) {
+ refreshLine(current);
+ }
+ }
break;
}
}
- return current->len;
+ return sb_len(current->buf);
}
-static int linenoiseRaw(char *buf, size_t buflen, const char *prompt) {
- int fd = STDIN_FILENO;
- int count;
+int linenoiseColumns(void)
+{
+ struct current current;
+ current.output = NULL;
+ enableRawMode (¤t);
+ getWindowSize (¤t);
+ disableRawMode (¤t);
+ return current.cols;
+}
- if (buflen == 0) {
- errno = EINVAL;
- return -1;
- }
- if (!isatty(STDIN_FILENO)) {
- if (fgets(buf, buflen, stdin) == NULL) return -1;
- count = strlen(buf);
- if (count && buf[count-1] == '\n') {
- count--;
- buf[count] = '\0';
+/**
+ * Reads a line from the file handle (without the trailing NL or CRNL)
+ * and returns it in a stringbuf.
+ * Returns NULL if no characters are read before EOF or error.
+ *
+ * Note that the character count will *not* be correct for lines containing
+ * utf8 sequences. Do not rely on the character count.
+ */
+static stringbuf *sb_getline(FILE *fh)
+{
+ stringbuf *sb = sb_alloc();
+ int c;
+ int n = 0;
+
+ while ((c = getc(fh)) != EOF) {
+ char ch;
+ n++;
+ if (c == '\r') {
+ /* CRLF -> LF */
+ continue;
}
- } else {
- struct current current;
+ if (c == '\n' || c == '\r') {
+ break;
+ }
+ ch = c;
+ /* ignore the effect of character count for partial utf8 sequences */
+ sb_append_len(sb, &ch, 1);
+ }
+ if (n == 0) {
+ sb_free(sb);
+ return NULL;
+ }
+ return sb;
+}
- if (enableRawMode(fd) == -1) return -1;
+char *linenoise(const char *prompt)
+{
+ int count;
+ struct current current;
+ stringbuf *sb;
- current.fd = fd;
- current.buf = buf;
- current.bufmax = buflen;
- current.len = 0;
- current.chars = 0;
+ memset(¤t, 0, sizeof(current));
+
+ if (enableRawMode(¤t) == -1) {
+ printf("%s", prompt);
+ fflush(stdout);
+ sb = sb_getline(stdin);
+ }
+ else {
+ current.buf = sb_alloc();
current.pos = 0;
- current.cols = 0;
+ current.nrows = 1;
current.prompt = prompt;
- count = linenoisePrompt(¤t);
- disableRawMode(fd);
+ count = linenoiseEdit(¤t);
+ disableRawMode(¤t);
printf("\n");
- }
- return count;
-}
-
-char *linenoise(const char *prompt) {
- char buf[LINENOISE_MAX_LINE];
- int count;
-
- if (isUnsupportedTerm()) {
- size_t len;
- printf("%s",prompt);
- fflush(stdout);
- if (fgets(buf,LINENOISE_MAX_LINE,stdin) == NULL) return NULL;
- len = strlen(buf);
- while(len && (buf[len-1] == '\n' || buf[len-1] == '\r')) {
- len--;
- buf[len] = '\0';
+ sb_free(current.capture);
+ if (count == -1) {
+ sb_free(current.buf);
+ return NULL;
}
- return strdup(buf);
- } else {
- count = linenoiseRaw(buf,LINENOISE_MAX_LINE,prompt);
- if (count == -1) return NULL;
- return strdup(buf);
+ sb = current.buf;
}
+ return sb ? sb_to_string(sb) : NULL;
}
/* Using a circular buffer is smarter, but a bit more complex to handle. */
-int linenoiseHistoryAdd(const char *line) {
- char *linecopy;
+int linenoiseHistoryAddAllocated(char *line) {
- if (history_max_len == 0) return 0;
+ if (history_max_len == 0) {
+notinserted:
+ free(line);
+ return 0;
+ }
if (history == NULL) {
- history = (char**)malloc(sizeof(char*)*history_max_len);
- if (history == NULL) return 0;
- memset(history,0,(sizeof(char*)*history_max_len));
+ history = (char **)calloc(sizeof(char*), history_max_len);
+ }
+
+ /* do not insert duplicate lines into history */
+ if (history_len > 0 && strcmp(line, history[history_len - 1]) == 0) {
+ goto notinserted;
}
- linecopy = strdup(line);
- if (!linecopy) return 0;
+
if (history_len == history_max_len) {
free(history[0]);
memmove(history,history+1,sizeof(char*)*(history_max_len-1));
history_len--;
}
- history[history_len] = linecopy;
+ history[history_len] = line;
history_len++;
return 1;
}
+int linenoiseHistoryAdd(const char *line) {
+ return linenoiseHistoryAddAllocated(strdup(line));
+}
+
+int linenoiseHistoryGetMaxLen(void) {
+ return history_max_len;
+}
+
int linenoiseHistorySetMaxLen(int len) {
char **newHistory;
if (history) {
int tocopy = history_len;
- newHistory = (char**)malloc(sizeof(char*)*len);
- if (newHistory == NULL) return 0;
- if (len < tocopy) tocopy = len;
- memcpy(newHistory,history+(history_max_len-tocopy), sizeof(char*)*tocopy);
+ newHistory = (char **)calloc(sizeof(char*), len);
+
+ /* If we can't copy everything, free the elements we'll not use. */
+ if (len < tocopy) {
+ int j;
+
+ for (j = 0; j < tocopy-len; j++) free(history[j]);
+ tocopy = len;
+ }
+ memcpy(newHistory,history+(history_len-tocopy), sizeof(char*)*tocopy);
free(history);
history = newHistory;
}
/* Save the history in the specified file. On success 0 is returned
* otherwise -1 is returned. */
-int linenoiseHistorySave(char *filename) {
+int linenoiseHistorySave(const char *filename) {
FILE *fp = fopen(filename,"w");
int j;
return 0;
}
-/* Load the history from the specified file. If the file does not exist
- * zero is returned and no operation is performed.
+/* Load the history from the specified file.
*
- * If the file exists and the operation succeeded 0 is returned, otherwise
- * on error -1 is returned. */
-int linenoiseHistoryLoad(char *filename) {
+ * If the file does not exist or can't be opened, no operation is performed
+ * and -1 is returned.
+ * Otherwise 0 is returned.
+ */
+int linenoiseHistoryLoad(const char *filename) {
FILE *fp = fopen(filename,"r");
- char buf[LINENOISE_MAX_LINE];
+ stringbuf *sb;
if (fp == NULL) return -1;
- while (fgets(buf,LINENOISE_MAX_LINE,fp) != NULL) {
- char *src, *dest;
+ while ((sb = sb_getline(fp)) != NULL) {
+ /* Take the stringbuf and decode backslash escaped values */
+ char *buf = sb_to_string(sb);
+ char *dest = buf;
+ const char *src;
- /* Decode backslash escaped values */
- for (src = dest = buf; *src; src++) {
+ for (src = buf; *src; src++) {
char ch = *src;
if (ch == '\\') {
}
*dest++ = ch;
}
- /* Remove trailing newline */
- if (dest != buf && (dest[-1] == '\n' || dest[-1] == '\r')) {
- dest--;
- }
*dest = 0;
- linenoiseHistoryAdd(buf);
+ linenoiseHistoryAddAllocated(buf);
}
fclose(fp);
return 0;
projects / linenoise.git / blobdiff