- Pacman-dev - lists.archlinux.org

[pacman-dev] Accepting patches on github
by John Sumsion 03 Dec '11

03 Dec '11

I saw that several people have submitted patches on github. But when I follow a link to their repos, it's always a 404, so I'm assuming you prefer patches in email. So I'll send a couple through email. NOTE: I couldn't find any statement of policy on accepting patches through github; this search didn't turn anything obvious up: http://www.google.com/search?q=site%3Amailman.archlinux.org+pacman+github+r… It would be good to state your policy on accepting commits through github here: http://www.archlinux.org/pacman/submitting-patches.html John...

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.1-62-g1d98c63
by dan＠archlinux.org 01 Dec '11

01 Dec '11

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 1d98c6347c9622d4334f80fc59623da524b4f37b (commit) via 5490cd6eb22752d2eac5410152d239c50224dbc1 (commit) via a521cea96f24ba9d060e019c74ccbe63a1e06392 (commit) via 15aa57d51b4f7f49d55912650ed13ce573f1e946 (commit) via d7f8838294fc3567fec8fa9521ab9f91d9897829 (commit) via f5820c8bd61caafd62d370a24136d3ee90714ac8 (commit) via 86b5b7aa4215b7408ccf1ec8368988af327703fb (commit) via 77af613efc8b4c99115fdf81f8284955b1e95da6 (commit) from 96b3ba3470f11842312e4fdb34b74b391842fc33 (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 1d98c6347c9622d4334f80fc59623da524b4f37b Merge: 86b5b7a 5490cd6 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Nov 30 22:34:25 2011 -0600 Merge branch 'maint' commit 86b5b7aa4215b7408ccf1ec8368988af327703fb Author: Dan McGee <dan(a)archlinux.org> Date: Wed Nov 30 21:04:16 2011 -0600 Add helper function for duplicating depends lists We do this in several of the package duplication steps; add a helper function for doing so to reduce some of the repetitive code. Also add a free_deplist function for our repeated depend list free calls of both the data and the list. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 77af613efc8b4c99115fdf81f8284955b1e95da6 Author: andrew.gregory.8(a)gmail.com <andrew.gregory.8(a)gmail.com> Date: Tue Nov 22 00:35:46 2011 -0500 added doxygen documentation Made existing documentation more consistent and added documentation where there was none. One function still needs documentation and is marked with 'TODO'. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/index.txt | 3 +- doc/makepkg.conf.5.txt | 2 +- lib/libalpm/package.c | 58 +++++++++------- lib/libalpm/util.c | 154 +++++++++++++++++++++++++++++++++-------- lib/libalpm/util.h | 2 +- scripts/makepkg.sh.in | 16 +++-- scripts/po/fi.po | 14 ++-- src/pacman/po/fi.po | 8 +- test/pacman/tests/sync303.py | 38 ++++++++++ test/pacman/tests/sync304.py | 27 +++++++ 10 files changed, 244 insertions(+), 78 deletions(-) create mode 100644 test/pacman/tests/sync303.py create mode 100644 test/pacman/tests/sync304.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.0.1-5-g5490cd6
by dan＠archlinux.org 01 Dec '11

01 Dec '11

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, maint has been updated via 5490cd6eb22752d2eac5410152d239c50224dbc1 (commit) via a521cea96f24ba9d060e019c74ccbe63a1e06392 (commit) via 15aa57d51b4f7f49d55912650ed13ce573f1e946 (commit) via d7f8838294fc3567fec8fa9521ab9f91d9897829 (commit) via f5820c8bd61caafd62d370a24136d3ee90714ac8 (commit) from 507a2d15e65aba93a20ee99d90345917866407dc (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 5490cd6eb22752d2eac5410152d239c50224dbc1 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Nov 23 08:23:50 2011 -0500 makepkg.5: fix typo s/tar,bz2/tar.bz2/ Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a521cea96f24ba9d060e019c74ccbe63a1e06392 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Nov 21 23:03:33 2011 -0500 makepkg: avoid using comm for diff'ing package lists Whereas comm will check inputs to see if they're sorted (and warn when they aren't), grep doesn't even care about ordering. In this particular instance -- neither do we. We're only interested that the two lists are equivalent. Fixes FS#26580. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 15aa57d51b4f7f49d55912650ed13ce573f1e946 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Nov 21 22:29:00 2011 -0600 _alpm_ldconfig: return value from _alpm_run_chroot Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d7f8838294fc3567fec8fa9521ab9f91d9897829 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Nov 21 20:31:17 2011 -0600 Add two new pactests for pacman upgrade behavior Both currently marked as failing. * sync303.py encapsulates the broken behavior reported in FS#27214. * sync304.py shows how packages depending on a specific version of a package in SyncFirst can cause breakage of the dependency resolver. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f5820c8bd61caafd62d370a24136d3ee90714ac8 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Nov 21 20:35:04 2011 -0600 Miscellaneous post-4.0.1 updates Some late-arriving translation updates and add the correct dates to the index.txt releases table. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/index.txt | 3 ++- doc/makepkg.conf.5.txt | 2 +- lib/libalpm/util.c | 2 +- scripts/makepkg.sh.in | 16 +++++++++------- scripts/po/fi.po | 14 +++++++------- src/pacman/po/fi.po | 8 ++++---- test/pacman/tests/sync303.py | 38 ++++++++++++++++++++++++++++++++++++++ test/pacman/tests/sync304.py | 27 +++++++++++++++++++++++++++ 8 files changed, 89 insertions(+), 21 deletions(-) create mode 100644 test/pacman/tests/sync303.py create mode 100644 test/pacman/tests/sync304.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 00/14] Full optdep support
by Benedikt Morbach 01 Dec '11

01 Dec '11

Now that 4.0/4.0.1 is out, I thought it might be time to finally send these patches in for review. This will probably still need some polish (maybe quite a bit in some places) but it works quite well and I have been using it for some time. The code is also at https://github.com/moben/pacman branch:optdep And now, please review ald yell at my bad code :) --- Benedikt Benedikt Morbach (14): Split optdep into alpm_depend_t and description Hook new optdepend structures up Only display uninstalled optdepends during install/upgrade Add option for showing all optdeps again Show optdep install status in package info optdepends are not orphans unless --optdeps is specified Make package info show optional requirements Make recursive removal consider optdepends Show list of optrequires with -Qtdn Warn on optdep removal Add flag to recurse through optdepends Add option to install all optdepends by default Add option to ask which optdeps to install Make HandleOptdeps Ask and Install work together better doc/pacman.8.txt | 11 +++ doc/pacman.conf.5.txt | 14 +++ etc/pacman.conf.in | 2 + lib/libalpm/add.c | 4 +- lib/libalpm/alpm.h | 25 +++++- lib/libalpm/be_local.c | 12 ++- lib/libalpm/be_package.c | 5 +- lib/libalpm/be_sync.c | 8 ++- lib/libalpm/deps.c | 127 ++++++++++++++++++++++++++--- lib/libalpm/deps.h | 5 +- lib/libalpm/error.c | 2 + lib/libalpm/package.c | 40 ++++++--- lib/libalpm/remove.c | 22 ++++- lib/libalpm/sync.c | 2 +- lib/libalpm/trans.c | 10 ++- src/pacman/conf.c | 27 ++++++ src/pacman/conf.h | 10 ++ src/pacman/package.c | 24 ++++- src/pacman/pacman.c | 7 ++ src/pacman/query.c | 27 +++++- src/pacman/remove.c | 23 ++++- src/pacman/sync.c | 125 +++++++++++++++++++++++++++-- src/pacman/upgrade.c | 2 +- src/pacman/util.c | 177 ++++++++++++++++++++++++++++++++++------ src/pacman/util.h | 5 +- src/util/pactree.c | 2 +- src/util/testdb.c | 2 +- test/pacman/tests/query010.py | 12 +++ test/pacman/tests/query011.py | 15 ++++ test/pacman/tests/query012.py | 13 +++ test/pacman/tests/query020.py | 14 +++ test/pacman/tests/query021.py | 14 +++ test/pacman/tests/query022.py | 14 +++ test/pacman/tests/remove053.py | 15 ++++ test/pacman/tests/remove054.py | 14 +++ test/pacman/tests/remove055.py | 20 +++++ test/pacman/tests/remove056.py | 20 +++++ test/pacman/tests/sync060.py | 12 +++ test/pacman/tests/sync061.py | 15 ++++ test/pacman/tests/sync062.py | 17 ++++ test/pacman/tests/sync063.py | 17 ++++ 41 files changed, 839 insertions(+), 93 deletions(-) create mode 100644 test/pacman/tests/query010.py create mode 100644 test/pacman/tests/query011.py create mode 100644 test/pacman/tests/query012.py create mode 100644 test/pacman/tests/query020.py create mode 100644 test/pacman/tests/query021.py create mode 100644 test/pacman/tests/query022.py create mode 100644 test/pacman/tests/remove053.py create mode 100644 test/pacman/tests/remove054.py create mode 100644 test/pacman/tests/remove055.py create mode 100644 test/pacman/tests/remove056.py create mode 100644 test/pacman/tests/sync060.py create mode 100644 test/pacman/tests/sync061.py create mode 100644 test/pacman/tests/sync062.py create mode 100644 test/pacman/tests/sync063.py -- 1.7.7.3

4 24

[pacman-dev] Do you want Heads Ups about the Signing System
by Kevin Chadwick 30 Nov '11

30 Nov '11

Hi I'm new to arch but I've got automatic sig checks by pacman running fine so far on stable with just pacman4 from testing set to Optional (for the databases) TrustedOnly. I just had to tsign Ionuts master key with mine manually and also Allan Mcraes which seems to be unsigned by the Arch Linux Master keys oh and now also Ronald van Harens. I haven't tried many packages but when tryinh abs which is unsigned it went fine but the signed rsync threw angel velasquez angvp(a)archlinux.org is unknown trust. It appears to be signed by Pierre's Master key which I have lsigned with no luck. Not sure if you find these reports useful or just annoying until launch so let me know for any others I find. Looks like a good highly adaptable system :-)

2 1

[pacman-dev] Localization issues (Attention Developers)
by atilla ontas 27 Nov '11

27 Nov '11

Hi. I' m an experienced translator from Turkey. Contributing Arch turkish translations for a while. I have noticed today; some strings in pacman-scripts are very hard to translate. You see, Turkic languages are very differ from Latin origin languages; structure of sentence is almost reversed. So, using multiple "%s" variables in source string makes a lot of trouble. It is hard to translate and translated strings are hard to understand for native Turkish speakers. For example; "Running %s as an unprivileged user will result in non-root\nownership of the packaged files. Try using the %s environment by\nplacing %s in the %s array in %s." will translated into turkish properly, if second, third, fourth and fifth %s variables are supposed to %d, %n, %f, %z : "%s uygulamasını yetkisiz kullanıcı olarak çalıştırmak paketlenmiş dosyaların kök olmayan sahiplik almasına yol açacaktır. %z dosyası içindeki %f satırına %n değerini yerleştirerek %d ortamını kullanmayı deneyin." You see, how variables reversed? So if you, developers, mind to and if it is possible use only one %s in a string it will be much appreciated. Also, if you, developers, mind to add comments what is %s (a command, an application, what??) it will be great help to translators. Greetings...

3 9

[pacman-dev] [PATCH] makepkg.5: fix typo s/tar,bz2/tar.bz2/
by Dave Reisner 23 Nov '11

23 Nov '11

Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- doc/makepkg.conf.5.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 2778361..db1e6d5 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -215,7 +215,7 @@ Options **PKGEXT=**".pkg.tar.gz", **SRCEXT=**".src.tar.gz":: Sets the compression used when making compiled or source packages. The - current valid suffixes are `.tar`, `.tar.gz`, `.tar,bz2`, `.tar.xz`, and + current valid suffixes are `.tar`, `.tar.gz`, `.tar.bz2`, `.tar.xz`, and `.tar.Z`. Do not touch these unless you know what you are doing. -- 1.7.7.4

1 0

[pacman-dev] [PATCH] makepkg: avoid using comm for diff'ing package lists
by Dave Reisner 22 Nov '11

22 Nov '11

Whereas comm will check inputs to see if they're sorted (and warn when they aren't), grep doesn't even care about ordering. In this particular instance -- neither do we. We're only interested that the two lists are equivalent. Fixes FS#26580. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- scripts/makepkg.sh.in | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 26a2789..0fa05dc 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -506,15 +506,17 @@ remove_deps() { # check for packages removed during dependency install (e.g. due to conflicts) # removing all installed packages is risky in this case - if [[ -n $(comm -23 <(printf "%s\n" "${original_pkglist[@]}") \ - <(printf "%s\n" "${current_pkglist[@]}")) ]]; then - warning "$(gettext "Failed to remove installed dependencies.")" - return 0 + if [[ -n $(grep -xvFf <(printf '%s\n' "${current_packagelist[@]}") \ + <(printf '%s\n' "${original_packagelist[@]}") ) ]]; then + warning "$(gettext "Failed to remove installed dependencies.")" + return 0 fi - local deplist=($(comm -13 <(printf "%s\n" "${original_pkglist[@]}") \ - <(printf "%s\n" "${current_pkglist[@]}"))) - (( ${#deplist[@]} == 0 )) && return + local deplist + if ! deplist=($(grep -xvFf <(printf "%s\n" "${original_pkglist[@]}") \ + <(printf "%s\n" "${current_pkglist[@]}"))); then + return + fi msg "Removing installed dependencies..." # exit cleanly on failure to remove deps as package has been built successfully -- 1.7.7.4

3 4

[pacman-dev] [PATCH] makepkg: Use LC_COLLATE=C for comm command
by Allan McRae 22 Nov '11

22 Nov '11

Commit 3e4d2c3a reverted the use of strcoll in sorting package names, which results in potentially different package orders from pacman -Qq and that expected by comm. Use LC_COLLATE=C for the comm commands in makepkg. Fixes FS#27221. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index f39e9d1..4089e30 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -506,13 +506,13 @@ remove_deps() { # check for packages removed during dependency install (e.g. due to conflicts) # removing all installed packages is risky in this case - if [[ -n $(comm -23 <(printf "%s\n" "${original_pkglist[@]}") \ + if [[ -n $(LC_COLLATE=C comm -23 <(printf "%s\n" "${original_pkglist[@]}") \ <(printf "%s\n" "${current_pkglist[@]}")) ]]; then warning "$(gettext "Failed to remove installed dependencies.")" return 0 fi - local deplist=($(comm -13 <(printf "%s\n" "${original_pkglist[@]}") \ + local deplist=($(LC_COLLATE=C comm -13 <(printf "%s\n" "${original_pkglist[@]}") \ <(printf "%s\n" "${current_pkglist[@]}"))) (( ${#deplist[@]} == 0 )) && return -- 1.7.7.4

1 0

[pacman-dev] [PATCH] added doxygen documentation
by andrew.gregory.8＠gmail.com 22 Nov '11

22 Nov '11

From: Andrew Gregory <andrew.gregory.8(a)gmail.com> Made existing documentation more consistent and added documentation where there was none. A couple functions I did not fully understand still need documentation and are marked with 'TODO'. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/util.c | 122 +++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 98 insertions(+), 24 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index f5b7968..35bc059 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -173,8 +173,11 @@ cleanup: return ret; } -/* Trim whitespace and newlines from a string -*/ +/** Trim leading and trailing whitespace, including newlines, from a string. + * Modifies str in place. + * @param str a string to trim + * @return str + */ char *_alpm_strtrim(char *str) { char *pch = str; @@ -190,6 +193,7 @@ char *_alpm_strtrim(char *str) if(pch != str) { size_t len = strlen(pch); if(len) { + /* move the remaining string to the beginning of str */ memmove(str, pch, len + 1); } else { *str = '\0'; @@ -210,8 +214,7 @@ char *_alpm_strtrim(char *str) return str; } -/** - * Trim trailing newline from a string (if one exists). +/** Trim trailing newlines from a string (if one exists). * @param str a single line of text * @return the length of the trimmed string */ @@ -232,8 +235,7 @@ size_t _alpm_strip_newline(char *str) /* Compression functions */ -/** - * Open an archive for reading and perform the necessary boilerplate. +/** Open an archive for reading and perform the necessary boilerplate. * This takes care of creating the libarchive 'archive' struct, setting up * compression and format options, opening a file descriptor, setting up the * buffer size, and performing a stat on the path once opened. @@ -290,9 +292,7 @@ int _alpm_open_archive(alpm_handle_t *handle, const char *path, return fd; } -/** - * @brief Unpack a specific file in an archive. - * +/** Unpack a specific file in an archive. * @param handle the context handle * @param archive the archive to unpack * @param prefix where to extract the files @@ -313,15 +313,12 @@ int _alpm_unpack_single(alpm_handle_t *handle, const char *archive, return ret; } -/** - * @brief Unpack a list of files in an archive. - * +/** Unpack a list of files in an archive. * @param handle the context handle * @param path the archive to unpack * @param prefix where to extract the files * @param list a list of files within the archive to unpack or NULL for all * @param breakfirst break after the first entry found - * * @return 0 on success, 1 on failure */ int _alpm_unpack(alpm_handle_t *handle, const char *path, const char *prefix, @@ -421,7 +418,10 @@ cleanup: return ret; } -/* does the same thing as 'rm -rf' */ +/** Recursively removes a path similar to 'rm -rf'. + * @param path path to remove + * @return 0 on success, positive int on failure + */ int _alpm_rmrf(const char *path) { int errflag = 0; @@ -464,8 +464,7 @@ int _alpm_rmrf(const char *path) return 0; } -/** - * Determine if there are files in a directory +/** Determine if there are files in a directory. * @param handle the context handle * @param path the full absolute directory path * @param full_count whether to return an exact count of files @@ -505,7 +504,13 @@ ssize_t _alpm_files_in_directory(alpm_handle_t *handle, const char *path, closedir(dir); return files; } - +/** Write formatted message to log. + * @param handle the context handle + * @param format formatted string to write out + * @param args formatting arguments + * @return 0 or number of characters written on success, negative int on + * failure + */ int _alpm_logaction(alpm_handle_t *handle, const char *fmt, va_list args) { int ret = 0; @@ -537,6 +542,12 @@ int _alpm_logaction(alpm_handle_t *handle, const char *fmt, va_list args) return ret; } +/** TODO. + * @param handle the context handle + * @param path + * @param argv + * @return + */ int _alpm_run_chroot(alpm_handle_t *handle, const char *path, char *const argv[]) { pid_t pid; @@ -656,6 +667,10 @@ cleanup: return retval; } +/** Run ldconfig in a chroot. + * @param handle the context handle + * @return 0 + */ int _alpm_ldconfig(alpm_handle_t *handle) { char line[PATH_MAX]; @@ -674,8 +689,13 @@ int _alpm_ldconfig(alpm_handle_t *handle) return 0; } -/* Helper function for comparing strings using the - * alpm "compare func" signature */ +/** Helper function for comparing strings using the alpm "compare func" + * signature. + * @param s1 string to be compared + * @param s1 string to be compared + * @return 0 if strings are equal, positive int if first unequal character + * has a greater value in s1, negative if it has a greater value in s2 + */ int _alpm_str_cmp(const void *s1, const void *s2) { return strcmp(s1, s2); @@ -784,6 +804,11 @@ int _alpm_lstat(const char *path, struct stat *buf) } #ifdef HAVE_LIBSSL +/** Compute the md5 of a file. + * @param path file path to md5 + * @param output string to hold computed md5 + * @return 0 on success, 0 on file open error, 2 on file read error + */ static int md5_file(const char *path, unsigned char output[16]) { MD5_CTX ctx; @@ -820,6 +845,12 @@ static int md5_file(const char *path, unsigned char output[16]) } /* third param is so we match the PolarSSL definition */ +/** Compute the sha2 of a file. + * @param path file path to sha2 + * @param output string to hold computed sha2 + * @param is224 use sha224 instead of sha256 + * @return 0 on success, 1 on file open error, 2 on file read error + */ static int sha2_file(const char *path, unsigned char output[32], int is224) { SHA256_CTX ctx; @@ -936,6 +967,13 @@ char SYMEXPORT *alpm_compute_sha256sum(const char *filename) return sha256sum; } +/** Calculates a files md5 or sha2 and compares it to an expected value. + * @param filepath path of the file to check + * @param expected hash value to compare against + * @param type hash type to use + * @return 0 if file matches the expected hash, 1 if they do not match, -1 on + * error + */ int _alpm_test_checksum(const char *filepath, const char *expected, enum _alpm_csum type) { @@ -963,6 +1001,12 @@ int _alpm_test_checksum(const char *filepath, const char *expected, } /* Note: does NOT handle sparse files on purpose for speed. */ +/** TODO. + * Does not handle sparse files on purpose for speed. + * @param a + * @param b + * @return + */ int _alpm_archive_fgets(struct archive *a, struct archive_read_buffer *b) { /* ensure we start populating our line buffer at the beginning */ @@ -1058,6 +1102,13 @@ cleanup: } } +/** Parse a package db entry. + * @param target db entry to parse + * @param name string pointer to hold package name + * @param version string pointer to hold package version + * @param name_hash string pointer to hold package name hash + * @return 0 on success, -1 on error + */ int _alpm_splitname(const char *target, char **name, char **version, unsigned long *name_hash) { @@ -1110,8 +1161,7 @@ int _alpm_splitname(const char *target, char **name, char **version, return 0; } -/** - * Hash the given string to an unsigned long value. +/** Hash the given string to an unsigned long value. * This is the standard sdbm hashing algorithm. * @param str string to hash * @return the hash value of the given string @@ -1131,6 +1181,10 @@ unsigned long _alpm_hash_sdbm(const char *str) return hash; } +/** Convert a string to a file offset. + * @param line string to convert + * @return file offset on success, -1 on error + */ off_t _alpm_strtoofft(const char *line) { char *end; @@ -1156,6 +1210,10 @@ off_t _alpm_strtoofft(const char *line) return (off_t)result; } +/** Parses a date into an alpm_time_t struct. + * @param line date to parse + * @return time struct on success, 0 on error + */ alpm_time_t _alpm_parsedate(const char *line) { char *end; @@ -1189,8 +1247,7 @@ alpm_time_t _alpm_parsedate(const char *line) return (alpm_time_t)result; } -/** - * Wrapper around access() which takes a dir and file argument +/** Wrapper around access() which takes a dir and file argument * separately and generates an appropriate error message. * If dir is NULL file will be treated as the whole path. * @param handle an alpm handle @@ -1199,7 +1256,6 @@ alpm_time_t _alpm_parsedate(const char *line) * @param amode access mode as described in access() * @return int value returned by access() */ - int _alpm_access(alpm_handle_t *handle, const char *dir, const char *file, int amode) { size_t len = 0; @@ -1240,6 +1296,13 @@ int _alpm_access(alpm_handle_t *handle, const char *dir, const char *file, int a return ret; } +/** Checks whether a string matches a shell wildcard pattern. + * Wrapper around fnmatch. + * @param pattern pattern to match aganist + * @param string string to check against pattern + * @return 0 if string matches pattern, non-zero if they don't match and on + * error + */ int _alpm_fnmatch(const void *pattern, const void *string) { return fnmatch(pattern, string, 0); @@ -1247,6 +1310,11 @@ int _alpm_fnmatch(const void *pattern, const void *string) #ifndef HAVE_STRNDUP /* A quick and dirty implementation derived from glibc */ +/** Determines the length of a fixed-size string. + * @param s string to be measured + * @param max maximum number of characters to search for the string end + * @return length of s or max, whichever is smaller + */ static size_t strnlen(const char *s, size_t max) { register const char *p; @@ -1254,6 +1322,12 @@ static size_t strnlen(const char *s, size_t max) return (p - s); } +/** Copies a string. + * Returned string needs to be freed + * @param s string to be copied + * @param n maximum number of characters to copy + * @return pointer to the new string on success, NULL on error + */ char *strndup(const char *s, size_t n) { size_t len = strnlen(s, n); -- 1.7.7.3

2 2