Skip to content

actions: restore stderr for interactive pkg_add prompts #143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mRrvz wants to merge 1 commit into
base: master
Choose a base branch
from
Open

actions: restore stderr for interactive pkg_add prompts #143

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions actions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@

static int warn_count = 0, err_count = 0;
static uint8_t said = 0;
static int saved_stderr = -1;
FILE *err_fp = NULL;
long int rm_filepos = -1;
char pkgtools_flags[5];
Expand Down Expand Up @@ -229,6 +230,7 @@ open_pi_log(void)
exit(EXIT_FAILURE);
}

saved_stderr = dup(STDERR_FILENO);
dup2(fileno(err_fp), STDERR_FILENO);

rm_filepos = ftell(err_fp);
Expand All @@ -240,6 +242,11 @@ static void
close_pi_log(int output)
{
if (!verbosity && output) {
if (saved_stderr != -1) {
dup2(saved_stderr, STDERR_FILENO);
close(saved_stderr);
saved_stderr = -1;
}
analyse_pkglog(rm_filepos);
printf(MSG_WARNS_ERRS, warn_count, err_count);
if (warn_count > 0 || err_count > 0)
Expand Down Expand Up @@ -432,9 +439,22 @@ do_pkg_install(Plisthead *installhead)

log_tag("[%d/%d] %s %s...\n", i++, count, action,
p->ipkg->rpkg->full);

/*
* Temporarily restore stderr to the terminal so that
* any interactive prompts from pkg_add (e.g. signature
* verification) are visible to the user.
*/
if (saved_stderr != -1)
dup2(saved_stderr, STDERR_FILENO);

if (fexec(pkg_add, pflags, p->ipkg->pkgfs, NULL)
== EXIT_FAILURE)
rc = EXIT_FAILURE;

/* Redirect stderr back to the logfile */
if (!verbosity && err_fp != NULL)
dup2(fileno(err_fp), STDERR_FILENO);
}

close_pi_log(1);
Expand Down