Mirrors/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-04-29 22:14:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

no pty for -c by default, and add -i to force pty

Browse Source
This commit is contained in:
LoveSy 2025-04-10 21:26:06 +08:00 committed by John Wu
parent 9ddeab034b
commit 4864c1112a
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
native/src/core/su/su.cpp
View File

@ -39,10 +39,11 @@ int quit_signals[] = { SIGALRM, SIGABRT, SIGHUP, SIGPIPE, SIGQUIT, SIGTERM, SIGI
"Usage: su [options] [-] [user [argument...]]\n\n" "Usage: su [options] [-] [user [argument...]]\n\n"
"Options:\n" "Options:\n"
" -c, --command COMMAND Pass COMMAND to the invoked shell\n" " -c, --command COMMAND Pass COMMAND to the invoked shell\n"
" -i, --interactive Force pseudo-terminal allocation when using -c\n"
" -g, --group GROUP Specify the primary group\n" " -g, --group GROUP Specify the primary group\n"
" -G, --supp-group GROUP Specify a supplementary group.\n" " -G, --supp-group GROUP Specify a supplementary group\n"
" The first specified supplementary group is also used\n" " The first specified supplementary group is also used\n"
" as a primary group if the option -g is not specified.\n" " as a primary group if the option -g is not specified\n"
" -Z, --context CONTEXT Change SELinux context\n" " -Z, --context CONTEXT Change SELinux context\n"
" -t, --target PID PID to take mount namespace from\n" " -t, --target PID PID to take mount namespace from\n"
" -h, --help Display this help message and exit\n" " -h, --help Display this help message and exit\n"
@ -103,6 +104,7 @@ int su_client_main(int argc, char *argv[]) {
{ "target", required_argument, nullptr, 't' }, { "target", required_argument, nullptr, 't' },
{ "group", required_argument, nullptr, 'g' }, { "group", required_argument, nullptr, 'g' },
{ "supp-group", required_argument, nullptr, 'G' }, { "supp-group", required_argument, nullptr, 'G' },
{ "interactive", no_argument, nullptr, 'i' },
{ nullptr, 0, nullptr, 0 }, { nullptr, 0, nullptr, 0 },
}; };
@ -117,7 +119,9 @@ int su_client_main(int argc, char *argv[]) {
strcpy(argv[i], "-M"); strcpy(argv[i], "-M");
} }
while ((c = getopt_long(argc, argv, "c:hlmps:VvuZ:Mt:g:G:", long_opts, nullptr)) != -1) { bool interactive = false;
while ((c = getopt_long(argc, argv, "c:hlimps:VvuZ:Mt:g:G:", long_opts, nullptr)) != -1) {
switch (c) { switch (c) {
case 'c': { case 'c': {
string command; string command;
@ -132,6 +136,9 @@ int su_client_main(int argc, char *argv[]) {
} }
case 'h': case 'h':
usage(EXIT_SUCCESS); usage(EXIT_SUCCESS);
case 'i':
interactive = true;
break;
case 'l': case 'l':
req.login = true; req.login = true;
break; break;
@ -217,10 +224,11 @@ int su_client_main(int argc, char *argv[]) {
} }
// Determine which one of our streams are attached to a TTY // Determine which one of our streams are attached to a TTY
interactive |= req.command.empty();
int atty = 0; int atty = 0;
if (isatty(STDIN_FILENO)) atty |= ATTY_IN; if (isatty(STDIN_FILENO) && interactive) atty |= ATTY_IN;
if (isatty(STDOUT_FILENO)) atty |= ATTY_OUT; if (isatty(STDOUT_FILENO) && interactive) atty |= ATTY_OUT;
if (isatty(STDERR_FILENO)) atty |= ATTY_ERR; if (isatty(STDERR_FILENO) && interactive) atty |= ATTY_ERR;
// Send stdin // Send stdin
send_fd(fd, (atty & ATTY_IN) ? -1 : STDIN_FILENO); send_fd(fd, (atty & ATTY_IN) ? -1 : STDIN_FILENO);