Move linenoise to its own static library.
This allows us to publish its license, as required by the terms of its license.
This commit is contained in:
parent
e7de18e445
commit
0cf08ed5ad
|
@ -0,0 +1,12 @@
|
|||
LOCAL_PATH:= $(call my-dir)
|
||||
include $(CLEAR_VARS)
|
||||
|
||||
# Static library
|
||||
# ========================================================
|
||||
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_MODULE:= liblinenoise
|
||||
LOCAL_SRC_FILES := linenoise.c
|
||||
|
||||
|
||||
include $(BUILD_STATIC_LIBRARY)
|
|
@ -0,0 +1,28 @@
|
|||
Copyright (c) 2010, Salvatore Sanfilippo <antirez at gmail dot com>
|
||||
All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions are met:
|
||||
|
||||
* Redistributions of source code must retain the above copyright notice,
|
||||
this list of conditions and the following disclaimer.
|
||||
|
||||
* Redistributions in binary form must reproduce the above copyright
|
||||
notice, this list of conditions and the following disclaimer in the
|
||||
documentation and/or other materials provided with the distribution.
|
||||
|
||||
* Neither the name of Redis nor the names of its contributors may be used
|
||||
to endorse or promote products derived from this software without
|
||||
specific prior written permission.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
||||
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
POSSIBILITY OF SUCH DAMAGE.
|
|
@ -68,8 +68,6 @@
|
|||
* Effect: moves cursor forward of n chars
|
||||
*
|
||||
*/
|
||||
|
||||
#ifdef WITH_LINENOISE
|
||||
|
||||
#include <termios.h>
|
||||
#include <unistd.h>
|
||||
|
@ -435,5 +433,3 @@ int linenoiseHistorySetMaxLen(int len) {
|
|||
history_len = history_max_len;
|
||||
return 1;
|
||||
}
|
||||
|
||||
#endif // WITH_LINENOISE
|
|
@ -34,12 +34,8 @@
|
|||
#ifndef __LINENOISE_H
|
||||
#define __LINENOISE_H
|
||||
|
||||
#ifdef WITH_LINENOISE
|
||||
|
||||
char *linenoise(const char *prompt);
|
||||
int linenoiseHistoryAdd(const char *line);
|
||||
int linenoiseHistorySetMaxLen(int len);
|
||||
|
||||
#endif
|
||||
|
||||
#endif /* __LINENOISE_H */
|
|
@ -13,7 +13,6 @@ LOCAL_SRC_FILES:= \
|
|||
expand.c \
|
||||
input.c \
|
||||
jobs.c \
|
||||
linenoise.c \
|
||||
main.c \
|
||||
memalloc.c \
|
||||
miscbltin.c \
|
||||
|
@ -34,6 +33,8 @@ LOCAL_MODULE:= sh
|
|||
|
||||
LOCAL_CFLAGS += -DSHELL -DWITH_LINENOISE
|
||||
|
||||
LOCAL_STATIC_LIBRARIES := liblinenoise
|
||||
|
||||
make_ash_files: PRIVATE_SRC_FILES := $(SRC_FILES)
|
||||
make_ash_files: PRIVATE_CFLAGS := $(LOCAL_CFLAGS)
|
||||
make_ash_files:
|
||||
|
|
|
@ -65,7 +65,7 @@ __RCSID("$NetBSD: input.c,v 1.39 2003/08/07 09:05:32 agc Exp $");
|
|||
#include "myhistedit.h"
|
||||
|
||||
#ifdef WITH_LINENOISE
|
||||
#include "linenoise.h"
|
||||
#include "../liblinenoise/linenoise.h"
|
||||
#endif
|
||||
|
||||
#define EOF_NLEFT -99 /* value of parsenleft when EOF pushed back */
|
||||
|
|
Loading…
Reference in New Issue