jaiden
/
apk-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

apk: do not enable automatically interactive mode with --simulate

cute-signatures
Timo Teräs 2012-02-24 08:47:19 +02:00
parent 4676c5d63a
commit e145738ace
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/apk.c
View File

@ -264,14 +264,21 @@ static void on_sigwinch(int s)
static void setup_terminal(void)
{
setvbuf(stderr, NULL, _IOLBF, BUFSIZ);
if (isatty(STDOUT_FILENO) && isatty(STDERR_FILENO) && isatty(STDIN_FILENO)) {
apk_flags |= APK_PROGRESS;
if (access("/etc/apk/interactive", F_OK) == 0)
apk_flags |= APK_INTERACTIVE;
}
signal(SIGWINCH, on_sigwinch);
}
static void setup_automatic_flags(void)
{
if (!isatty(STDOUT_FILENO) || !isatty(STDERR_FILENO) ||
!isatty(STDIN_FILENO))
return;
apk_flags |= APK_PROGRESS;
if (!(apk_flags & APK_SIMULATE) &&
access("/etc/apk/interactive", F_OK) == 0)
apk_flags |= APK_INTERACTIVE;
}
int main(int argc, char **argv)
{
struct apk_applet *applet;
@ -422,6 +429,7 @@ int main(int argc, char **argv)
break;
}
}
setup_automatic_flags();
if (applet == NULL) {
r = usage(NULL);