caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-23 00:28:26 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

linenoise.c updated, now redis-cli can be used in a pipe

Browse Source
This commit is contained in:
antirez 2010-04-30 09:21:48 +02:00
parent 7aaaad5070
commit a737ada1e5
1 changed files with 48 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
linenoise.c
View File

@ -69,7 +69,6 @@
* *
*/ */
#include "fmacros.h"
#include <termios.h> #include <termios.h>
#include <unistd.h> #include <unistd.h>
#include <stdlib.h> #include <stdlib.h>
@ -82,6 +81,7 @@
#include <unistd.h> #include <unistd.h>
#define LINENOISE_MAX_LINE 4096 #define LINENOISE_MAX_LINE 4096
static char *unsupported_term[] = {"dumb","cons25",NULL};
static struct termios orig_termios; /* in order to restore at exit */ 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 rawmode = 0; /* for atexit() function to check if restore is needed*/
@ -91,7 +91,17 @@ static int history_len = 0;
char **history = NULL; char **history = NULL;
static void linenoiseAtExit(void); static void linenoiseAtExit(void);
int linenoiseHistoryAdd(char *line); int linenoiseHistoryAdd(const char *line);
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;
}
static void freeHistory(void) { static void freeHistory(void) {
if (history) { if (history) {
@ -341,10 +351,19 @@ static int linenoiseRaw(char *buf, size_t buflen, const char *prompt) {
errno = EINVAL; errno = EINVAL;
return -1; 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';
}
} else {
if (enableRawMode(fd) == -1) return -1; if (enableRawMode(fd) == -1) return -1;
count = linenoisePrompt(fd, buf, buflen, prompt); count = linenoisePrompt(fd, buf, buflen, prompt);
disableRawMode(fd); disableRawMode(fd);
printf("\n"); printf("\n");
}
return count; return count;
} }
@ -352,26 +371,42 @@ char *linenoise(const char *prompt) {
char buf[LINENOISE_MAX_LINE]; char buf[LINENOISE_MAX_LINE];
int count; 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';
}
return strdup(buf);
} else {
count = linenoiseRaw(buf,LINENOISE_MAX_LINE,prompt); count = linenoiseRaw(buf,LINENOISE_MAX_LINE,prompt);
if (count == -1) return NULL; if (count == -1) return NULL;
return strdup(buf); return strdup(buf);
} }
}
/* 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(char *line) { int linenoiseHistoryAdd(const char *line) {
char *linecopy;
if (history_max_len == 0) return 0; if (history_max_len == 0) return 0;
if (history == 0) { if (history == 0) {
history = malloc(sizeof(char*)*history_max_len); history = malloc(sizeof(char*)*history_max_len);
if (history == NULL) return 0; if (history == NULL) return 0;
memset(history,0,(sizeof(char*)*history_max_len)); memset(history,0,(sizeof(char*)*history_max_len));
} }
line = strdup(line); linecopy = strdup(line);
if (!line) return 0; if (!linecopy) return 0;
if (history_len == history_max_len) { if (history_len == history_max_len) {
memmove(history,history+1,sizeof(char*)*(history_max_len-1)); memmove(history,history+1,sizeof(char*)*(history_max_len-1));
history_len--; history_len--;
} }
history[history_len] = line; history[history_len] = linecopy;
history_len++; history_len++;
return 1; return 1;
} }