- Pacman-dev - lists.archlinux.org

[pacman-dev] Dealing with asprintf failures
by Allan McRae 28 Jun '10

28 Jun '10

The remaining warnings generated with -D_FORTIFY_SOURCE=2 are usages of asprintf in src/pacman/util.c. e.g. util.c: In function ‘display_targets’: util.c:533:12: warning: ignoring return value of ‘asprintf’, declared with attribute warn_unused_result What is the best way to deal with these? One idea is: - asprintf(&str, "%s-%s [%.2f MB]", alpm_pkg_get_name(pkg), - alpm_pkg_get_version(pkg), mbsize); + if(asprintf(&str, "%s-%s [%.2f MB]", alpm_pkg_get_name(pkg), + alpm_pkg_get_version(pkg), mbsize) == -1) { + pm_fprintf(stderr, PM_LOG_ERROR, _("failed to allocate string\n")); + } This prints an error, but does not actually bail, on failure of asprintf. This is an improvement over the current code as we would know where the error occurred, but feels wrong not to exit. Note that several of the functions affected return void, so erroring out is not a simple "return -1". So, any ideas on the best way to approach this? Allan

3 10

[pacman-dev] [PATCH] Check return value of fgets calls
by Allan McRae 27 Jun '10

27 Jun '10

Prevents compiler warnings with -D_FORTIFY_SOURCE=2 Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/be_files.c | 8 ++++++-- lib/libalpm/trans.c | 3 +-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c index c26bef2..e2bbe28 100644 --- a/lib/libalpm/be_files.c +++ b/lib/libalpm/be_files.c @@ -657,7 +657,9 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) goto error; } while(!feof(fp)) { - fgets(line, 255, fp); + if(fgets(line, 256, fp) == NULL) { + break; + } _alpm_strtrim(line); if(strcmp(line, "%DEPENDS%") == 0) { while(fgets(line, sline, fp) && strlen(_alpm_strtrim(line))) { @@ -693,7 +695,9 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) snprintf(path, PATH_MAX, "%sdeltas", pkgpath); if((fp = fopen(path, "r"))) { while(!feof(fp)) { - fgets(line, 255, fp); + if(fgets(line, 256, fp) == NULL) { + break; + } _alpm_strtrim(line); if(strcmp(line, "%DELTAS%") == 0) { while(fgets(line, sline, fp) && strlen(_alpm_strtrim(line))) { diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index c042f09..6ebfa8f 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -324,8 +324,7 @@ static int grep(const char *fn, const char *needle) while(!feof(fp)) { char line[1024]; int sline = sizeof(line)-1; - fgets(line, sline, fp); - if(feof(fp)) { + if(fgets(line, sline, fp) == NULL || feof(fp)) { continue; } if(strstr(line, needle)) { -- 1.7.1

2 2

[pacman-dev] [PATCH] Check return value of fwrite when copying files
by Allan McRae 27 Jun '10

27 Jun '10

Check that writing to destination file actually occurs in _alpm_copyfile. Required adding a new error (PM_ERR_WRITE) as none of the others appeared appropriate. Prevents compiler warning when using -D_FORTIFY_SOURCE=2. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/alpm.h | 1 + lib/libalpm/util.c | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 3329132..0c01f21 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -522,6 +522,7 @@ enum _pmerrno_t { PM_ERR_FILE_CONFLICTS, /* Misc */ PM_ERR_RETRIEVE, + PM_ERR_WRITE, PM_ERR_INVALID_REGEX, /* External library errors */ PM_ERR_LIBARCHIVE, diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 383568c..559d62e 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -143,7 +143,15 @@ int _alpm_copyfile(const char *src, const char *dest) /* do the actual file copy */ while((len = fread(buf, 1, CPBUFSIZE, in))) { - fwrite(buf, 1, len, out); + size_t nwritten = 0; + nwritten = fwrite(buf, 1, len, out); + if((nwritten != len) || ferror(out)) { + pm_errno = PM_ERR_WRITE; + _alpm_log(PM_LOG_ERROR, _("error writing to file '%s': %s\n"), + dest, strerror(errno)); + ret = -1; + goto cleanup; + } } /* chmod dest to permissions of src, as long as it is not a symlink */ -- 1.7.1

1 0

Re: [pacman-dev] [PATCH] redirect scriptlet stderr through alpm
by Jonathan Conder 24 Jun '10

24 Jun '10

Sorry, I forgot to rebase against master. Here's the real patch: Fixes FS#18770, and hopefully an occasional deadlock in my frontend as well. For simplicity it redirects all scriptlet output through SCRIPTLET_INFO, and all callbacks in the child process have been replaced for thread-safety. Signed-off-by: Jonathan Conder <j(a)skurvy.no-ip.org> --- lib/libalpm/util.c | 86 +++++++++++++++++++++++++++++---------------------- 1 files changed, 49 insertions(+), 37 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 32eaa44..62851c1 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -448,6 +448,7 @@ int _alpm_run_chroot(const char *root, const char *cmd) { char cwd[PATH_MAX]; pid_t pid; + int pipefd[2]; int restore_cwd = 0; int retval = 0; @@ -471,6 +472,12 @@ int _alpm_run_chroot(const char *root, const char *cmd) /* Flush open fds before fork() to avoid cloning buffers */ fflush(NULL); + if(pipe(pipefd) == -1) { + _alpm_log(PM_LOG_ERROR, _("could not create pipe (%s)\n"), strerror(errno)); + retval = 1; + goto cleanup; + } + /* fork- parent and child each have seperate code blocks below */ pid = fork(); if(pid == -1) { @@ -480,55 +487,60 @@ int _alpm_run_chroot(const char *root, const char *cmd) } if(pid == 0) { - FILE *pipe; /* this code runs for the child only (the actual chroot/exec) */ - _alpm_log(PM_LOG_DEBUG, "chrooting in %s\n", root); + close(1); + close(2); + close(pipefd[0]); + while(dup2(pipefd[1], 1) == -1 && errno == EINTR); + while(dup2(pipefd[1], 2) == -1 && errno == EINTR); + close(pipefd[1]); + if(chroot(root) != 0) { - _alpm_log(PM_LOG_ERROR, _("could not change the root directory (%s)\n"), - strerror(errno)); + printf(_("could not change the root directory (%s)\n"), strerror(errno)); exit(1); } if(chdir("/") != 0) { - _alpm_log(PM_LOG_ERROR, _("could not change directory to / (%s)\n"), - strerror(errno)); + printf(_("could not change directory to / (%s)\n"), strerror(errno)); exit(1); } umask(0022); - pipe = popen(cmd, "r"); - if(!pipe) { - _alpm_log(PM_LOG_ERROR, _("call to popen failed (%s)\n"), - strerror(errno)); - exit(1); - } - while(!feof(pipe)) { - char line[PATH_MAX]; - if(fgets(line, PATH_MAX, pipe) == NULL) - break; - alpm_logaction("%s", line); - EVENT(handle->trans, PM_TRANS_EVT_SCRIPTLET_INFO, line, NULL); - } - retval = pclose(pipe); - exit(WEXITSTATUS(retval)); + execl("/bin/sh", "sh", "-c", cmd, (char *) NULL); + printf(_("call to execl failed (%s)\n"), strerror(errno)); + exit(1); } else { /* this code runs for the parent only (wait on the child) */ - pid_t retpid; int status; - do { - retpid = waitpid(pid, &status, 0); - } while(retpid == -1 && errno == EINTR); - if(retpid == -1) { - _alpm_log(PM_LOG_ERROR, _("call to waitpid failed (%s)\n"), - strerror(errno)); - retval = 1; - goto cleanup; + FILE *pipe; + + close(pipefd[1]); + pipe = fdopen(pipefd[0], "r"); + if(pipe == NULL) { + close(pipefd[0]); } else { - /* check the return status, make sure it is 0 (success) */ - if(WIFEXITED(status)) { - _alpm_log(PM_LOG_DEBUG, "call to waitpid succeeded\n"); - if(WEXITSTATUS(status) != 0) { - _alpm_log(PM_LOG_ERROR, _("command failed to execute correctly\n")); - retval = 1; - } + while(!feof(pipe)) { + char line[PATH_MAX]; + if(fgets(line, PATH_MAX, pipe) == NULL) + break; + alpm_logaction("%s", line); + EVENT(handle->trans, PM_TRANS_EVT_SCRIPTLET_INFO, line, NULL); + } + fclose(pipe); + } + + while(waitpid(pid, &status, 0) == -1) { + if(errno != EINTR) { + _alpm_log(PM_LOG_ERROR, _("call to waitpid failed (%s)\n"), strerror(errno)); + retval = 1; + goto cleanup; + } + } + + /* check the return status, make sure it is 0 (success) */ + if(WIFEXITED(status)) { + _alpm_log(PM_LOG_DEBUG, "call to waitpid succeeded\n"); + if(WEXITSTATUS(status) != 0) { + _alpm_log(PM_LOG_ERROR, _("command failed to execute correctly\n")); + retval = 1; } } } -- 1.7.1

3 10

[pacman-dev] [PATCH] repo-add: try symlink, then hardlink, then copy for DB file
by Dan McGee 24 Jun '10

24 Jun '10

We were seeing some issues when trying to create our new database alias using symlinks on certain filesystems (see FS#19907). Have a fallback method in place where we first try a symlink, then a hard link, then just copy the database if all else fails. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- scripts/repo-add.sh.in | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 7bde600..2838f81 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -487,7 +487,10 @@ if (( success )); then [[ -f $REPO_DB_FILE ]] && mv -f "$REPO_DB_FILE" "${REPO_DB_FILE}.old" [[ -f $tmpdir/$filename ]] && mv "$tmpdir/$filename" "$REPO_DB_FILE" - ln -sf "$REPO_DB_FILE" "${REPO_DB_FILE%.tar.*}" + dblink="${REPO_DB_FILE%.tar.*}" + ln -sf "$REPO_DB_FILE" "$dblink" 2>/dev/null || \ + ln -f "$REPO_DB_FILE" "$dblink" 2>/dev/null || \ + cp "$REPO_DB_FILE" "$dblink" else msg "$(gettext "No packages modified, nothing to do.")" exit 1 -- 1.7.1

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.0-29-g630e750
by dan＠archlinux.org 24 Jun '10

24 Jun '10

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 630e7508ee44f2c41ba3f5d17c0c9ac15b15af3b (commit) via 71330a431040377ae9a37989fcfd43cee7596194 (commit) via c6a94a8d2204cfdec0f782f647903d597b4faf57 (commit) via 6f4f9c1b66ed859b3679d70e15c003ab4907b823 (commit) via 07a9effdd06345d09f09cdc92e23c937d8fa94b5 (commit) via 708f186f98a0c2094225aa94ac8a139ac3a9163e (commit) via 226c137245192444085d03a7f841b35afe99791c (commit) via 2222e9f8dfe6e149262f629571b3432718351d3f (commit) from 67d71ea932a18d27dbb87f4f364ae9159b4edc96 (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 630e7508ee44f2c41ba3f5d17c0c9ac15b15af3b Merge: 71330a4 6f4f9c1 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 24 08:32:33 2010 -0500 Merge branch 'maint' commit 71330a431040377ae9a37989fcfd43cee7596194 Author: Eric Bélanger <snowmaniscool(a)gmail.com> Date: Wed Jun 23 01:35:56 2010 -0400 makepkg: Place source packages symlinks in build dir when SRCPKGDEST is used Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c6a94a8d2204cfdec0f782f647903d597b4faf57 Author: Andres P <aepd87(a)gmail.com> Date: Mon Jun 21 12:25:37 2010 -0430 makepkg: fix regression in split package function checking Commit 13748ca0529 inversed the nature of one test wherein the if clause would throw a fatal error if a legitimate package function was defined in PKGBUILD. Signed-off-by: Andres P <aepd87(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/bash_completion | 17 ++++++++++++----- scripts/makepkg.sh.in | 24 +++++++++++++++++++----- scripts/rankmirrors.sh.in | 12 ++++++------ 3 files changed, 37 insertions(+), 16 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.4.0-9-g6f4f9c1
by dan＠archlinux.org 24 Jun '10

24 Jun '10

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 6f4f9c1b66ed859b3679d70e15c003ab4907b823 (commit) via 07a9effdd06345d09f09cdc92e23c937d8fa94b5 (commit) via 708f186f98a0c2094225aa94ac8a139ac3a9163e (commit) via 226c137245192444085d03a7f841b35afe99791c (commit) via 2222e9f8dfe6e149262f629571b3432718351d3f (commit) from c2cf6a14cf44400d0ef249b38d37eb04d3424bf4 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: contrib/bash_completion | 17 ++++++++++++----- scripts/makepkg.sh.in | 10 +++++++--- scripts/rankmirrors.sh.in | 12 ++++++------ 3 files changed, 25 insertions(+), 14 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] makepkg: Place source packages symlinks in build dir when SRCPKGDEST is used
by Eric Bélanger 23 Jun '10

23 Jun '10

Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- scripts/makepkg.sh.in | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index dbc4047..0219015 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -153,7 +153,7 @@ clean_up() { # clean up dangling symlinks to packages for pkg in ${pkgname[@]}; do - for file in ${pkg}-*-*-${CARCH}${PKGEXT}; do + for file in ${pkg}-*-*-${CARCH}${PKGEXT} ${pkg}-*-*-${CARCH}${SRCEXT}; do if [[ -h $file && ! -e $file ]]; then rm -f $file fi @@ -1126,6 +1126,16 @@ create_srcpackage() { error "$(gettext "Failed to create source package file.")" exit 1 # TODO: error code fi + + if (( ! ret )) && [[ "$SRCPKGDEST" != "${startdir}" ]]; then + ln -sf "${pkg_file}" "${pkg_file/$SRCPKGDEST/$startdir}" + ret=$? + fi + + if (( ret )); then + warning "$(gettext "Failed to create symlink to source package file.")" + fi + cd "${startdir}" rm -rf "${srclinks}" } -- 1.7.1

2 1

[pacman-dev] [PATCH] makepkg: Place source packages symlinks in build dir when SRCPKGDEST is used
by Eric Bélanger 23 Jun '10

23 Jun '10

Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- scripts/makepkg.sh.in | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index dbc4047..83d656f 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -159,6 +159,16 @@ clean_up() { fi done done + + # clean up dangling symlinks to source packages + for pkg in ${pkgname[@]}; do + for file in ${pkg}-*-*-${CARCH}${SRCEXT}; do + if [[ -h $file && ! -e $file ]]; then + rm -f $file + fi + done + done + fi fi @@ -1126,6 +1136,16 @@ create_srcpackage() { error "$(gettext "Failed to create source package file.")" exit 1 # TODO: error code fi + + if (( ! ret )) && [[ "$SRCPKGDEST" != "${startdir}" ]]; then + ln -sf "${pkg_file}" "${pkg_file/$SRCPKGDEST/$startdir}" + ret=$? + fi + + if (( ret )); then + warning "$(gettext "Failed to create symlink to source package file.")" + fi + cd "${startdir}" rm -rf "${srclinks}" } -- 1.7.1

2 2

[pacman-dev] [PATCH] makepkg: prevent error trap activation in bash-3.2
by Allan McRae 23 Jun '10

23 Jun '10

Running "pacman -T foo" is expected to return a non-zero value when "foo" is not installed. This sets of the error trap in bash-3.2 but not bash 4.x. Work around this by disabling the error trap around this pacman call as we are manually checking the return value anyway. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 4f9f89b..2699f63 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -382,11 +382,15 @@ run_pacman() { } check_deps() { - (( $# > 0 )) || return + (( $# > 0 )) || return 0 + # Disable error trap in pacman subshell call as this breaks bash-3.2 compatibility + # Also, a non-zero return value is not unexpected and we are manually dealing them + set +E local ret=0 - pmout=$(run_pacman -T "$@") - ret=$? + pmout=$(run_pacman -T "$@") || ret=$? + set -E + if (( ret == 127 )); then #unresolved deps echo "$pmout" elif (( ret )); then -- 1.7.1

2 2