diff options
| author |   Martin Väth <martin@mvath.de> | 2010-04-28 00:10:13 +0200 |
|---|---|---|
| committer | Martin Väth <martin@mvath.de> | 2015-10-11 10:45:23 +0200 |
| commit | 1fd47cdef01ffeeb7d7d03257d23878eb6d0d335 (patch) | |
| tree | 175bc479436b9d4d52a09738075feb4467914c13 /sys-fs/squashfs-tools/files | |
| parent | magus: fix dates (diff) | |
| download | mv-1fd47cdef01ffeeb7d7d03257d23878eb6d0d335.tar.gz mv-1fd47cdef01ffeeb7d7d03257d23878eb6d0d335.tar.bz2 mv-1fd47cdef01ffeeb7d7d03257d23878eb6d0d335.zip | |
Bump squash_dir; add squashfs-tools with USE=progress-redirect patch
Diffstat (limited to 'sys-fs/squashfs-tools/files')
3 files changed, 92 insertions, 0 deletions
diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-3.3-progress-stderr.patch b/sys-fs/squashfs-tools/files/squashfs-tools-3.3-progress-stderr.patch new file mode 100644 index 00000000..4f1d0bdf --- /dev/null +++ b/sys-fs/squashfs-tools/files/squashfs-tools-3.3-progress-stderr.patch @@ -0,0 +1,26 @@ +--- squashfs-tools/mksquashfs.c ++++ squashfs-tools/mksquashfs.c +@@ -1832,17 +1832,17 @@ + if(!progress || columns - used < 0) + return; + +- printf("\r["); ++ fprintf(stderr, "\r["); + + while (hashes --) +- putchar('='); ++ putc('=', stderr); + + while(spaces --) +- putchar(' '); ++ putc(' ', stderr); + +- printf("] %*lld/%*lld", max_digits, current, max_digits, max); +- printf(" %3lld%%", current * 100 / max); +- fflush(stdout); ++ fprintf(stderr, "] %*lld/%*lld", max_digits, current, max_digits, max); ++ fprintf(stderr, " %3lld%%", current * 100 / max); ++ fflush(stderr); + } + + diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-3.4-progress-stderr.patch b/sys-fs/squashfs-tools/files/squashfs-tools-3.4-progress-stderr.patch new file mode 100644 index 00000000..d06f9789 --- /dev/null +++ b/sys-fs/squashfs-tools/files/squashfs-tools-3.4-progress-stderr.patch @@ -0,0 +1,37 @@ +--- squashfs-tools/mksquashfs.c ++++ squashfs-tools/mksquashfs.c +@@ -2254,26 +2254,26 @@ + int spaces = columns - used - hashes; + + if(current > max) { +- printf("%lld %lld\n", current, max); ++ fprintf(stderr, "%lld %lld\n", current, max); + return; + } + + if(columns - used < 0) + return; + +- printf("\r["); ++ fprintf(stderr, "\r["); + + while (hashes --) +- putchar('='); ++ putc('=', stderr); + +- putchar(rotate_list[rotate]); ++ putc(rotate_list[rotate], stderr); + + while(spaces --) +- putchar(' '); ++ putc(' ', stderr); + +- printf("] %*lld/%*lld", max_digits, current, max_digits, max); +- printf(" %3lld%%", current * 100 / max); +- fflush(stdout); ++ fprintf(stderr, "] %*lld/%*lld", max_digits, current, max_digits, max); ++ fprintf(stderr, " %3lld%%", current * 100 / max); ++ fflush(stderr); + } + + diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-4.0-progress-stderr.patch b/sys-fs/squashfs-tools/files/squashfs-tools-4.0-progress-stderr.patch new file mode 100644 index 00000000..d6669773 --- /dev/null +++ b/sys-fs/squashfs-tools/files/squashfs-tools-4.0-progress-stderr.patch @@ -0,0 +1,29 @@ +--- squashfs-tools/mksquashfs.c ++++ squashfs-tools/mksquashfs.c +@@ -2570,19 +2570,19 @@ + previous = current; + } + +- printf("\r["); ++ fprintf(stderr, "\r["); + + while (hashes --) +- putchar('='); ++ putc('=', stderr); + +- putchar(rotate_list[rotate]); ++ putc(rotate_list[rotate], stderr); + + while(spaces --) +- putchar(' '); ++ putc(' ', stderr); + +- printf("] %*lld/%*lld", max_digits, current, max_digits, max); +- printf(" %3lld%%", current * 100 / max); +- fflush(stdout); ++ fprintf(stderr, "] %*lld/%*lld", max_digits, current, max_digits, max); ++ fprintf(stderr, " %3lld%%", current * 100 / max); ++ fflush(stderr); + } + + |