Fix flock -c

https://android.googlesource.com/platform/bionic/+/refs/tags/android-11.0.0_r39/tests/grp_pwd_test.cpp#81
topjohnwu · Jul 28, 2021 · d755581 · d755581 · mahamadkoye · Jan 15, 2023
1 parent 84ce191
commit d755581
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/include/libbb.h b/include/libbb.h
@@ -2265,12 +2265,12 @@ static ALWAYS_INLINE void* not_const_pp(const void *p) { return (void*)p; }
  * use bb_default_login_shell and following defines.
  * If you change LIBBB_DEFAULT_LOGIN_SHELL,
  * don't forget to change increment constant. */
-#define LIBBB_DEFAULT_LOGIN_SHELL  "-/sbin/sh"
+#define LIBBB_DEFAULT_LOGIN_SHELL  "-/system/bin/sh"
 extern const char bb_default_login_shell[] ALIGN1;
 /* "/bin/sh" */
 #define DEFAULT_SHELL              (bb_default_login_shell+1)
 /* "sh" */
-#define DEFAULT_SHELL_SHORT_NAME   (bb_default_login_shell+7)
+#define DEFAULT_SHELL_SHORT_NAME   (bb_default_login_shell+13)
 
 /* The following devices are the same on all systems.  */
 #define CURRENT_TTY "/dev/tty"

diff --git a/libbb/get_shell_name.c b/libbb/get_shell_name.c
@@ -17,6 +17,10 @@ const char* FAST_FUNC get_shell_name(void)
 	if (shell && shell[0])
 		return shell;
 
+#ifdef __ANDROID__
+	return DEFAULT_SHELL_SHORT_NAME;
+#endif
+
 	pw = getpwuid(getuid());
 	if (pw && pw->pw_shell && pw->pw_shell[0])
 		return pw->pw_shell;