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

print: don't print spurious newlines

cute-signatures
Timo Teräs 2018-11-02 15:33:49 +02:00
parent f38d1f74af
commit 59271f8c13
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/print.c
View File

@ -100,10 +100,10 @@ void apk_print_progress(size_t done, size_t total)
int apk_print_indented(struct apk_indent *i, apk_blob_t blob) int apk_print_indented(struct apk_indent *i, apk_blob_t blob)
{ {
if (i->x + blob.len + 1 >= apk_get_screen_width()) if (i->x <= i->indent)
i->x = printf("\n%*s" BLOB_FMT, i->indent, "", BLOB_PRINTF(blob)) - 1;
else if (i->x <= i->indent)
i->x += printf("%*s" BLOB_FMT, i->indent - i->x, "", BLOB_PRINTF(blob)); i->x += printf("%*s" BLOB_FMT, i->indent - i->x, "", BLOB_PRINTF(blob));
else if (i->x + blob.len + 1 >= apk_get_screen_width())
i->x = printf("\n%*s" BLOB_FMT, i->indent, "", BLOB_PRINTF(blob)) - 1;
else else
i->x += printf(" " BLOB_FMT, BLOB_PRINTF(blob)); i->x += printf(" " BLOB_FMT, BLOB_PRINTF(blob));
apk_progress_force = 1; apk_progress_force = 1;

3
test/provides10.test
View File

@ -7,5 +7,4 @@ ERROR: unsatisfiable constraints:
conflicted-provider (virtual): conflicted-provider (virtual):
provided by: conflicted-provider-a provided by: conflicted-provider-a
conflicted-provider-b conflicted-provider-b
required by: required by: conflicted-dep-0.1[conflicted-provider]
conflicted-dep-0.1[conflicted-provider]

3
test/provides11.test
View File

@ -7,5 +7,4 @@ ERROR: unsatisfiable constraints:
conflicted-provider (virtual): conflicted-provider (virtual):
provided by: conflicted-provider-a provided by: conflicted-provider-a
conflicted-provider-b conflicted-provider-b
required by: required by: conflicted-dep-0.1[conflicted-provider]
conflicted-dep-0.1[conflicted-provider]