- Pacman-dev - lists.archlinux.org

[Git][pacman/pacman][master] repo-add: fix exit on mktemp failure
by Allan McRae (＠allan) 28 Aug '23

28 Aug '23

Allan McRae pushed to branch master at Pacman / Pacman Commits: ffde12ce by Nicolas Rolans at 2023-08-28T12:43:56+00:00 repo-add: fix exit on mktemp failure - - - - - 1 changed file: - scripts/repo-add.sh.in View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/ffde12cebdd146ac5246490… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/ffde12cebdd146ac5246490… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman][master] Replace md5sums with sha256sums in documentation
by Allan McRae (＠allan) 28 Aug '23

28 Aug '23

Allan McRae pushed to branch master at Pacman / Pacman Commits: 37dae721 by Jouke Witteveen at 2023-08-28T12:27:28+00:00 Replace md5sums with sha256sums in documentation As noted in !24, md5sums are outdated. - - - - - 2 changed files: - doc/PKGBUILD-example.txt - doc/makepkg-template.1.asciidoc View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/37dae721d37647981514557… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/37dae721d37647981514557… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman][master] proto: Change the default checksum from md5 to sha256
by Allan McRae (＠allan) 28 Aug '23

28 Aug '23

Allan McRae pushed to branch master at Pacman / Pacman Commits: aa3a1bc3 by Ben Westover at 2023-08-28T22:25:10+10:00 proto: Change the default checksum from md5 to sha256 MD5 isn't a very good checksum, and the PKGBUILD page on the Arch Wiki states that it should not be used, instead recommending sha256 or b2. This patch changes the default from md5 to sha256 because that seems to be the most commonly used checksum today. Signed-off-by: Ben Westover <kwestover.kw@gmail.com> - - - - - 3 changed files: - proto/PKGBUILD-split.proto - proto/PKGBUILD-vcs.proto - proto/PKGBUILD.proto View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/aa3a1bc3b50d797fb75278f… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/aa3a1bc3b50d797fb75278f… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman][master] pacman: do not check file md5sums
by Allan McRae (＠allan) 28 Aug '23

28 Aug '23

Allan McRae pushed to branch master at Pacman / Pacman Commits: 298755c9 by Allan McRae at 2023-08-28T22:17:51+10:00 pacman: do not check file md5sums The file md5sums are removed from the .MTREE file, so pacman should not attempt to check them. Signed-off-by: Allan McRae <allan@archlinux.org> - - - - - 1 changed file: - src/pacman/check.c View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/298755c905fdd40f9611abe… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/298755c905fdd40f9611abe… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman][master] 3 commits: makepkg: immutable git sources by hashing the checkout content
by Allan McRae (＠allan) 28 Aug '23

28 Aug '23

Allan McRae pushed to branch master at Pacman / Pacman Commits: 2fc2ab6c by Levente Polyak at 2023-08-28T22:15:03+10:00 makepkg: immutable git sources by hashing the checkout content This feature makes Git VCS build inputs immutable by adding support for pinning a Git checkout by a hash of its content using the deterministic export functionality `git archive`. This feature aids packagers by allowing them to use simple and convenient refnames (instead of full commit hashes) in the `PKGBUILD` while still preserving security implications of immutable build inputs using a trusted cryptographic hash function of the content. Previously VCS source downloads have been skipped for `--geninteg` and `--source` as both options did not need a checkout. This commit changes this behavior by forcing the download of all sources as integrity checks and generation requires to have an up to date state. Signed-off-by: Levente Polyak <anthraxx@archlinux.org> - - - - - ca3c873d by Levente Polyak at 2023-08-28T22:15:03+10:00 makepkg: immutable mercurial sources by hashing the checkout content This feature makes Mercurial VCS build inputs immutable by adding support for pinning a Mercurial checkout by a hash of its content using the deterministic export functionality `hg archive`. This feature aids packagers by allowing them to use simple and convenient refnames (instead of full commit hashes) in the `PKGBUILD` while still preserving security implications of immutable build inputs using a trusted cryptographic hash function of the content. Signed-off-by: Levente Polyak <anthraxx@archlinux.org> - - - - - ee933acf by Levente Polyak at 2023-08-28T22:15:03+10:00 makepkg: immutable bzr by hashing the checkout content This feature makes bzr VCS build inputs immutable by adding support for pinning a bzr checkout by a hash of its content using the deterministic export functionality `bzr export`. This feature allows to preserve security implications of immutable build inputs using a trusted cryptographic hash function of the content. Signed-off-by: Levente Polyak <anthraxx@archlinux.org> - - - - - 8 changed files: - doc/PKGBUILD.5.asciidoc - scripts/libmakepkg/integrity/generate_checksum.sh.in - scripts/libmakepkg/integrity/verify_checksum.sh.in - scripts/libmakepkg/source/bzr.sh.in - scripts/libmakepkg/source/file.sh.in - scripts/libmakepkg/source/git.sh.in - scripts/libmakepkg/source/hg.sh.in - scripts/makepkg.sh.in View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/843bf21e794c79c5b3bcf8… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/compare/843bf21e794c79c5b3bcf8… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[Git][pacman/pacman][master] libmakepkg: Fix non-reproducible binaries by processing debuginfo in order
by Allan McRae (＠allan) 28 Aug '23

28 Aug '23

Allan McRae pushed to branch master at Pacman / Pacman Commits: 843bf21e by kpcyrd at 2023-08-27T13:03:40+02:00 libmakepkg: Fix non-reproducible binaries by processing debuginfo in order - - - - - 1 changed file: - scripts/libmakepkg/tidy/strip.sh.in View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/843bf21e794c79c5b3bcf8a… -- View it on GitLab: https://gitlab.archlinux.org/pacman/pacman/-/commit/843bf21e794c79c5b3bcf8a… You're receiving this email because of your account on gitlab.archlinux.org.

1 0

[PATCH] alpm_run_chroot: Fix the execution of pacman hooks
by Dragan Simic 21 Aug '23

21 Aug '23

During a full system update of a Manjaro ARM installation, on an ARM-based computer, of course, I spotted a highly conspicuous error message in the output of pacman: ( 3/18) Creating temporary files... Assertion 'fd' failed at src/tmpfiles/tmpfiles.c:843, function fd_set_perms(). Aborting. /usr/share/libalpm/scripts/systemd-hook: line 28: 1735 Aborted (core dumped) /usr/bin/systemd-tmpfiles --create error: command failed to execute correctly Here's also an excerpt from /var/log/pacman.log (the stack trace was rather unusable, so I'll skip it for the sake of brevity): [ALPM] running '30-systemd-tmpfiles.hook'... [ALPM-SCRIPTLET] Assertion 'fd' failed at src/tmpfiles/tmpfiles.c:843, function fd_set_perms(). Aborting. [ALPM-SCRIPTLET] /usr/share/libalpm/scripts/systemd-hook: line 28: 1735 Aborted (core dumped) /usr/bin/systemd-tmpfiles --create Running "systemd-tmpfiles --create" manually afterwards resulted in no errors, which made the error message even more conspicuous. Thus, executing /usr/share/libalpm/hooks/30-systemd-tmpfiles.hook failed, but only when it was run from within pacman. I also saw a few people complaining about the same error message on Manjaro and Arch Linux forums, even with one complaint dating more than a few years ago, but nobody came through with a fix or workaround. After a detailed and rather lengthy investigation, it turned out that the root cause was twofold, as described below: 1) For its pacman package, Arch Linux ARM applies a patch named 0003-Revert-alpm_run_chroot-always-connect-parent2child-p.patch that reverts rather old pacman commit 1d6583a5, for an unknown reason. This patch causes the error like clockwork. 2) The code in pacman's lib/libalpm/util.c that executes the hooks by forking a child has some rather subtle bugs that allow the error to occur under certain circumstances. Regarding the first point, the patch from Arch Linux ARM creates a condition in which the file descriptor 0 is closed by calling close(0) and left closed when the executed hook has no option "NeedsTargets" specified, which is the case for the hook mentioned above, /usr/share/libalpm/hooks/30-systemd-tmpfiles.hook. As a result, the first call to open() during the execution of the hook returns 0 as the file descriptor, because 0 is the lowest currently available value. It would all go unnoticed, but systemd-tmpfiles performed assert(fd) checks in its file src/tmpfiles/tmpfiles.c, which failed because fd equaled 0. These checks seem to have been removed in the meantime, which effectively made the error go away, but the original issue still remains. Regarding the second point, function _alpm_run_chroot() that executes hooks in a fork()ed child does not execute dup2() properly, but instead executes close() followed by dup2(). The man page for dup2() clearly states that such attempts to re-implement the equivalent functionality must be avoided, as visible in this quotation: The dup2() system call performs the same task as dup(), but instead of using the lowest-numbered unused file descriptor, it uses the file descriptor number specified in newfd. In other words, the file descriptor newfd is adjusted so that it now refers to the same open file description as oldfd. If the file descriptor newfd was previously open, it is closed before being reused; the close is performed silently (i.e., any errors during the close are not reported by dup2()). The steps of closing and reusing the file descriptor newfd are performed atomically. This is important, because trying to implement equivalent functionality using close(2) and dup() would be subject to race conditions, whereby newfd might be reused between the two steps. Such reuse could happen because the main program is interrupted by a signal handler that allocates a file descriptor, or because a parallel thread allocates a file descriptor. As a result, a condition can occur in which the file descriptor 0 is closed by calling close(0), and left closed after the while loop that fails to execute dup2() because of receiving EBUSY, resulting in the original issue. On top of that, failed attempts to execute dup2() should be treated as fatal errors instead of being silently ignored. Let's improve the code to prevent the issues described in the second point, while not applying the above-mentioned Arch Linux ARM package patch fixes the issues decribed in the first point. While there, perform a minor cleanup as well, to make the formatting of the code a tiny bit more consistent. Signed-off-by: Dragan Simic <dsimic(a)manjaro.org> --- lib/libalpm/util.c | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index dffa3b51..97e87c6c 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -639,28 +639,39 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *cmd, char *const argv[], if(pid == 0) { /* this code runs for the child only (the actual chroot/exec) */ - close(0); - close(1); - close(2); - while(dup2(child2parent_pipefd[HEAD], 1) == -1 && errno == EINTR); - while(dup2(child2parent_pipefd[HEAD], 2) == -1 && errno == EINTR); - while(dup2(parent2child_pipefd[TAIL], 0) == -1 && errno == EINTR); - close(parent2child_pipefd[TAIL]); close(parent2child_pipefd[HEAD]); close(child2parent_pipefd[TAIL]); + while(dup2(child2parent_pipefd[HEAD], STDERR_FILENO) == -1) { + if(errno != EINTR) { + /* at this point, the child cannot talk through the parent */ + exit(1); + } + } + while(dup2(parent2child_pipefd[TAIL], STDIN_FILENO) == -1) { + if(errno != EINTR) { + /* use fprintf() instead of _alpm_log() to send output through the parent */ + fprintf(stderr, _("could not redirect standard input (%s)\n"), strerror(errno)); + exit(1); + } + } + close(parent2child_pipefd[TAIL]); + while(dup2(child2parent_pipefd[HEAD], STDOUT_FILENO) == -1) { + if(errno != EINTR) { + fprintf(stderr, _("could not redirect standard output (%s)\n"), strerror(errno)); + exit(1); + } + } close(child2parent_pipefd[HEAD]); if(cwdfd >= 0) { close(cwdfd); } - /* use fprintf instead of _alpm_log to send output through the parent */ if(chroot(handle->root) != 0) { fprintf(stderr, _("could not change the root directory (%s)\n"), strerror(errno)); exit(1); } if(chdir("/") != 0) { - fprintf(stderr, _("could not change directory to %s (%s)\n"), - "/", strerror(errno)); + fprintf(stderr, _("could not change directory to %s (%s)\n"), "/", strerror(errno)); exit(1); } /* bash assumes it's being run under rsh/ssh if stdin is a socket and -- 2.33.1

3 6

[PATCH v2] alpm_run_chroot: Fix the execution of pacman hooks
by Dragan Simic 20 Aug '23

20 Aug '23

Running "pacman -Syyu" to perform a full system update resulted in a rather conspicuous error message in the output of pacman: ( 3/18) Creating temporary files... Assertion 'fd' failed at src/tmpfiles/tmpfiles.c:843, function fd_set_perms(). Aborting. /usr/share/libalpm/scripts/systemd-hook: line 28: 1735 Aborted (core dumped) /usr/bin/systemd-tmpfiles --create error: command failed to execute correctly Expectedly, running "systemd-tmpfiles --create" manually afterwards went just fine and resulted in no errors, leading to a conclusion that executing /usr/share/libalpm/hooks/30-systemd-tmpfiles.hook failed, but only when it was run from within pacman. After a detailed and rather lengthy investigation, it turned out the code in lib/libalpm/util.c that executes the hooks by forking a child has some bugs that allow the error to occur under certain circumstances. In particular, function _alpm_run_chroot() that executes hooks in a fork()ed child does not employ dup2() properly, but instead executes close() followed by dup2(). The man page for dup2() clearly states in the quotation below that attempts to re-implement the equivalent functionality, which is the case in function _alpm_run_chroot(), must be avoided: The dup2() system call performs the same task as dup(), but instead of using the lowest-numbered unused file descriptor, it uses the file descriptor number specified in newfd. In other words, the file descriptor newfd is adjusted so that it now refers to the same open file description as oldfd. If the file descriptor newfd was previously open, it is closed before being reused; the close is performed silently (i.e., any errors during the close are not reported by dup2()). The steps of closing and reusing the file descriptor newfd are performed atomically. This is important, because trying to implement equivalent functionality using close(2) and dup() would be subject to race conditions, whereby newfd might be reused between the two steps. Such reuse could happen because the main program is interrupted by a signal handler that allocates a file descriptor, or because a parallel thread allocates a file descriptor. As a result, a condition can occur in which the file descriptor 0 is closed by calling close(0), and left closed after the while loop that fails to execute dup2() because of receiving EBUSY, resulting in the described issues. Also, failed attempts to execute dup2() should be treated as fatal errors instead of being silently ignored. Let's improve the code to prevent the described issues. While there, perform a minor cleanup as well, to make the formatting of the code a tiny bit more consistent. Signed-off-by: Dragan Simic <dsimic(a)manjaro.org> --- lib/libalpm/util.c | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index dffa3b51..97e87c6c 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -639,28 +639,39 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *cmd, char *const argv[], if(pid == 0) { /* this code runs for the child only (the actual chroot/exec) */ - close(0); - close(1); - close(2); - while(dup2(child2parent_pipefd[HEAD], 1) == -1 && errno == EINTR); - while(dup2(child2parent_pipefd[HEAD], 2) == -1 && errno == EINTR); - while(dup2(parent2child_pipefd[TAIL], 0) == -1 && errno == EINTR); - close(parent2child_pipefd[TAIL]); close(parent2child_pipefd[HEAD]); close(child2parent_pipefd[TAIL]); + while(dup2(child2parent_pipefd[HEAD], STDERR_FILENO) == -1) { + if(errno != EINTR) { + /* at this point, the child cannot talk through the parent */ + exit(1); + } + } + while(dup2(parent2child_pipefd[TAIL], STDIN_FILENO) == -1) { + if(errno != EINTR) { + /* use fprintf() instead of _alpm_log() to send output through the parent */ + fprintf(stderr, _("could not redirect standard input (%s)\n"), strerror(errno)); + exit(1); + } + } + close(parent2child_pipefd[TAIL]); + while(dup2(child2parent_pipefd[HEAD], STDOUT_FILENO) == -1) { + if(errno != EINTR) { + fprintf(stderr, _("could not redirect standard output (%s)\n"), strerror(errno)); + exit(1); + } + } close(child2parent_pipefd[HEAD]); if(cwdfd >= 0) { close(cwdfd); } - /* use fprintf instead of _alpm_log to send output through the parent */ if(chroot(handle->root) != 0) { fprintf(stderr, _("could not change the root directory (%s)\n"), strerror(errno)); exit(1); } if(chdir("/") != 0) { - fprintf(stderr, _("could not change directory to %s (%s)\n"), - "/", strerror(errno)); + fprintf(stderr, _("could not change directory to %s (%s)\n"), "/", strerror(errno)); exit(1); } /* bash assumes it's being run under rsh/ssh if stdin is a socket and

1 0

[PATCH v3] query: permit filter options with --owns
by Ronan Pigott 20 Aug '23

20 Aug '23

Signed-off-by: Ronan Pigott <ronan(a)rjp.ie> --- Changes in v2: - Use forward declarations - Drop the unnecessary error message Changes in v3: - Remove one unnecessary forward decl src/pacman/pacman.c | 1 - src/pacman/query.c | 5 +++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index e5c6e4200932..320c7654e0a7 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -608,7 +608,6 @@ static void checkargs_query(void) } else if(config->op_q_owns) { invalid_opt(config->group, "--owns", "--groups"); checkargs_query_display_opts("--owns"); - checkargs_query_filter_opts("--owns"); } else if(config->group) { checkargs_query_display_opts("--groups"); } diff --git a/src/pacman/query.c b/src/pacman/query.c index d75c4c801be5..bcf948514ca3 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -135,6 +135,8 @@ cleanup: return (success ? resolved_path : NULL); } +static int filter(alpm_pkg_t *pkg); + static int query_fileowner(alpm_list_t *targets) { int ret = 0; @@ -210,6 +212,9 @@ static int query_fileowner(alpm_list_t *targets) } for(i = packages; i && (!found || is_dir); i = alpm_list_next(i)) { + if (!filter(i->data)) { + continue; + } if(alpm_filelist_contains(alpm_pkg_get_files(i->data), rel_path)) { print_query_fileowner(rpath, i->data); found = 1; -- 2.41.0

2 1

[PATCH] Leverage the U+EE00..U+EE05 unicode characters to make pretty progress bars
by Lénaïc Huard 17 Jun '23

17 Jun '23

Some unicode fonts are now implementing special glyph to render pretty progress bars. Here are some examples: * FiraCode [1] [2] * Iosevka [3] [4] [5] * JuliaMono [3] This change introduces a new parameter, `PrettyProgressBar` that triggers the use of those characters to render progress bars. Here is an example of how it renders with this new option and the FiraCode font: [6] [1] https://github.com/tonsky/FiraCode/releases/tag/6 [2] https://github.com/tonsky/FiraCode/issues/1182 [3] https://github.com/tonsky/FiraCode/issues/1182#issuecomment-1525953517 [4] https://github.com/be5invis/Iosevka/releases/tag/v11.2.0 [5] https://github.com/be5invis/Iosevka/issues/1327 [6] https://i2.paste.pics/OK03I.png Signed-off-by: Lénaïc Huard <lenaic(a)lhuard.fr> --- doc/pacman.conf.5.asciidoc | 3 + etc/pacman.conf.in | 1 + scripts/completion/zsh_completion.in | 1 + src/pacman/callback.c | 108 ++++++++++++++++----------- src/pacman/conf.c | 3 + src/pacman/conf.h | 2 + src/pacman/pacman-conf.c | 3 + 7 files changed, 76 insertions(+), 45 deletions(-) diff --git a/doc/pacman.conf.5.asciidoc b/doc/pacman.conf.5.asciidoc index 77a3907f..daab30d4 100644 --- a/doc/pacman.conf.5.asciidoc +++ b/doc/pacman.conf.5.asciidoc @@ -186,6 +186,9 @@ Options *Color*:: Automatically enable colors only when pacman's output is on a tty. +*PrettyProgressBar*:: + Use specific U+EE00..U+EE05 unicode characters to render pretty progress bars. + *NoProgressBar*:: Disables progress bars. This is useful for terminals which do not support escape characters. diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in index 1799efc7..9ce2b938 100644 --- a/etc/pacman.conf.in +++ b/etc/pacman.conf.in @@ -31,6 +31,7 @@ Architecture = auto # Misc options #UseSyslog #Color +#PrettyProgressBar #NoProgressBar CheckSpace #VerbosePkgLists diff --git a/scripts/completion/zsh_completion.in b/scripts/completion/zsh_completion.in index 5fd8aebc..e64a603e 100644 --- a/scripts/completion/zsh_completion.in +++ b/scripts/completion/zsh_completion.in @@ -514,6 +514,7 @@ _pacman_conf_general_directives=( 'CheckSpace' 'VerbosePkgLists' 'DisableDownloadTimeout' + 'PrettyProgressBar' 'NoProgressBar' 'ParallelDownloads' 'CleanMethod' diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 75c74f8b..f72a91cf 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -153,54 +153,72 @@ static int64_t get_update_timediff(int first_call) static void fill_progress(const int bar_percent, const int disp_percent, const int proglen) { - /* 8 = 1 space + 1 [ + 1 ] + 5 for percent */ - const int hashlen = proglen > 8 ? proglen - 8 : 0; - const int hash = bar_percent * hashlen / 100; - static int lasthash = 0, mouth = 0; int i; - if(bar_percent == 0) { - lasthash = 0; - mouth = 0; + /* if pretty progress bar enabled */ + if(config->pretty) { + /* 8 = 1 space + 1  + 1  + 5 for percent */ + const int hashlen = proglen > 8 ? proglen - 6 : 0; + const int hash = bar_percent * hashlen / 100; + + if(hashlen > 2) { + fputs(hash > 0 ? " " : " ", stdout); + for(i = hashlen - 1; i > 1; --i) { + fputs(i > hashlen - hash ? "" : "", stdout); + } + fputs(hash == hashlen ? "" : "", stdout); + } + + } else { + /* 8 = 1 space + 1 [ + 1 ] + 5 for percent */ + const int hashlen = proglen > 8 ? proglen - 8 : 0; + const int hash = bar_percent * hashlen / 100; + static int lasthash = 0, mouth = 0; + + if(bar_percent == 0) { + lasthash = 0; + mouth = 0; + } + + if(hashlen > 0) { + fputs(" [", stdout); + for(i = hashlen; i > 0; --i) { + /* if special progress bar enabled */ + if(config->chomp) { + if(i > hashlen - hash) { + putchar('-'); + } else if(i == hashlen - hash) { + if(lasthash == hash) { + if(mouth) { + fputs("\033[1;33mC\033[m", stdout); + } else { + fputs("\033[1;33mc\033[m", stdout); + } + } else { + lasthash = hash; + mouth = mouth == 1 ? 0 : 1; + if(mouth) { + fputs("\033[1;33mC\033[m", stdout); + } else { + fputs("\033[1;33mc\033[m", stdout); + } + } + } else if(i % 3 == 0) { + fputs("\033[0;37mo\033[m", stdout); + } else { + fputs("\033[0;37m \033[m", stdout); + } + } /* else regular progress bar */ + else if(i > hashlen - hash) { + putchar('#'); + } else { + putchar('-'); + } + } + putchar(']'); + } } - if(hashlen > 0) { - fputs(" [", stdout); - for(i = hashlen; i > 0; --i) { - /* if special progress bar enabled */ - if(config->chomp) { - if(i > hashlen - hash) { - putchar('-'); - } else if(i == hashlen - hash) { - if(lasthash == hash) { - if(mouth) { - fputs("\033[1;33mC\033[m", stdout); - } else { - fputs("\033[1;33mc\033[m", stdout); - } - } else { - lasthash = hash; - mouth = mouth == 1 ? 0 : 1; - if(mouth) { - fputs("\033[1;33mC\033[m", stdout); - } else { - fputs("\033[1;33mc\033[m", stdout); - } - } - } else if(i % 3 == 0) { - fputs("\033[0;37mo\033[m", stdout); - } else { - fputs("\033[0;37m \033[m", stdout); - } - } /* else regular progress bar */ - else if(i > hashlen - hash) { - putchar('#'); - } else { - putchar('-'); - } - } - putchar(']'); - } /* print display percent after progress bar */ /* 5 = 1 space + 3 digits + 1 % */ if(proglen >= 5) { @@ -252,7 +270,7 @@ void cb_event(void *ctx, alpm_event_t *event) alpm_event_hook_run_t *e = &event->hook_run; int digits = number_length(e->total); printf("(%*zu/%*zu) %s\n", digits, e->position, - digits, e->total, + digits, e->total, e->desc ? e->desc : e->name); } break; diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 12fee64c..fa38930c 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -604,6 +604,9 @@ static int _parse_options(const char *key, char *value, } else if(strcmp(key, "ILoveCandy") == 0) { config->chomp = 1; pm_printf(ALPM_LOG_DEBUG, "config: chomp\n"); + } else if(strcmp(key, "PrettyProgressBar") == 0 ) { + config->pretty = 1; + pm_printf(ALPM_LOG_DEBUG, "config: pretty\n"); } else if(strcmp(key, "VerbosePkgLists") == 0) { config->verbosepkglists = 1; pm_printf(ALPM_LOG_DEBUG, "config: verbosepkglists\n"); diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 04350d39..1ac6806f 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -111,6 +111,8 @@ typedef struct __config_t { /* conf file options */ /* I Love Candy! */ unsigned short chomp; + /* Pretty progress bar */ + unsigned short pretty; /* format target pkg lists as table */ unsigned short verbosepkglists; /* number of parallel download streams */ diff --git a/src/pacman/pacman-conf.c b/src/pacman/pacman-conf.c index 600f1622..3ea4816a 100644 --- a/src/pacman/pacman-conf.c +++ b/src/pacman/pacman-conf.c @@ -267,6 +267,7 @@ static void dump_config(void) show_bool("VerbosePkgLists", config->verbosepkglists); show_bool("DisableDownloadTimeout", config->disable_dl_timeout); show_bool("ILoveCandy", config->chomp); + show_bool("PrettyProgressBar", config->pretty); show_bool("NoProgressBar", config->noprogressbar); show_int("ParallelDownloads", config->parallel_downloads); @@ -379,6 +380,8 @@ static int list_directives(void) show_bool("DisableDownloadTimeout", config->disable_dl_timeout); } else if(strcasecmp(i->data, "ILoveCandy") == 0) { show_bool("ILoveCandy", config->chomp); + } else if(strcasecmp(i->data, "PrettyProgressBar") == 0) { + show_bool("PrettyProgressBar", config->pretty); } else if(strcasecmp(i->data, "NoProgressBar") == 0) { show_bool("NoProgressBar", config->noprogressbar); -- 2.40.1

1 0