Browse Source
bash 5.0 is no longer in beta or alpha stage Signed-off-by: Yuvraj Saxena <infectedx27@gmail.com>android-5
committed by
Fredrik Fornwall
7 changed files with 33 additions and 105 deletions
@ -1,12 +0,0 @@ |
|||
diff -u -r ../bash-4.2/lib/readline/complete.c ./lib/readline/complete.c
|
|||
--- ../bash-4.2/lib/readline/complete.c 2011-01-16 21:32:57.000000000 +0100
|
|||
+++ ./lib/readline/complete.c 2014-01-13 12:28:56.338866643 +0100
|
|||
@@ -2021,7 +2021,7 @@
|
|||
const char *text; |
|||
int state; |
|||
{ |
|||
-#if defined (__WIN32__) || defined (__OPENNT)
|
|||
+#if defined (__WIN32__) || defined (__OPENNT) || defined (__ANDROID__)
|
|||
return (char *)NULL; |
|||
#else /* !__WIN32__ && !__OPENNT) */ |
|||
static char *username = (char *)NULL; |
@ -0,0 +1,11 @@ |
|||
--- a/lib/readline/complete.c
|
|||
+++ b/lib/readline/complete.c
|
|||
@@ -2231,7 +2231,7 @@
|
|||
char * |
|||
rl_username_completion_function (const char *text, int state) |
|||
{ |
|||
-#if defined (__WIN32__) || defined (__OPENNT)
|
|||
+#if defined (__WIN32__) || defined (__OPENNT) || defined (__ANDROID__)
|
|||
return (char *)NULL; |
|||
#else /* !__WIN32__ && !__OPENNT) */ |
|||
static char *username = (char *)NULL; |
@ -1,39 +0,0 @@ |
|||
diff -u -r ../bash-4.2/lib/readline/complete.c ./lib/readline/complete.c |
|||
--- ../bash-4.2/lib/readline/complete.c 2011-01-16 21:32:57.000000000 +0100 |
|||
+++ ./lib/readline/complete.c 2014-01-13 12:28:56.338866643 +0100 |
|||
@@ -2021,7 +2021,7 @@ |
|||
const char *text; |
|||
int state; |
|||
{ |
|||
-#if defined (__WIN32__) || defined (__OPENNT) |
|||
+#if defined (__WIN32__) || defined (__OPENNT) || defined (__ANDROID__) |
|||
return (char *)NULL; |
|||
#else /* !__WIN32__ && !__OPENNT) */ |
|||
static char *username = (char *)NULL; |
|||
diff -u -r ../bash-4.2/shell.c ./shell.c |
|||
--- ../bash-4.2/shell.c 2011-01-02 22:04:51.000000000 +0100 |
|||
+++ ./shell.c 2014-01-13 12:43:01.070846472 +0100 |
|||
@@ -1638,6 +1638,7 @@ |
|||
/* Don't fetch this more than once. */ |
|||
if (current_user.user_name == 0) |
|||
{ |
|||
+#ifndef __ANDROID__ |
|||
entry = getpwuid (current_user.uid); |
|||
if (entry) |
|||
{ |
|||
@@ -1649,12 +1650,15 @@ |
|||
} |
|||
else |
|||
{ |
|||
+#endif |
|||
current_user.user_name = _("I have no name!"); |
|||
current_user.user_name = savestring (current_user.user_name); |
|||
current_user.shell = savestring ("/bin/sh"); |
|||
current_user.home_dir = savestring ("/"); |
|||
+#ifndef __ANDROID__ |
|||
} |
|||
endpwent (); |
|||
+#endif |
|||
} |
|||
} |
|||
|
@ -1,5 +1,5 @@ |
|||
--- ../bash-4.2/pathnames.h.in 2009-01-04 20:32:40.000000000 +0100
|
|||
+++ ./pathnames.h.in 2014-02-04 18:34:17.000000000 +0100
|
|||
--- a/pathnames.h.in
|
|||
+++ b/pathnames.h.in
|
|||
@@ -22,10 +22,10 @@
|
|||
#define _PATHNAMES_H_ |
|||
|
@ -1,13 +0,0 @@ |
|||
Fix breakage on android-21 due "conflicting type for '__errno'" |
|||
|
|||
diff -u -r ../bash-4.3/y.tab.c ./y.tab.c
|
|||
--- ../bash-4.3/y.tab.c 2014-02-11 10:57:47.000000000 -0500
|
|||
+++ ./y.tab.c 2014-12-16 05:39:58.047338124 -0500
|
|||
@@ -280,7 +280,6 @@
|
|||
extern int bash_input_fd_changed; |
|||
#endif |
|||
|
|||
-extern int errno;
|
|||
/* **************************************************************** */ |
|||
/* */ |
|||
/* "Forward" declarations */ |
Loading…
Reference in new issue