aboutsummaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
Diffstat (limited to 'libbb')
-rw-r--r--libbb/appletlib.c2
-rw-r--r--libbb/getpty.c6
-rw-r--r--libbb/lineedit.c5
3 files changed, 10 insertions, 3 deletions
diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index de27dd80e..aade9046a 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -661,7 +661,7 @@ void run_applet_and_exit(const char *name, char **argv)
#if ENABLE_BUILD_LIBBUSYBOX
-int lbb_main(int argc, char **argv)
+int lbb_main(char **argv)
#else
int main(int argc ATTRIBUTE_UNUSED, char **argv)
#endif
diff --git a/libbb/getpty.c b/libbb/getpty.c
index c006e34f5..36b3c6842 100644
--- a/libbb/getpty.c
+++ b/libbb/getpty.c
@@ -10,7 +10,9 @@
#define DEBUG 0
-int getpty(char *line, int size)
+#define DEBUG 0
+
+int getpty(char *line)
{
int p;
#if ENABLE_FEATURE_DEVPTS
@@ -24,7 +26,7 @@ int getpty(char *line, int size)
bb_perror_msg("ptsname error (is /dev/pts mounted?)");
return -1;
}
- safe_strncpy(line, name, size);
+ safe_strncpy(line, name, GETPTY_BUFSIZE);
return p;
}
#else
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 7e408207c..b25386bc0 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -294,7 +294,12 @@ static void redraw(int y, int back_cursor)
/* Delete the char in front of the cursor, optionally saving it
* for later putback */
+#if !ENABLE_FEATURE_EDITING_VI
+static void input_delete(void)
+#define input_delete(save) input_delete()
+#else
static void input_delete(int save)
+#endif
{
int j = cursor;