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

print: use stdout instead of stderr for logging and progress 

stdout is the proper place for it. this also fixes the progress
bar in musl, which seems to not support using line buffering for
stderr.
cute-signatures
Timo Teräs 2013-10-11 14:52:34 +03:00
parent a6c4103df5
commit 5173787218
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/apk.c
View File

@ -266,7 +266,6 @@ static void on_sigwinch(int s)
static void setup_terminal(void) static void setup_terminal(void)
{ {
setvbuf(stderr, NULL, _IOLBF, BUFSIZ);
signal(SIGWINCH, on_sigwinch); signal(SIGWINCH, on_sigwinch);
signal(SIGPIPE, SIG_IGN); signal(SIGPIPE, SIG_IGN);
} }

20
src/print.c
View File

@ -35,7 +35,7 @@ int apk_get_screen_width(void)
if (apk_screen_width == 0) { if (apk_screen_width == 0) {
apk_screen_width = 50; apk_screen_width = 50;
if (ioctl(STDERR_FILENO, TIOCGWINSZ, &w) == 0 && if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &w) == 0 &&
w.ws_col > 50) w.ws_col > 50)
apk_screen_width = w.ws_col; apk_screen_width = w.ws_col;
} }
@ -77,14 +77,14 @@ void apk_print_progress(size_t done, size_t total)
last_percent = percent; last_percent = percent;
apk_progress_force = 0; apk_progress_force = 0;
fprintf(stderr, "\e7%3i%% [", percent); fprintf(stdout, "\e7%3i%% [", percent);
for (i = 0; i < bar; i++) for (i = 0; i < bar; i++)
fputc('#', stderr); fputc('#', stdout);
for (; i < bar_width; i++) for (; i < bar_width; i++)
fputc(' ', stderr); fputc(' ', stdout);
fputc(']', stderr); fputc(']', stdout);
fflush(stderr); fflush(stdout);
fputs("\e8\e[0K", stderr); fputs("\e8\e[0K", stdout);
} }
int apk_print_indented(struct apk_indent *i, apk_blob_t blob) int apk_print_indented(struct apk_indent *i, apk_blob_t blob)
@ -144,11 +144,11 @@ void apk_log(const char *prefix, const char *format, ...)
va_list va; va_list va;
if (prefix != NULL) if (prefix != NULL)
fprintf(stderr, "%s", prefix); fprintf(stdout, "%s", prefix);
va_start(va, format); va_start(va, format);
vfprintf(stderr, format, va); vfprintf(stdout, format, va);
va_end(va); va_end(va);
fprintf(stderr, "\n"); fprintf(stdout, "\n");
apk_progress_force = 1; apk_progress_force = 1;
} }