- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] meson: fix inodecmd for darwin/bsd
by Eli Schwartz 27 Oct '19

27 Oct '19

The BSD stat command uses %N, not %n, and was incorrectly ported to meson. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index c5704efe..1e2a78c3 100644 --- a/meson.build +++ b/meson.build @@ -236,13 +236,13 @@ endif os = host_machine.system() if os.startswith('darwin') - inodecmd = '/usr/bin/stat -f \'%i %n\'' + inodecmd = '/usr/bin/stat -f \'%i %N\'' default_sedinplaceflags = ' -i \'\'' strip_binaries = '' strip_shared = '-s' strip_static = '-s' elif os.contains('bsd') or os == 'dragonfly' - inodecmd = 'stat -f \'%i %n\'' + inodecmd = 'stat -f \'%i %N\'' default_sedinplaceflags = ' -i \'\'' endif -- 2.23.0

1 0

[pacman-dev] [PATCH v2 0/2] Correct package size calculation in makepkg
by Ronan Pigott 27 Oct '19

27 Oct '19

From: Ronan Pigott <rpigott(a)berkeley.edu> V2 implements suggestions by Allan to separate dirsize calculation into a util library function and implement a two-pass approach for hard linked and non hard linked files. Ronan Pigott (2): makepkg: use null-delimited file lists when tracking inodes makepkg: do not count hard linked file sizes multiple times configure.ac | 6 ++-- meson.build | 6 ++-- scripts/Makefile.am | 1 + scripts/libmakepkg/tidy/zipman.sh.in | 9 +++--- scripts/libmakepkg/util/dirsize.sh.in | 45 +++++++++++++++++++++++++++ scripts/libmakepkg/util/meson.build | 1 + scripts/makepkg.sh.in | 2 +- 7 files changed, 59 insertions(+), 11 deletions(-) create mode 100644 scripts/libmakepkg/util/dirsize.sh.in -- 2.23.0

1 2

[pacman-dev] [PATCH] makepkg: do not count hard links multiple times when calculating pkg size
by Allan McRae 26 Oct '19

26 Oct '19

Keeps track of file inodes that we have already counted using the same strategy as we do for zipman. Still uses "cat | wc -c" to calculate file sizes as it is the only thing guaranteed to be consistent. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/Makefile.am | 1 + scripts/libmakepkg/util/dirsize.sh.in | 39 +++++++++++++++++++++++++++ scripts/libmakepkg/util/meson.build | 1 + scripts/makepkg.sh.in | 2 +- 4 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 scripts/libmakepkg/util/dirsize.sh.in diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 88e9612d..63d09767 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -127,6 +127,7 @@ LIBMAKEPKG_IN = \ libmakepkg/util.sh \ libmakepkg/util/compress.sh \ libmakepkg/util/config.sh \ + libmakepkg/util/dirsize.sh \ libmakepkg/util/error.sh \ libmakepkg/util/message.sh \ libmakepkg/util/option.sh \ diff --git a/scripts/libmakepkg/util/dirsize.sh.in b/scripts/libmakepkg/util/dirsize.sh.in new file mode 100644 index 00000000..ba0783ca --- /dev/null +++ b/scripts/libmakepkg/util/dirsize.sh.in @@ -0,0 +1,39 @@ +#!/usr/bin/bash +# +# dirsize.sh - calculate size of all files in a directory +# +# Copyright (c) 2019 Pacman Development Team <pacman-dev(a)archlinux.org> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +[[ -n "$LIBMAKEPKG_UTIL_DIRSIZE_SH" ]] && return +LIBMAKEPKG_UTIL_DIRSIZE_SH=1 + +LIBRARY=${LIBRARY:-'/usr/share/makepkg'} + + +dirsize() { + local size=0 s file files inode + + while read -rd ' ' inode; do + read file + if [[ -z ${files[$inode]} ]]; then + files[$inode]=$file + size=$(( size + $(cat $file | wc -c) )) + fi + done < <(find . -type f -exec @INODECMD@ '{}' + 2>/dev/null) + + echo $size +} diff --git a/scripts/libmakepkg/util/meson.build b/scripts/libmakepkg/util/meson.build index c29503b7..6160d87e 100644 --- a/scripts/libmakepkg/util/meson.build +++ b/scripts/libmakepkg/util/meson.build @@ -3,6 +3,7 @@ libmakepkg_module = 'util' sources = [ 'compress.sh.in', 'config.sh.in', + 'dirsize.sh.in' 'error.sh.in', 'message.sh.in', 'option.sh.in', diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 997c8668..e75031c2 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -584,7 +584,7 @@ write_kv_pair() { } write_pkginfo() { - local size="$(find . -type f -exec cat {} + 2>/dev/null | wc -c)" + local size=$(dirsize) merge_arch_attrs -- 2.23.0

1 0

[pacman-dev] (no subject)
by arch＠eckner.net 24 Oct '19

24 Oct '19

Since the update to pacman 5.2.0, `makepkg --printsrcinfo` may emmit warnings about invalid packager format. However, all config variables in /etc/makepkg.conf, as well as directory permissions are not relevant if `--printsrcinfo` is given. So we simply skip the lint_conf and directory permisison checks then.

3 3

[pacman-dev] [PATCH] Fix segfault importing PGP key for pacman -U operations
by Allan McRae 24 Oct '19

24 Oct '19

Use after free. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/be_package.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 0f45c331..73d466de 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -759,7 +759,7 @@ int SYMEXPORT alpm_pkg_load(alpm_handle_t *handle, const char *filename, int ful if(_alpm_key_in_keychain(handle, key) == 0) { pkg_temp = _alpm_pkg_load_internal(handle, filename, full); if(pkg_temp) { - packager = pkg_temp->packager; + packager = strdup(pkg_temp->packager); _alpm_pkg_free(pkg_temp); } else { packager = NULL; -- 2.23.0

1 0

[pacman-dev] [PATCH] autotools: be more templated when getting list of doc dist files
by Eli Schwartz 24 Oct '19

24 Oct '19

Distribute asciidoc sources for all manpages instead of remembering to add files to both variables. Fixes regression in 377d47142f7aaa01ca782e6587f2d4caf663865b which broke building the website from a dist tarball: make: *** No rule to make target 'pacman-conf.8.html', needed by 'html'. Stop. (Technically this regression is already fixed by commit 942b909829d529409216939b36af11e8480726f5, but this is just going to keep happening, I suspect, so we should fix the root cause.) Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- And in fact, this is the spiritual successor to commit a769fbfd402b149e4fee5ce65b26bae8c56b5d43 doc/Makefile.am | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index 195f0b14..c61110fc 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -21,6 +21,7 @@ MANPAGES = \ DOXYGEN_MANS = $(wildcard man3/*.3) HTML_MANPAGES = $(addsuffix .html,$(MANPAGES)) +ASCIIDOC_MANPAGES = $(addsuffix .asciidoc,$(MANPAGES)) HTML_OTHER = \ index.html \ @@ -36,24 +37,12 @@ EXTRA_DIST = \ meson.build \ asciidoc.conf \ asciidoc-override.css \ - alpm-hooks.5.asciidoc \ - pacman.8.asciidoc \ - makepkg.8.asciidoc \ - makepkg-template.1.asciidoc \ - repo-add.8.asciidoc \ - vercmp.8.asciidoc \ - pacman-key.8.asciidoc \ - PKGBUILD.5.asciidoc \ PKGBUILD-example.txt \ - makepkg.conf.5.asciidoc \ - pacman.conf.5.asciidoc \ - BUILDINFO.5.asciidoc \ - pacman-conf.8.asciidoc \ - libalpm.3.asciidoc \ footer.asciidoc \ index.asciidoc \ submitting-patches.asciidoc \ translation-help.asciidoc \ + $(ASCIIDOC_MANPAGES) \ $(MANPAGES) \ $(DOXYGEN_MANS) -- 2.23.0

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.2.0-6-gf37a3752
by Allan McRae 24 Oct '19

24 Oct '19

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via f37a3752b38473236720e01230392377a42249e6 (commit) via a9835a38a38e0045e13b68fe6d486b4ffebe6d79 (commit) via cd4f8f7530ad473ce0ad6b8e68485082b219e317 (commit) via c58bf862b456a5c755c6a2a6c2b51e17c542da28 (commit) via 7df70e7fff7ded37b0d1fe1be814f4b70aa754ad (commit) via 942b909829d529409216939b36af11e8480726f5 (commit) from 8ce20d3754769845f0b3452b06db2e1792108ec9 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f37a3752b38473236720e01230392377a42249e6 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Oct 23 21:11:43 2019 +1000 Update copyright years make update-copyright OLD=2018 NEW=2019 Signed-off-by: Allan McRae <allan(a)archlinux.org> commit a9835a38a38e0045e13b68fe6d486b4ffebe6d79 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Oct 23 19:40:18 2019 +1000 Remove --force from completion Signed-off-by: Allan McRae <allan(a)archlinux.org> commit cd4f8f7530ad473ce0ad6b8e68485082b219e317 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Oct 23 19:37:00 2019 +1000 Update completion for -F changes Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c58bf862b456a5c755c6a2a6c2b51e17c542da28 Author: morganamilo <morganamilo(a)gmail.com> Date: Tue Oct 22 11:39:50 2019 +0100 makepkg: don't warn when PACKAGER is unset makepkg now complains when PACKAGER is not in the format "name <email>". Hide this warning when PACKAGER is unset but still warn if it is set to something out of format. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7df70e7fff7ded37b0d1fe1be814f4b70aa754ad Author: Nick Cao <nickcao(a)nichi.co> Date: Tue Oct 22 17:27:15 2019 +1000 Fix compression of package databases with zstd Commit 7afe51171 attempted to add zstd compression support to repo-add, but failed... FS#64213 Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 942b909829d529409216939b36af11e8480726f5 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Oct 22 08:02:05 2019 +1000 Fix distribution of meson files Also caught the source of a man page not being distributed. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/Makefile.am | 1 + doc/index.asciidoc | 2 +- lib/libalpm/add.c | 2 +- lib/libalpm/add.h | 2 +- lib/libalpm/alpm.c | 2 +- lib/libalpm/alpm.h | 2 +- lib/libalpm/alpm_list.c | 2 +- lib/libalpm/alpm_list.h | 2 +- lib/libalpm/backup.c | 2 +- lib/libalpm/backup.h | 2 +- lib/libalpm/be_local.c | 2 +- lib/libalpm/be_package.c | 2 +- lib/libalpm/be_sync.c | 2 +- lib/libalpm/conflict.c | 2 +- lib/libalpm/conflict.h | 2 +- lib/libalpm/db.c | 2 +- lib/libalpm/db.h | 2 +- lib/libalpm/deps.c | 2 +- lib/libalpm/deps.h | 2 +- lib/libalpm/diskspace.c | 2 +- lib/libalpm/diskspace.h | 2 +- lib/libalpm/dload.c | 2 +- lib/libalpm/dload.h | 2 +- lib/libalpm/error.c | 2 +- lib/libalpm/filelist.c | 2 +- lib/libalpm/filelist.h | 2 +- lib/libalpm/graph.c | 2 +- lib/libalpm/graph.h | 2 +- lib/libalpm/group.c | 2 +- lib/libalpm/group.h | 2 +- lib/libalpm/handle.c | 2 +- lib/libalpm/handle.h | 2 +- lib/libalpm/hook.c | 2 +- lib/libalpm/hook.h | 2 +- lib/libalpm/libarchive-compat.h | 2 +- lib/libalpm/log.c | 2 +- lib/libalpm/log.h | 2 +- lib/libalpm/package.c | 2 +- lib/libalpm/package.h | 2 +- lib/libalpm/pkghash.c | 2 +- lib/libalpm/pkghash.h | 2 +- lib/libalpm/remove.c | 2 +- lib/libalpm/remove.h | 2 +- lib/libalpm/signing.c | 2 +- lib/libalpm/signing.h | 2 +- lib/libalpm/sync.c | 2 +- lib/libalpm/sync.h | 2 +- lib/libalpm/trans.c | 2 +- lib/libalpm/trans.h | 2 +- lib/libalpm/util.c | 2 +- lib/libalpm/util.h | 2 +- lib/libalpm/version.c | 2 +- scripts/Makefile.am | 4 +++- scripts/completion/bash_completion.in | 7 +++---- scripts/completion/zsh_completion.in | 4 ---- scripts/libmakepkg/buildenv.sh.in | 2 +- scripts/libmakepkg/buildenv/buildflags.sh.in | 2 +- scripts/libmakepkg/buildenv/compiler.sh.in | 2 +- scripts/libmakepkg/buildenv/debugflags.sh.in | 2 +- scripts/libmakepkg/buildenv/makeflags.sh.in | 2 +- scripts/libmakepkg/executable.sh.in | 2 +- scripts/libmakepkg/executable/ccache.sh.in | 2 +- scripts/libmakepkg/executable/checksum.sh.in | 2 +- scripts/libmakepkg/executable/distcc.sh.in | 2 +- scripts/libmakepkg/executable/fakeroot.sh.in | 2 +- scripts/libmakepkg/executable/gpg.sh.in | 2 +- scripts/libmakepkg/executable/gzip.sh.in | 2 +- scripts/libmakepkg/executable/pacman.sh.in | 2 +- scripts/libmakepkg/executable/strip.sh.in | 2 +- scripts/libmakepkg/executable/sudo.sh.in | 2 +- scripts/libmakepkg/executable/vcs.sh.in | 2 +- scripts/libmakepkg/integrity.sh.in | 2 +- scripts/libmakepkg/integrity/generate_checksum.sh.in | 2 +- scripts/libmakepkg/integrity/generate_signature.sh.in | 2 +- scripts/libmakepkg/integrity/verify_checksum.sh.in | 2 +- scripts/libmakepkg/integrity/verify_signature.sh.in | 2 +- scripts/libmakepkg/lint_config.sh.in | 2 +- scripts/libmakepkg/lint_config/paths.sh.in | 2 +- scripts/libmakepkg/lint_config/source_date_epoch.sh.in | 2 +- scripts/libmakepkg/lint_config/variable.sh.in | 4 ++-- scripts/libmakepkg/lint_package.sh.in | 2 +- scripts/libmakepkg/lint_package/build_references.sh.in | 2 +- scripts/libmakepkg/lint_package/dotfiles.sh.in | 2 +- scripts/libmakepkg/lint_package/file_names.sh.in | 2 +- scripts/libmakepkg/lint_package/missing_backup.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/arch.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/arch_specific.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/backup.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/changelog.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/checkdepends.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/conflicts.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/depends.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/epoch.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/fullpkgver.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/install.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/makedepends.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/optdepends.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/options.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/package_function.sh.in | 2 +- .../lint_pkgbuild/package_function_variable.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/pkglist.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/pkgname.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/provides.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/source.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/util.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/variable.sh.in | 2 +- scripts/libmakepkg/source.sh.in | 2 +- scripts/libmakepkg/source/bzr.sh.in | 2 +- scripts/libmakepkg/source/file.sh.in | 2 +- scripts/libmakepkg/source/git.sh.in | 2 +- scripts/libmakepkg/source/hg.sh.in | 2 +- scripts/libmakepkg/source/local.sh.in | 2 +- scripts/libmakepkg/source/svn.sh.in | 2 +- scripts/libmakepkg/srcinfo.sh.in | 2 +- scripts/libmakepkg/tidy.sh.in | 2 +- scripts/libmakepkg/tidy/docs.sh.in | 2 +- scripts/libmakepkg/tidy/emptydirs.sh.in | 2 +- scripts/libmakepkg/tidy/libtool.sh.in | 2 +- scripts/libmakepkg/tidy/purge.sh.in | 2 +- scripts/libmakepkg/tidy/staticlibs.sh.in | 2 +- scripts/libmakepkg/tidy/strip.sh.in | 2 +- scripts/libmakepkg/tidy/zipman.sh.in | 2 +- scripts/libmakepkg/util.sh.in | 2 +- scripts/libmakepkg/util/compress.sh.in | 2 +- scripts/libmakepkg/util/error.sh.in | 2 +- scripts/libmakepkg/util/message.sh.in | 2 +- scripts/libmakepkg/util/option.sh.in | 2 +- scripts/libmakepkg/util/parseopts.sh.in | 2 +- scripts/libmakepkg/util/pkgbuild.sh.in | 2 +- scripts/libmakepkg/util/schema.sh.in | 2 +- scripts/libmakepkg/util/source.sh.in | 2 +- scripts/libmakepkg/util/util.sh.in | 2 +- scripts/makepkg-template.pl.in | 4 ++-- scripts/makepkg.sh.in | 4 ++-- scripts/pacman-db-upgrade.sh.in | 4 ++-- scripts/pacman-key.sh.in | 4 ++-- scripts/repo-add.sh.in | 16 ++++++++-------- scripts/wrapper.sh.in | 2 +- src/common/ini.c | 2 +- src/common/ini.h | 2 +- src/common/util-common.c | 2 +- src/common/util-common.h | 2 +- src/pacman/callback.c | 2 +- src/pacman/callback.h | 2 +- src/pacman/check.c | 2 +- src/pacman/check.h | 2 +- src/pacman/conf.c | 2 +- src/pacman/conf.h | 2 +- src/pacman/database.c | 2 +- src/pacman/deptest.c | 2 +- src/pacman/files.c | 2 +- src/pacman/package.c | 2 +- src/pacman/package.h | 2 +- src/pacman/pacman-conf.c | 2 +- src/pacman/pacman.c | 4 ++-- src/pacman/pacman.h | 2 +- src/pacman/query.c | 2 +- src/pacman/remove.c | 2 +- src/pacman/sighandler.c | 2 +- src/pacman/sighandler.h | 2 +- src/pacman/sync.c | 2 +- src/pacman/upgrade.c | 2 +- src/pacman/util.c | 2 +- src/pacman/util.h | 2 +- src/util/testpkg.c | 2 +- src/util/vercmp.c | 2 +- test/pacman/pactest.py | 2 +- test/pacman/pmdb.py | 2 +- test/pacman/pmenv.py | 2 +- test/pacman/pmfile.py | 2 +- test/pacman/pmpkg.py | 2 +- test/pacman/pmrule.py | 2 +- test/pacman/pmtest.py | 2 +- test/pacman/tap.py | 2 +- test/pacman/util.py | 2 +- test/util/vercmptest.sh | 2 +- 180 files changed, 196 insertions(+), 198 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH v2] libmakepkg: add optional argument support to parseopts
by Ethan Sommer 24 Oct '19

24 Oct '19

Adds a "?" suffix that can be used to indicate that an option's argument is optional. This allows options to have a default behaviour when the user doesn't specify one, e.g.: --color=[when] being able to behave like --color=auto when only --color is passed Signed-off-by: Ethan Sommer <e5ten.arch(a)gmail.com> --- scripts/libmakepkg/util/parseopts.sh.in | 110 +++++++++++++++--------- test/scripts/parseopts_test.sh | 12 ++- 2 files changed, 77 insertions(+), 45 deletions(-) diff --git a/scripts/libmakepkg/util/parseopts.sh.in b/scripts/libmakepkg/util/parseopts.sh.in index c056cb1e..9a215648 100644 --- a/scripts/libmakepkg/util/parseopts.sh.in +++ b/scripts/libmakepkg/util/parseopts.sh.in @@ -18,16 +18,17 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # # A getopt_long-like parser which portably supports longopts and -# shortopts with some GNU extensions. It does not allow for options -# with optional arguments. For both short and long opts, options -# requiring an argument should be suffixed with a colon. After the -# first argument containing the short opts, any number of valid long -# opts may be be passed. The end of the options delimiter must then be -# added, followed by the user arguments to the calling program. +# shortopts with some GNU extensions. For both short and long opts, +# options requiring an argument should be suffixed with a colon, and +# options with optional arguments should be suffixed with a question +# mark. After the first argument containing the short opts, any number +# of valid long opts may be be passed. The end of the options delimiter +# must then be added, followed by the user arguments to the calling +# program. # # Recommended Usage: -# OPT_SHORT='fb:z' -# OPT_LONG=('foo' 'bar:' 'baz') +# OPT_SHORT='fb:zq?' +# OPT_LONG=('foo' 'bar:' 'baz' 'qux?') # if ! parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@"; then # exit 1 # fi @@ -49,29 +50,30 @@ parseopts() { longoptmatch() { local o longmatch=() for o in "${longopts[@]}"; do - if [[ ${o%:} = "$1" ]]; then + if [[ ${o%[:?]} = "$1" ]]; then longmatch=("$o") break fi - [[ ${o%:} = "$1"* ]] && longmatch+=("$o") + [[ ${o%[:?]} = "$1"* ]] && longmatch+=("$o") done case ${#longmatch[*]} in 1) - # success, override with opt and return arg req (0 == none, 1 == required) - opt=${longmatch%:} - if [[ $longmatch = *: ]]; then - return 1 - else - return 0 - fi ;; + # success, override with opt and return arg req (0 == none, 1 == required, 2 == optional) + opt=${longmatch%[:?]} + case $longmatch in + *:) return 1 ;; + *\?) return 2 ;; + *) return 0 ;; + esac + ;; 0) # fail, no match found return 255 ;; *) # fail, ambiguous match printf "${0##*/}: $(gettext "option '%s' is ambiguous; possibilities:")" "--$1" - printf " '%s'" "${longmatch[@]%:}" + printf " '%s'" "${longmatch[@]%[:?]}" printf '\n' return 254 ;; esac >&2 @@ -87,32 +89,47 @@ parseopts() { for (( i = 1; i < ${#1}; i++ )); do opt=${1:i:1} - # option doesn't exist - if [[ $shortopts != *$opt* ]]; then - printf "${0##*/}: $(gettext "invalid option") -- '%s'\n" "$opt" >&2 - OPTRET=(--) - return 1 - fi - - OPTRET+=("-$opt") - # option requires optarg - if [[ $shortopts = *$opt:* ]]; then - # if we're not at the end of the option chunk, the rest is the optarg - if (( i < ${#1} - 1 )); then - OPTRET+=("${1:i+1}") - break - # if we're at the end, grab the the next positional, if it exists - elif (( i == ${#1} - 1 )) && [[ $2 ]]; then - OPTRET+=("$2") - shift - break - # parse failure - else - printf "${0##*/}: $(gettext "option requires an argument") -- '%s'\n" "$opt" >&2 + case $shortopts in + # option requires optarg + *$opt:*) + # if we're not at the end of the option chunk, the rest is the optarg + if (( i < ${#1} - 1 )); then + OPTRET+=("-$opt" "${1:i+1}") + break + # if we're at the end, grab the the next positional, if it exists + elif (( i == ${#1} - 1 )) && [[ $2 ]]; then + OPTRET+=("-$opt" "$2") + shift + break + # parse failure + else + printf "${0##*/}: $(gettext "option requires an argument") -- '%s'\n" "$opt" >&2 + OPTRET=(--) + return 1 + fi + ;; + # option's optarg is optional + *$opt\?*) + # if we're not at the end of the option chunk, the rest is the optarg + if (( i < ${#1} - 1 )); then + OPTRET+=("-$opt=${1:i+1}") + break + # option has no optarg + else + OPTRET+=("-$opt") + fi + ;; + # option has no optarg + *$opt*) + OPTRET+=("-$opt") + ;; + # option doesn't exist + *) + printf "${0##*/}: $(gettext "invalid option") -- '%s'\n" "$opt" >&2 OPTRET=(--) return 1 - fi - fi + ;; + esac done ;; --?*=*|--?*) # long option @@ -145,6 +162,15 @@ parseopts() { return 1 fi ;; + 2) + # --longopt=optarg + if [[ $1 = *=* ]]; then + OPTRET+=("--$opt=$optarg") + # --longopt + else + OPTRET+=("--$opt") + fi + ;; 254) # ambiguous option -- error was reported for us by longoptmatch() OPTRET=(--) diff --git a/test/scripts/parseopts_test.sh b/test/scripts/parseopts_test.sh index 9674c6a6..7d14bf29 100755 --- a/test/scripts/parseopts_test.sh +++ b/test/scripts/parseopts_test.sh @@ -16,12 +16,12 @@ if ! type -t parseopts &>/dev/null; then fi # borrow opts from makepkg -OPT_SHORT="AcdefFghiLmop:rRsV" +OPT_SHORT="AcdefFghiLmop:rRsVb;" OPT_LONG=('allsource' 'asroot' 'ignorearch' 'check' 'clean:' 'cleanall' 'nodeps' 'noextract' 'force' 'forcever:' 'geninteg' 'help' 'holdver' 'install' 'key:' 'log' 'nocolor' 'nobuild' 'nocheck' 'noprepare' 'nosign' 'pkg:' 'rmdeps' 'repackage' 'skipinteg' 'sign' 'source' 'syncdeps' 'version' 'config:' - 'noconfirm' 'noprogressbar') + 'noconfirm' 'noprogressbar' 'opt;') tap_parse() { local result=$1 tokencount=$2; shift 2 @@ -31,7 +31,7 @@ tap_parse() { unset OPTRET } -tap_plan 50 +tap_plan 54 # usage: tap_parse <expected result> <token count> test-params... # a failed tap_parse will match only the end of options marker '--' @@ -111,4 +111,10 @@ tap_parse '--force --' 2 --force # exact match on possible stem (opt has optarg) tap_parse '--clean foo --' 3 --clean=foo +# long opt with empty, non-empty, and no optional arg +tap_parse '--opt= --opt=foo --opt --' 4 --opt= --opt=foo --opt + +# short opt with and without optional arg, and non-option arg +tap_parse '-b=foo -A -b -- foo' 5 -bfoo -Ab foo + tap_finish -- 2.23.0

2 1

[pacman-dev] [PATCH] libmakepkg: add optional argument support to parseopts
by Ethan Sommer 24 Oct '19

24 Oct '19

Signed-off-by: Ethan Sommer <e5ten.arch(a)gmail.com> --- scripts/libmakepkg/util/parseopts.sh.in | 110 +++++++++++++++--------- test/scripts/parseopts_test.sh | 12 ++- 2 files changed, 77 insertions(+), 45 deletions(-) diff --git a/scripts/libmakepkg/util/parseopts.sh.in b/scripts/libmakepkg/util/parseopts.sh.in index c056cb1e..9a215648 100644 --- a/scripts/libmakepkg/util/parseopts.sh.in +++ b/scripts/libmakepkg/util/parseopts.sh.in @@ -18,16 +18,17 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # # A getopt_long-like parser which portably supports longopts and -# shortopts with some GNU extensions. It does not allow for options -# with optional arguments. For both short and long opts, options -# requiring an argument should be suffixed with a colon. After the -# first argument containing the short opts, any number of valid long -# opts may be be passed. The end of the options delimiter must then be -# added, followed by the user arguments to the calling program. +# shortopts with some GNU extensions. For both short and long opts, +# options requiring an argument should be suffixed with a colon, and +# options with optional arguments should be suffixed with a question +# mark. After the first argument containing the short opts, any number +# of valid long opts may be be passed. The end of the options delimiter +# must then be added, followed by the user arguments to the calling +# program. # # Recommended Usage: -# OPT_SHORT='fb:z' -# OPT_LONG=('foo' 'bar:' 'baz') +# OPT_SHORT='fb:zq?' +# OPT_LONG=('foo' 'bar:' 'baz' 'qux?') # if ! parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@"; then # exit 1 # fi @@ -49,29 +50,30 @@ parseopts() { longoptmatch() { local o longmatch=() for o in "${longopts[@]}"; do - if [[ ${o%:} = "$1" ]]; then + if [[ ${o%[:?]} = "$1" ]]; then longmatch=("$o") break fi - [[ ${o%:} = "$1"* ]] && longmatch+=("$o") + [[ ${o%[:?]} = "$1"* ]] && longmatch+=("$o") done case ${#longmatch[*]} in 1) - # success, override with opt and return arg req (0 == none, 1 == required) - opt=${longmatch%:} - if [[ $longmatch = *: ]]; then - return 1 - else - return 0 - fi ;; + # success, override with opt and return arg req (0 == none, 1 == required, 2 == optional) + opt=${longmatch%[:?]} + case $longmatch in + *:) return 1 ;; + *\?) return 2 ;; + *) return 0 ;; + esac + ;; 0) # fail, no match found return 255 ;; *) # fail, ambiguous match printf "${0##*/}: $(gettext "option '%s' is ambiguous; possibilities:")" "--$1" - printf " '%s'" "${longmatch[@]%:}" + printf " '%s'" "${longmatch[@]%[:?]}" printf '\n' return 254 ;; esac >&2 @@ -87,32 +89,47 @@ parseopts() { for (( i = 1; i < ${#1}; i++ )); do opt=${1:i:1} - # option doesn't exist - if [[ $shortopts != *$opt* ]]; then - printf "${0##*/}: $(gettext "invalid option") -- '%s'\n" "$opt" >&2 - OPTRET=(--) - return 1 - fi - - OPTRET+=("-$opt") - # option requires optarg - if [[ $shortopts = *$opt:* ]]; then - # if we're not at the end of the option chunk, the rest is the optarg - if (( i < ${#1} - 1 )); then - OPTRET+=("${1:i+1}") - break - # if we're at the end, grab the the next positional, if it exists - elif (( i == ${#1} - 1 )) && [[ $2 ]]; then - OPTRET+=("$2") - shift - break - # parse failure - else - printf "${0##*/}: $(gettext "option requires an argument") -- '%s'\n" "$opt" >&2 + case $shortopts in + # option requires optarg + *$opt:*) + # if we're not at the end of the option chunk, the rest is the optarg + if (( i < ${#1} - 1 )); then + OPTRET+=("-$opt" "${1:i+1}") + break + # if we're at the end, grab the the next positional, if it exists + elif (( i == ${#1} - 1 )) && [[ $2 ]]; then + OPTRET+=("-$opt" "$2") + shift + break + # parse failure + else + printf "${0##*/}: $(gettext "option requires an argument") -- '%s'\n" "$opt" >&2 + OPTRET=(--) + return 1 + fi + ;; + # option's optarg is optional + *$opt\?*) + # if we're not at the end of the option chunk, the rest is the optarg + if (( i < ${#1} - 1 )); then + OPTRET+=("-$opt=${1:i+1}") + break + # option has no optarg + else + OPTRET+=("-$opt") + fi + ;; + # option has no optarg + *$opt*) + OPTRET+=("-$opt") + ;; + # option doesn't exist + *) + printf "${0##*/}: $(gettext "invalid option") -- '%s'\n" "$opt" >&2 OPTRET=(--) return 1 - fi - fi + ;; + esac done ;; --?*=*|--?*) # long option @@ -145,6 +162,15 @@ parseopts() { return 1 fi ;; + 2) + # --longopt=optarg + if [[ $1 = *=* ]]; then + OPTRET+=("--$opt=$optarg") + # --longopt + else + OPTRET+=("--$opt") + fi + ;; 254) # ambiguous option -- error was reported for us by longoptmatch() OPTRET=(--) diff --git a/test/scripts/parseopts_test.sh b/test/scripts/parseopts_test.sh index 9674c6a6..7d14bf29 100755 --- a/test/scripts/parseopts_test.sh +++ b/test/scripts/parseopts_test.sh @@ -16,12 +16,12 @@ if ! type -t parseopts &>/dev/null; then fi # borrow opts from makepkg -OPT_SHORT="AcdefFghiLmop:rRsV" +OPT_SHORT="AcdefFghiLmop:rRsVb;" OPT_LONG=('allsource' 'asroot' 'ignorearch' 'check' 'clean:' 'cleanall' 'nodeps' 'noextract' 'force' 'forcever:' 'geninteg' 'help' 'holdver' 'install' 'key:' 'log' 'nocolor' 'nobuild' 'nocheck' 'noprepare' 'nosign' 'pkg:' 'rmdeps' 'repackage' 'skipinteg' 'sign' 'source' 'syncdeps' 'version' 'config:' - 'noconfirm' 'noprogressbar') + 'noconfirm' 'noprogressbar' 'opt;') tap_parse() { local result=$1 tokencount=$2; shift 2 @@ -31,7 +31,7 @@ tap_parse() { unset OPTRET } -tap_plan 50 +tap_plan 54 # usage: tap_parse <expected result> <token count> test-params... # a failed tap_parse will match only the end of options marker '--' @@ -111,4 +111,10 @@ tap_parse '--force --' 2 --force # exact match on possible stem (opt has optarg) tap_parse '--clean foo --' 3 --clean=foo +# long opt with empty, non-empty, and no optional arg +tap_parse '--opt= --opt=foo --opt --' 4 --opt= --opt=foo --opt + +# short opt with and without optional arg, and non-option arg +tap_parse '-b=foo -A -b -- foo' 5 -bfoo -Ab foo + tap_finish -- 2.23.0

2 1

[pacman-dev] [PATCH 1/2] Update completion for -F changes
by Allan McRae 23 Oct '19

23 Oct '19

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/completion/bash_completion.in | 3 +-- scripts/completion/zsh_completion.in | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/scripts/completion/bash_completion.in b/scripts/completion/bash_completion.in index 915004e2..129a87aa 100644 --- a/scripts/completion/bash_completion.in +++ b/scripts/completion/bash_completion.in @@ -109,7 +109,7 @@ _pacman() { local cur prev words cword _init_completion || return database=('asdeps asexplicit') - files=('list machinereadable owns search refresh regex' 'l o s x y') + files=('list machinereadablerefresh regex' 'l x y') query=('changelog check deps explicit file foreign groups info list native owns search unrequired upgrades' 'c e g i k l m n o p s t u') remove=('cascade dbonly nodeps assume-installed nosave print recursive unneeded' 'c n p s u') @@ -136,7 +136,6 @@ _pacman() { _pacman_pkg Qq;; F) { _arch_incomp 'l list' && _pacman_pkg Slq ; } || - _arch_incomp 'o owns' || compopt +o default;; Q) { _arch_incomp 'g groups' && _pacman_pkg Qg sort; } || diff --git a/scripts/completion/zsh_completion.in b/scripts/completion/zsh_completion.in index c114ae02..82868344 100644 --- a/scripts/completion/zsh_completion.in +++ b/scripts/completion/zsh_completion.in @@ -101,8 +101,6 @@ _pacman_opts_database=( _pacman_opts_files=( {-l,--list}'[List the files owned by the queried package]:package:_pacman_completions_all_packages' - {-o,--owns}'[Query the package that owns]:files:_files' - {-s,--search}'[Search package file names for matching strings]:files:_files' {-x,--regex}'[Enable searching using regular expressions]:regex:' {-y,--refresh}'[Download fresh files databases from the server]' '--machinereadable[Produce machine-readable output]' -- 2.23.0

2 3