patches for missed linenoise changes
Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/1572762a Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/1572762a Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/1572762a Branch: refs/heads/dag_viz Commit: 1572762a666c1b61b1172beba6d67d3fef5a3a6b Parents: f6480fb Author: cramja <marc.spehlm...@gmail.com> Authored: Tue Feb 21 10:22:14 2017 -0600 Committer: cramja <marc.spehlm...@gmail.com> Committed: Tue Feb 21 10:22:14 2017 -0600 ---------------------------------------------------------------------- third_party/download_and_patch_prerequisites.sh | 4 + third_party/patches/linenoise/linenoise.c.patch | 89 ++++++++++++++++++++ third_party/patches/linenoise/linenoise.h.patch | 29 +++++++ 3 files changed, 122 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/1572762a/third_party/download_and_patch_prerequisites.sh ---------------------------------------------------------------------- diff --git a/third_party/download_and_patch_prerequisites.sh b/third_party/download_and_patch_prerequisites.sh index b5f5cac..fd6106c 100755 --- a/third_party/download_and_patch_prerequisites.sh +++ b/third_party/download_and_patch_prerequisites.sh @@ -89,7 +89,11 @@ do done # Apply patches now. + +# Apply linenoise patch cp ${PATCH_DIR}/linenoise/CMakeLists.txt ${THIRD_PARTY_SRC_DIR}/linenoise +patch ${THIRD_PARTY_SRC_DIR}/linenoise/linenoise.h ${PATCH_DIR}/linenoise/linenoise.h.patch +patch ${THIRD_PARTY_SRC_DIR}/linenoise/linenoise.c ${PATCH_DIR}/linenoise/linenoise.c.patch # Apply gflags patch. echo "Patching for gflags:" http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/1572762a/third_party/patches/linenoise/linenoise.c.patch ---------------------------------------------------------------------- diff --git a/third_party/patches/linenoise/linenoise.c.patch b/third_party/patches/linenoise/linenoise.c.patch new file mode 100644 index 0000000..cea6162 --- /dev/null +++ b/third_party/patches/linenoise/linenoise.c.patch @@ -0,0 +1,89 @@ +--- linenoise.c.new 2015-04-13 02:38:43.000000000 -0500 ++++ linenoise.c 2017-02-21 09:47:42.000000000 -0600 +@@ -1,7 +1,5 @@ +-/* linenoise.c -- VERSION 1.0 +- * +- * Guerrilla line editing library against the idea that a line editing lib +- * needs to be 20,000 lines of C code. ++/* linenoise.c -- guerrilla line editing library against the idea that a ++ * line editing lib needs to be 20,000 lines of C code. + * + * You can find the latest source code at: + * +@@ -120,6 +118,7 @@ + + #define LINENOISE_DEFAULT_HISTORY_MAX_LEN 100 + #define LINENOISE_MAX_LINE 4096 ++#define LINENOISE_TRIM_NEWLINE 0 + static char *unsupported_term[] = {"dumb","cons25","emacs",NULL}; + static linenoiseCompletionCallback *completionCallback = NULL; + +@@ -774,6 +773,10 @@ + history_len--; + free(history[history_len]); + if (mlmode) linenoiseEditMoveEnd(&l); ++#if !LINENOISE_TRIM_NEWLINE ++ l.buf[l.len++] = '\n'; ++ l.buf[l.len] = '\0'; ++#endif + return (int)l.len; + case CTRL_C: /* ctrl-c */ + errno = EAGAIN; +@@ -940,10 +943,12 @@ + /* Not a tty: read from file / pipe. */ + if (fgets(buf, buflen, stdin) == NULL) return -1; + count = strlen(buf); ++#if LINENOISE_TRIM_NEWLINE + if (count && buf[count-1] == '\n') { + count--; + buf[count] = '\0'; + } ++#endif + } else { + /* Interactive editing. */ + if (enableRawMode(STDIN_FILENO) == -1) return -1; +@@ -970,10 +975,12 @@ + fflush(stdout); + if (fgets(buf,LINENOISE_MAX_LINE,stdin) == NULL) return NULL; + len = strlen(buf); ++#if LINENOISE_TRIM_NEWLINE + while(len && (buf[len-1] == '\n' || buf[len-1] == '\r')) { + len--; + buf[len] = '\0'; + } ++#endif + return strdup(buf); + } else { + count = linenoiseRaw(buf,LINENOISE_MAX_LINE,prompt); +@@ -1021,12 +1028,29 @@ + memset(history,0,(sizeof(char*)*history_max_len)); + } + ++#if LINENOISE_TRIM_NEWLINE + /* Don't add duplicated lines. */ + if (history_len && !strcmp(history[history_len-1], line)) return 0; + +- /* Add an heap allocated copy of the line in the history. +- * If we reached the max length, remove the older line. */ + linecopy = strdup(line); ++#else ++ /* Remove trailing newlines so that editing from history doesn't get all wonky. */ ++ size_t line_len = strlen(line); ++ while ((line_len > 0) && (line[line_len - 1] == '\n')) { ++ --line_len; ++ } ++ linecopy = (char*) malloc(line_len + 1); ++ memcpy(linecopy, line, line_len); ++ linecopy[line_len] = '\0'; ++ ++ /* Don't add duplicated lines. */ ++ if (history_len && !strcmp(history[history_len-1], linecopy)) { ++ free(linecopy); ++ return 0; ++ } ++#endif ++ ++ /* If we reached the max length, remove the older line. */ + if (!linecopy) return 0; + if (history_len == history_max_len) { + free(history[0]); http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/1572762a/third_party/patches/linenoise/linenoise.h.patch ---------------------------------------------------------------------- diff --git a/third_party/patches/linenoise/linenoise.h.patch b/third_party/patches/linenoise/linenoise.h.patch new file mode 100644 index 0000000..feb597a --- /dev/null +++ b/third_party/patches/linenoise/linenoise.h.patch @@ -0,0 +1,29 @@ +--- linenoise.h.new 2015-04-13 02:38:43.000000000 -0500 ++++ linenoise.h 2017-02-21 09:44:05.000000000 -0600 +@@ -1,7 +1,5 @@ +-/* linenoise.h -- VERSION 1.0 +- * +- * Guerrilla line editing library against the idea that a line editing lib +- * needs to be 20,000 lines of C code. ++/* linenoise.h -- guerrilla line editing library against the idea that a ++ * line editing lib needs to be 20,000 lines of C code. + * + * See linenoise.c for more information. + * +@@ -36,9 +34,16 @@ + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + ++/* Modified from original by Craig Chasseur as follows: ++ * - include stddef.h in header for size_t ++ * - do not trim newlines from end of input ++ */ ++ + #ifndef __LINENOISE_H + #define __LINENOISE_H + ++#include <stddef.h> ++ + #ifdef __cplusplus + extern "C" { + #endif
