- Pacman-dev - lists.archlinux.org

[pacman-dev] CVS update of pacman-lib/lib/libalpm (package.c)
by Aaron Griffin 19 Jan '07

19 Jan '07

Date: Friday, January 19, 2007 @ 13:05:19 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: package.c (1.45 -> 1.46) Johannes Weiner <hannes(a)saeurebad.de> * package cleanup (pkg_invalid) refactoring -----------+ package.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) Index: pacman-lib/lib/libalpm/package.c diff -u pacman-lib/lib/libalpm/package.c:1.45 pacman-lib/lib/libalpm/package.c:1.46 --- pacman-lib/lib/libalpm/package.c:1.45 Fri Jan 19 13:01:02 2007 +++ pacman-lib/lib/libalpm/package.c Fri Jan 19 13:05:19 2007 @@ -271,27 +271,15 @@ /* parse the info file */ if(parse_descfile(descfile, info, 0) == -1) { _alpm_log(PM_LOG_ERROR, _("could not parse the package description file")); - pm_errno = PM_ERR_PKG_INVALID; - unlink(descfile); - FREE(descfile); - close(fd); - goto error; + goto pkg_invalid; } if(!strlen(info->name)) { _alpm_log(PM_LOG_ERROR, _("missing package name in %s"), pkgfile); - pm_errno = PM_ERR_PKG_INVALID; - unlink(descfile); - FREE(descfile); - close(fd); - goto error; + goto pkg_invalid; } if(!strlen(info->version)) { _alpm_log(PM_LOG_ERROR, _("missing package version in %s"), pkgfile); - pm_errno = PM_ERR_PKG_INVALID; - unlink(descfile); - FREE(descfile); - close(fd); - goto error; + goto pkg_invalid; } config = 1; unlink(descfile); @@ -361,6 +349,11 @@ return(info); +pkg_invalid: + pm_errno = PM_ERR_PKG_INVALID; + unlink(descfile); + FREE(descfile); + close(fd); error: FREEPKG(info); archive_read_finish (archive);

1 0

[pacman-dev] CVS update of pacman-lib/lib/libalpm (package.c)
by Aaron Griffin 19 Jan '07

19 Jan '07

Date: Friday, January 19, 2007 @ 13:01:02 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: package.c (1.44 -> 1.45) Johannes Weiner <hannes(a)saeurebad.de> * use calloc to zero-out new packages (far more ideal) * use memcpy to copy primatives when copying package structures -----------+ package.c | 61 +++++------------------------------------------------------- 1 file changed, 6 insertions(+), 55 deletions(-) Index: pacman-lib/lib/libalpm/package.c diff -u pacman-lib/lib/libalpm/package.c:1.44 pacman-lib/lib/libalpm/package.c:1.45 --- pacman-lib/lib/libalpm/package.c:1.44 Fri Jan 19 04:28:45 2007 +++ pacman-lib/lib/libalpm/package.c Fri Jan 19 13:01:02 2007 @@ -41,10 +41,10 @@ pmpkg_t *_alpm_pkg_new(const char *name, const char *version) { - pmpkg_t* pkg = NULL; + pmpkg_t* pkg; - if((pkg = (pmpkg_t *)malloc(sizeof(pmpkg_t))) == NULL) { - RET_ERR(PM_ERR_MEMORY, (pmpkg_t *)-1); + if((pkg = calloc(1,sizeof(pmpkg_t))) == NULL) { + RET_ERR(PM_ERR_MEMORY, NULL); } if(name && name[0] != 0) { @@ -57,67 +57,20 @@ } else { pkg->version[0] = '\0'; } - pkg->filename[0] = '\0'; - pkg->desc[0] = '\0'; - pkg->url[0] = '\0'; - pkg->license = NULL; - pkg->desc_localized = NULL; - pkg->builddate[0] = '\0'; - pkg->buildtype[0] = '\0'; - pkg->installdate[0] = '\0'; - pkg->packager[0] = '\0'; - pkg->md5sum[0] = '\0'; - pkg->sha1sum[0] = '\0'; - pkg->arch[0] = '\0'; - pkg->size = 0; - pkg->isize = 0; - pkg->scriptlet = 0; - pkg->force = 0; - pkg->reason = PM_PKG_REASON_EXPLICIT; - pkg->requiredby = NULL; - pkg->conflicts = NULL; - pkg->files = NULL; - pkg->backup = NULL; - pkg->depends = NULL; - pkg->removes = NULL; - pkg->groups = NULL; - pkg->provides = NULL; - pkg->replaces = NULL; - /* internal */ - pkg->origin = 0; - pkg->data = NULL; - pkg->infolevel = 0; return(pkg); } pmpkg_t *_alpm_pkg_dup(pmpkg_t *pkg) { - pmpkg_t* newpkg = NULL; + pmpkg_t* newpkg; - newpkg = (pmpkg_t *)malloc(sizeof(pmpkg_t)); - if(newpkg == NULL) { + if((newpkg = calloc(0, sizeof(pmpkg_t))) == NULL) { _alpm_log(PM_LOG_ERROR, _("malloc failure: could not allocate %d bytes"), sizeof(pmpkg_t)); RET_ERR(PM_ERR_MEMORY, NULL); } - STRNCPY(newpkg->filename, pkg->filename, PKG_FILENAME_LEN); - STRNCPY(newpkg->name, pkg->name, PKG_NAME_LEN); - STRNCPY(newpkg->version, pkg->version, PKG_VERSION_LEN); - STRNCPY(newpkg->desc, pkg->desc, PKG_DESC_LEN); - STRNCPY(newpkg->url, pkg->url, PKG_URL_LEN); - STRNCPY(newpkg->builddate, pkg->builddate, PKG_DATE_LEN); - STRNCPY(newpkg->buildtype, pkg->buildtype, PKG_DATE_LEN); - STRNCPY(newpkg->installdate, pkg->installdate, PKG_DATE_LEN); - STRNCPY(newpkg->packager, pkg->packager, PKG_PACKAGER_LEN); - STRNCPY(newpkg->md5sum, pkg->md5sum, PKG_MD5SUM_LEN); - STRNCPY(newpkg->sha1sum, pkg->sha1sum, PKG_SHA1SUM_LEN); - STRNCPY(newpkg->arch, pkg->arch, PKG_ARCH_LEN); - newpkg->size = pkg->size; - newpkg->isize = pkg->isize; - newpkg->force = pkg->force; - newpkg->scriptlet = pkg->scriptlet; - newpkg->reason = pkg->reason; + memcpy(newpkg, pkg, sizeof(pmpkg_t)); newpkg->license = alpm_list_strdup(pkg->license); newpkg->desc_localized = alpm_list_strdup(pkg->desc_localized); newpkg->requiredby = alpm_list_strdup(pkg->requiredby); @@ -130,9 +83,7 @@ newpkg->provides = alpm_list_strdup(pkg->provides); newpkg->replaces = alpm_list_strdup(pkg->replaces); /* internal */ - newpkg->origin = pkg->origin; newpkg->data = (newpkg->origin == PKG_FROM_FILE) ? strdup(pkg->data) : pkg->data; - newpkg->infolevel = pkg->infolevel; return(newpkg); }

1 0

[pacman-dev] CVS update of pacman-lib (TODO.aaron)
by Aaron Griffin 19 Jan '07

19 Jan '07

Date: Friday, January 19, 2007 @ 12:42:58 Author: aaron Path: /home/cvs-pacman/pacman-lib Modified: TODO.aaron (1.8 -> 1.9) Added some things I noticed when making alpm_list changes, but didn't want to change too much at once. ------------+ TODO.aaron | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) Index: pacman-lib/TODO.aaron diff -u pacman-lib/TODO.aaron:1.8 pacman-lib/TODO.aaron:1.9 --- pacman-lib/TODO.aaron:1.8 Thu Jan 18 15:58:03 2007 +++ pacman-lib/TODO.aaron Fri Jan 19 12:42:58 2007 @@ -1,10 +1,32 @@ == This is my custom TODO file == -This (second) test should shoot a commit email to the pacman-dev list. +* Make sure all the alpm_list_t changes are valid (especially alpm_list_free) -* pacman: ALOT of functions are way too long. There should be an upper limit of +* src/pacman: + - There's quite a few single function headers which contain the pacman_* + functions. We should move these to a single header (pacman.h) to clean up + the source a bit. + - config_t duplicates much of what can be accessed from the alpm_option_* + interface. Determine what can / can't be removed and do so. + - initialize alpm BEFORE parsing args, so we can get rid of a handful of + local lists and things in pacman.c (see below) + - fix the "--debug" parameter. requiring a bitmask from the user is silly. + we can parse this can send a real bitmask to alpm. + +* lib/libalpm: + - Remove `root` param from alpm_initialize. We can simply initialize to / + and call set_root at a later time. This allows us to initiliaze earlier. + - move logging (alpm_logaction) out of the library. log files should be + written by the app, not the library. Adding a PM_LOG_* constant that + frontends can recognize and send to a file is probably a good idea. + - maybe it's my fault, but I see little difference between PM_LOG_FLOW1, + PM_LOG_FLOW2, and PM_LOG_DEBUG. We might want to just do away with flow1 + and flow2 and use debug across the board. + +* pacman: A LOT of functions are way too long. There should be an upper limit of 100-200 lines. _alpm_add_commit is around 600 lines, and is far too complex. - Quite alot of this needs to be refactored as we go. + + Quite a lot of this needs to be refactored as we go. Function list (from Dan McGee): add.c: _alpm_add_commit

1 0

[pacman-dev] Various code-cleanups
by Dan McGee 19 Jan '07

19 Jan '07

* Removed some unnecessary headers and library links * Made things static if possible * Cleaned up makefiles a bit * Fixed some old comments in the code * Fixed some errors the static code checker splint pointed out (unnecessary = NULL, bad exit() syntax, casting problems, etc.) * Backwards arguments in a memset call in _alpm_db_read (could have been worse) * Other various small fixes Signed-off-by: Dan McGee <dpmcgee(a)gmail.com> (also posted at http://pastebin.archlinux.org/878 to make line wraps not a concern) diff -Naurp pacman-lib.orig/bindings/perl/Makefile.in pacman-lib.codecleanup/bindings/perl/Makefile.in --- pacman-lib.orig/bindings/perl/Makefile.in 2006-10-25 11:40:44.000000000 -0400 +++ pacman-lib.codecleanup/bindings/perl/Makefile.in 2007-01-17 10:41:18.000000000 -0500 @@ -34,7 +34,7 @@ install-pm: Core.pm install -m644 $^ $(DESTDIR)$(LIBDIR)/Alpm/ clean: - rm -f Core* alpm{.h,_wrap*} + rm -f Core* alpm{.h,.i,_wrap*} distclean: clean rm -f Makefile diff -Naurp pacman-lib.orig/bindings/python/Makefile.in pacman-lib.codecleanup/bindings/python/Makefile.in --- pacman-lib.orig/bindings/python/Makefile.in 2006-12-14 00:23:08.000000000 -0500 +++ pacman-lib.codecleanup/bindings/python/Makefile.in 2007-01-17 10:42:02.000000000 -0500 @@ -41,7 +41,7 @@ install-py: alpm.py alpm.pyc install -m644 $^ $(DESTDIR)$(LIBDIR) clean: - rm -f _alpm* alpm{.h,.py*,_wrap*} + rm -f _alpm* alpm{.h,.i,.py*,_wrap*} distclean: clean rm -f Makefile diff -Naurp pacman-lib.orig/lib/libalpm/Makefile.am pacman-lib.codecleanup/lib/libalpm/Makefile.am --- pacman-lib.orig/lib/libalpm/Makefile.am 2006-12-14 00:23:08.000000000 -0500 +++ pacman-lib.codecleanup/lib/libalpm/Makefile.am 2007-01-17 10:43:23.000000000 -0500 @@ -40,7 +40,7 @@ include_HEADERS = alpm.h libalpm_la_SOURCES = $(TARGETS) libalpm_la_LDFLAGS = -no-undefined -version-info $(PM_VERSION_INFO) -libalpm_la_LIBADD = -ldownload +libalpm_la_LIBADD = -larchive -ldownload if HAS_DOXYGEN all: doxygen.in diff -Naurp pacman-lib.orig/lib/libalpm/alpm.c pacman-lib.codecleanup/lib/libalpm/alpm.c --- pacman-lib.orig/lib/libalpm/alpm.c 2007-01-11 16:17:06.000000000 -0500 +++ pacman-lib.codecleanup/lib/libalpm/alpm.c 2007-01-17 10:58:00.000000000 -0500 @@ -137,7 +137,7 @@ int alpm_release() /** Register a package database * @param treename the name of the repository - * @return 0 on success, -1 on error (pm_errno is set accordingly) + * @return a pmdb_t* on success (the value), NULL on error */ pmdb_t *alpm_db_register(char *treename) { diff -Naurp pacman-lib.orig/lib/libalpm/be_files.c pacman-lib.codecleanup/lib/libalpm/be_files.c --- pacman-lib.orig/lib/libalpm/be_files.c 2007-01-02 17:29:48.000000000 -0500 +++ pacman-lib.codecleanup/lib/libalpm/be_files.c 2007-01-17 11:10:08.000000000 -0500 @@ -180,7 +180,7 @@ int _alpm_db_read(pmdb_t *db, unsigned i FILE *fp = NULL; struct stat buf; char path[PATH_MAX+1]; - char line[513] = {0}; + char line[513]; pmlist_t *tmplist; char *locale; @@ -205,7 +205,7 @@ int _alpm_db_read(pmdb_t *db, unsigned i _alpm_log(PM_LOG_FUNCTION, _("loading package data for %s : level=%d"), info->name, inforeq); /* clear out 'line', to be certain - and to make valgrind happy */ - memset(line, 513, 0); + memset(line, 0, 513); snprintf(path, PATH_MAX, "%s/%s-%s", db->path, info->name, info->version); if(stat(path, &buf)) { @@ -528,20 +528,20 @@ int _alpm_db_write(pmdb_t *db, pmpkg_t * } if(info->size) { fprintf(fp, "%%SIZE%%\n" - "%ld\n\n", info->size); + "%lu\n\n", info->size); } if(info->reason) { fprintf(fp, "%%REASON%%\n" - "%d\n\n", info->reason); + "%u\n\n", info->reason); } } else { if(info->size) { fprintf(fp, "%%CSIZE%%\n" - "%ld\n\n", info->size); + "%lu\n\n", info->size); } if(info->isize) { fprintf(fp, "%%ISIZE%%\n" - "%ld\n\n", info->isize); + "%lu\n\n", info->isize); } if(info->sha1sum) { fprintf(fp, "%%SHA1SUM%%\n" diff -Naurp pacman-lib.orig/lib/libalpm/conflict.c pacman-lib.codecleanup/lib/libalpm/conflict.c --- pacman-lib.orig/lib/libalpm/conflict.c 2006-11-22 04:03:42.000000000 -0500 +++ pacman-lib.codecleanup/lib/libalpm/conflict.c 2007-01-17 11:12:17.000000000 -0500 @@ -206,6 +206,10 @@ pmlist_t *_alpm_checkconflicts(pmdb_t *d return(baddeps); } +/* Returns a pmlist_t* of file conflicts. + * + * adds list of files to skip to pmlist_t** skip_list. + */ pmlist_t *_alpm_db_find_conflicts(pmdb_t *db, pmtrans_t *trans, char *root, pmlist_t **skip_list) { pmlist_t *i, *j, *k; @@ -230,9 +234,10 @@ pmlist_t *_alpm_db_find_conflicts(pmdb_t for(k = p1->files; k; k = k->next) { filestr = k->data; if(filestr[strlen(filestr)-1] == '/') { - /* this filename has a trailing '/', so it's a directory -- skip it. */ + /* has a trailing '/', so it's a directory -- skip it. */ continue; } + /* TODO do we need both install file names here? */ if(!strcmp(filestr, "._install") || !strcmp(filestr, ".INSTALL")) { continue; } diff -Naurp pacman-lib.orig/lib/libalpm/deps.c pacman-lib.codecleanup/lib/libalpm/deps.c --- pacman-lib.orig/lib/libalpm/deps.c 2006-12-05 02:00:22.000000000 -0500 +++ pacman-lib.codecleanup/lib/libalpm/deps.c 2007-01-17 11:14:27.000000000 -0500 @@ -119,6 +119,10 @@ pmlist_t *_alpm_sortbydeps(pmlist_t *tar while(change) { pmlist_t *tmptargs = NULL; change = 0; + /* TODO only use of a math.h function in entire libalpm, + * can we get rid of it? Former code line: + *if(numscans > numtargs) { + */ if(numscans > sqrt(numtargs)) { _alpm_log(PM_LOG_DEBUG, _("possible dependency cycle detected")); continue; diff -Naurp pacman-lib.orig/lib/libalpm/error.c pacman-lib.codecleanup/lib/libalpm/error.c --- pacman-lib.orig/lib/libalpm/error.c 2006-11-16 12:24:44.000000000 -0500 +++ pacman-lib.codecleanup/lib/libalpm/error.c 2007-01-17 11:14:58.000000000 -0500 @@ -134,7 +134,7 @@ char *alpm_strerror(int err) case PM_ERR_CONF_DIRECTIVE_OUTSIDE_SECTION: return _("all directives must belong to a section"); case PM_ERR_INVALID_REGEX: - return _("valid regular expression"); + return _("invalid regular expression"); case PM_ERR_CONNECT_FAILED: return _("connection to remote host failed"); case PM_ERR_FORK_FAILED: diff -Naurp pacman-lib.orig/lib/libalpm/handle.c pacman-lib.codecleanup/lib/libalpm/handle.c --- pacman-lib.orig/lib/libalpm/handle.c 2006-12-05 02:00:22.000000000 -0500 +++ pacman-lib.codecleanup/lib/libalpm/handle.c 2007-01-17 11:16:02.000000000 -0500 @@ -27,7 +27,6 @@ #include <unistd.h> #include <limits.h> #include <sys/types.h> -#include <stdarg.h> #include <syslog.h> #include <libintl.h> #include <time.h> diff -Naurp pacman-lib.orig/lib/libalpm/list.c pacman-lib.codecleanup/lib/libalpm/list.c --- pacman-lib.orig/lib/libalpm/list.c 2007-01-11 16:17:06.000000000 -0500 +++ pacman-lib.codecleanup/lib/libalpm/list.c 2007-01-17 11:27:46.000000000 -0500 @@ -307,6 +307,7 @@ pmlist_t *_alpm_list_last(pmlist_t *list return(NULL); } + /* TODO this is the only assert.h used in entire library */ assert(list->last != NULL); return(list->last); diff -Naurp pacman-lib.orig/lib/libalpm/md5driver.c pacman-lib.codecleanup/lib/libalpm/md5driver.c --- pacman-lib.orig/lib/libalpm/md5driver.c 2006-10-15 15:31:05.000000000 -0400 +++ pacman-lib.codecleanup/lib/libalpm/md5driver.c 2007-01-17 11:29:33.000000000 -0500 @@ -21,7 +21,6 @@ documentation and/or software. #include <stdlib.h> #include <stdio.h> -#include <time.h> #include <string.h> #include <libintl.h> #include "util.h" diff -Naurp pacman-lib.orig/lib/libalpm/package.c pacman-lib.codecleanup/lib/libalpm/package.c --- pacman-lib.orig/lib/libalpm/package.c 2006-11-22 04:03:42.000000000 -0500 +++ pacman-lib.codecleanup/lib/libalpm/package.c 2007-01-17 11:32:09.000000000 -0500 @@ -26,7 +26,6 @@ #include <stdio.h> #include <stdlib.h> #include <limits.h> -#include <fcntl.h> #include <string.h> #include <libintl.h> #include <locale.h> diff -Naurp pacman-lib.orig/lib/libalpm/server.c pacman-lib.codecleanup/lib/libalpm/server.c --- pacman-lib.orig/lib/libalpm/server.c 2006-11-21 23:25:31.000000000 -0500 +++ pacman-lib.codecleanup/lib/libalpm/server.c 2007-01-17 11:34:28.000000000 -0500 @@ -27,7 +27,7 @@ #include <sys/stat.h> #include <unistd.h> #include <time.h> -#include <sys/time.h> +#include <download.h> /* pacman */ #include "server.h" diff -Naurp pacman-lib.orig/lib/libalpm/sha1.c pacman-lib.codecleanup/lib/libalpm/sha1.c --- pacman-lib.orig/lib/libalpm/sha1.c 2006-12-20 20:53:41.000000000 -0500 +++ pacman-lib.codecleanup/lib/libalpm/sha1.c 2007-01-17 11:34:50.000000000 -0500 @@ -33,7 +33,6 @@ #include <sys/types.h> #include <stdlib.h> -#include <time.h> #include <string.h> /* diff -Naurp pacman-lib.orig/lib/libalpm/sha1.h pacman-lib.codecleanup/lib/libalpm/sha1.h --- pacman-lib.orig/lib/libalpm/sha1.h 2006-12-20 20:53:41.000000000 -0500 +++ pacman-lib.codecleanup/lib/libalpm/sha1.h 2007-01-17 11:37:34.000000000 -0500 @@ -20,23 +20,30 @@ #include <limits.h> #define rol(x,n) ( ((x) << (n)) | ((x) >> (32 -(n))) ) +/* TODO check this comment */ /* The code below is from md5.h (from coreutils), little modifications */ #define UINT_MAX_32_BITS 4294967295U +/* This new ifdef allows splint to not fail on its static code check */ +#ifdef S_SPLINT_S +typedef unsigned int sha_uint32; +#endif +#ifndef S_SPLINT_S #if UINT_MAX == UINT_MAX_32_BITS - typedef unsigned int sha_uint32; +typedef unsigned int sha_uint32; #else #if USHRT_MAX == UINT_MAX_32_BITS - typedef unsigned short sha_uint32; +typedef unsigned short sha_uint32; #else #if ULONG_MAX == UINT_MAX_32_BITS - typedef unsigned long sha_uint32; +typedef unsigned long sha_uint32; #else /* The following line is intended to evoke an error. Using #error is not portable enough. */ #error "Cannot determine unsigned 32-bit data type" #endif #endif #endif +#endif /* We have to make a guess about the integer type equivalent in size to pointers which should always be correct. */ typedef unsigned long int sha_uintptr; diff -Naurp pacman-lib.orig/lib/libalpm/sync.c pacman-lib.codecleanup/lib/libalpm/sync.c --- pacman-lib.orig/lib/libalpm/sync.c 2007-01-03 03:05:13.000000000 -0500 +++ pacman-lib.codecleanup/lib/libalpm/sync.c 2007-01-17 11:40:43.000000000 -0500 @@ -55,6 +55,14 @@ #include "handle.h" #include "server.h" +/* static function declarations */ +static pmsyncpkg_t *find_pkginsync(char *needle, pmlist_t *haystack); +static int istoonew(pmpkg_t *pkg); +static int find_replacements(pmtrans_t *trans, pmdb_t *db_local, + pmlist_t *dbs_sync); +static int pkg_cmp(const void *p1, const void *p2); + + pmsyncpkg_t *_alpm_sync_new(int type, pmpkg_t *spkg, void *data) { pmsyncpkg_t *sync; @@ -121,7 +129,8 @@ static int istoonew(pmpkg_t *pkg) /* Find recommended replacements for packages during a sync. * (refactored from _alpm_sync_prepare) */ -static int find_replacements(pmtrans_t *trans, pmdb_t *db_local, pmlist_t *dbs_sync) +static int find_replacements(pmtrans_t *trans, pmdb_t *db_local, + pmlist_t *dbs_sync) { pmlist_t *i, *j, *k; diff -Naurp pacman-lib.orig/lib/libalpm/util.c pacman-lib.codecleanup/lib/libalpm/util.c --- pacman-lib.orig/lib/libalpm/util.c 2007-01-17 02:43:09.000000000 -0500 +++ pacman-lib.codecleanup/lib/libalpm/util.c 2007-01-17 11:26:35.000000000 -0500 @@ -36,7 +36,6 @@ #ifdef __sun__ #include <alloca.h> #endif -#include <stdarg.h> #include <string.h> #include <unistd.h> #include <errno.h> diff -Naurp pacman-lib.orig/src/pacman/Makefile.am pacman-lib.codecleanup/src/pacman/Makefile.am --- pacman-lib.orig/src/pacman/Makefile.am 2006-12-28 11:54:35.000000000 -0500 +++ pacman-lib.codecleanup/src/pacman/Makefile.am 2007-01-17 10:56:42.000000000 -0500 @@ -17,9 +17,9 @@ pacman_SOURCES = util.c log.c list.c pac pacman_static_SOURCES = $(pacman_SOURCES) pacman_LDADD = -L$(top_srcdir)/lib/libalpm/.libs \ - -ldownload -larchive -lm -lalpm -lssl -lcrypto + -ldownload -lm -lalpm pacman_static_LDADD = -L$(top_srcdir)/lib/libalpm/.libs/ \ - -ldownload -larchive -lm -lalpm -lssl -lcrypto + -ldownload -lm -lalpm pacman_static_LDFLAGS = $(LDFLAGS) -all-static diff -Naurp pacman-lib.orig/src/pacman/downloadprog.c pacman-lib.codecleanup/src/pacman/downloadprog.c --- pacman-lib.orig/src/pacman/downloadprog.c 2006-12-22 02:11:20.000000000 -0500 +++ pacman-lib.codecleanup/src/pacman/downloadprog.c 2007-01-17 11:44:27.000000000 -0500 @@ -39,10 +39,10 @@ #include "conf.h" /* progress bar */ -float rate_last; -int xfered_last; -struct timeval last_time; -struct timeval initial_time; +static float rate_last; +static int xfered_last; +static struct timeval last_time; +static struct timeval initial_time; /* pacman options */ extern config_t *config; @@ -52,13 +52,13 @@ extern config_t *config; void log_progress(const char *filename, int xfered, int total) { - static int lasthash = 0, mouth = 0; - int i, hash; - long chomp = 0; + static unsigned int lasthash = 0, mouth = 0; + unsigned int i, hash; + unsigned int chomp = 0; char *fname, *p; unsigned int maxcols = getcols(); unsigned int progresslen = maxcols - 57; - int percent = ((float)xfered) / ((float)total) * 100; + int percent = (int)((float)xfered) / ((float)total) * 100; struct timeval current_time; float rate = 0.0; unsigned int eta_h = 0, eta_m = 0, eta_s = 0; @@ -87,17 +87,17 @@ void log_progress(const char *filename, if(xfered == total) { /* compute final values */ - rate = total / (total_timediff * 1024); - eta_s = (int)total_timediff; + rate = (float)total / (total_timediff * 1024); + eta_s = (unsigned int)total_timediff; set_output_padding(0); /* shut off padding */ } else if(timediff < UPDATE_SPEED_SEC) { /* we avoid computing the ETA on too small periods of time, so that results are more significant */ return; } else { - rate = (xfered - xfered_last) / (timediff * 1024); - rate = (rate + 2*rate_last) / 3; - eta_s = (total - xfered) / (rate * 1024); + rate = (float)(xfered - xfered_last) / (timediff * 1024); + rate = (float)(rate + 2*rate_last) / 3; + eta_s = (unsigned int)(total - xfered) / (rate * 1024); } rate_last = rate; @@ -130,11 +130,11 @@ void log_progress(const char *filename, rate = 9999.9; } - printf(" %-*s %6dK %#6.1fK/s %02d:%02d:%02d [", FILENAME_TRIM_LEN, fname, xfered/1024, rate, eta_h, eta_m, eta_s); + printf(" %-*s %6dK %#6.1fK/s %02u:%02u:%02u [", FILENAME_TRIM_LEN, fname, xfered/1024, rate, eta_h, eta_m, eta_s); free(fname); - hash = percent*progresslen/100; + hash = (unsigned int)percent*progresslen/100; for(i = progresslen; i > 0; --i) { if(chomp) { if(i > progresslen - hash) { diff -Naurp pacman-lib.orig/src/pacman/list.c pacman-lib.codecleanup/src/pacman/list.c --- pacman-lib.orig/src/pacman/list.c 2006-11-21 23:53:10.000000000 -0500 +++ pacman-lib.codecleanup/src/pacman/list.c 2007-01-17 11:47:30.000000000 -0500 @@ -28,9 +28,11 @@ #include "util.h" #include "list.h" +/* static function declarations */ static list_t *list_last(list_t *list); +static list_t *list_new(void); -list_t *list_new() +static list_t *list_new() { list_t *list = NULL; @@ -124,7 +126,7 @@ void list_display(const char *title, lis if(list) { for(lp = list, cols = len; lp; lp = lp->next) { - int s = strlen((char *)lp->data)+1; + unsigned int s = strlen((char *)lp->data)+1; unsigned int maxcols = getcols(); if(s+cols >= maxcols) { int i; @@ -143,6 +145,7 @@ void list_display(const char *title, lis } } +/* TODO list_display and pmlist_display are almost duplicate code */ void pmlist_display(const char *title, pmlist_t *list) { pmlist_t *lp; @@ -153,7 +156,7 @@ void pmlist_display(const char *title, p if(list) { for(lp = list, cols = len; lp; lp = alpm_list_next(lp)) { - int s = strlen(alpm_list_getdata(lp))+1; + unsigned int s = strlen(alpm_list_getdata(lp))+1; unsigned int maxcols = getcols(); if(s+cols >= maxcols) { int i; diff -Naurp pacman-lib.orig/src/pacman/list.h pacman-lib.codecleanup/src/pacman/list.h --- pacman-lib.orig/src/pacman/list.h 2006-11-20 04:10:25.000000000 -0500 +++ pacman-lib.codecleanup/src/pacman/list.h 2007-01-17 11:47:44.000000000 -0500 @@ -38,7 +38,6 @@ typedef struct __list_t { FREELIST(p); \ } while(0) -list_t *list_new(void); void list_free(list_t *list); list_t *list_add(list_t *list, void *data); int list_count(list_t *list); diff -Naurp pacman-lib.orig/src/pacman/log.c pacman-lib.codecleanup/src/pacman/log.c --- pacman-lib.orig/src/pacman/log.c 2006-12-22 02:11:20.000000000 -0500 +++ pacman-lib.codecleanup/src/pacman/log.c 2007-01-17 11:48:59.000000000 -0500 @@ -39,7 +39,7 @@ extern config_t *config; int neednl = 0; /* for cleaner message output */ -int needpad = 0; /* pad blanks to terminal width */ +static int needpad = 0; /* pad blanks to terminal width */ /* simple helper for needpad */ void set_output_padding(int on) @@ -131,8 +131,9 @@ void pm_fprintf(FILE *file, unsigned sho fprintf(file, str); if(needpad == 1) { + unsigned int i; unsigned int cols = getcols(); - for(int i=len; i < cols; ++i) { + for(i=len; i < cols; ++i) { fprintf(file, " "); } if(neednl == 1) { diff -Naurp pacman-lib.orig/src/pacman/package.c pacman-lib.codecleanup/src/pacman/package.c --- pacman-lib.orig/src/pacman/package.c 2007-01-17 01:07:16.000000000 -0500 +++ pacman-lib.codecleanup/src/pacman/package.c 2007-01-17 11:49:55.000000000 -0500 @@ -218,7 +218,7 @@ void dump_pkg_changelog(char *clfile, co { while(!feof(fp)) { - fgets(line, PATH_MAX, fp); + fgets(line, (int)PATH_MAX, fp); printf("%s", line); line[0] = '\0'; } diff -Naurp pacman-lib.orig/src/pacman/pacman.c pacman-lib.codecleanup/src/pacman/pacman.c --- pacman-lib.orig/src/pacman/pacman.c 2007-01-17 01:07:16.000000000 -0500 +++ pacman-lib.codecleanup/src/pacman/pacman.c 2007-01-17 11:53:56.000000000 -0500 @@ -72,15 +72,15 @@ enum { PM_OP_DEPTEST }; -config_t *config = NULL; +config_t *config; pmdb_t *db_local; /* list of (sync_t *) structs for sync locations */ -list_t *pmc_syncs = NULL; +list_t *pmc_syncs; /* list of targets specified on command line */ -list_t *pm_targets = NULL; +static list_t *pm_targets; -unsigned int maxcols = 80; +static unsigned int maxcols = 80; extern int neednl; @@ -134,8 +134,7 @@ static void usage(int op, char *myname) printf(_(" -l, --list list the contents of the queried package\n")); printf(_(" -m, --foreign list all packages that were not found in the sync db(s)\n")); printf(_(" -o, --owns <file> query the package that owns <file>\n")); - printf(_(" -p, --file pacman will query the package file [package] instead of\n")); - printf(_(" looking in the database\n")); + printf(_(" -p, --file query the package file [package] instead of the database\n")); printf(_(" -s, --search search locally-installed packages for matching strings\n")); } else if(op == PM_OP_SYNC) { printf(_("usage: %s {-S --sync} [options] [package]\n"), myname); @@ -278,7 +277,7 @@ static int parseargs(int argc, char *arg {0, 0, 0, 0} }; char root[PATH_MAX]; - struct stat st = {0}; + struct stat st; while((opt = getopt_long(argc, argv, "ARUFQSTDYr:b:vkhscVfmnoldepiuwyg", opts, &option_index))) { if(opt < 0) { @@ -325,7 +324,7 @@ static int parseargs(int argc, char *arg case 'b': if(stat(optarg, &st) == -1 || !S_ISDIR(st.st_mode)) { pm_fprintf(stderr, NL, _("error: '%s' is not a valid db path\n"), optarg); - exit(1); + exit(EXIT_FAILURE); } alpm_option_set_dbpath(optarg); config->dbpath = alpm_option_get_dbpath(optarg); @@ -481,7 +480,7 @@ int main(int argc, char *argv[]) } else { ERR(NL, _("you cannot perform this operation unless you are root.\n")); config_free(config); - exit(1); + exit(EXIT_FAILURE); } } } diff -Naurp pacman-lib.orig/src/pacman/sync.c pacman-lib.codecleanup/src/pacman/sync.c --- pacman-lib.orig/src/pacman/sync.c 2007-01-17 01:07:16.000000000 -0500 +++ pacman-lib.codecleanup/src/pacman/sync.c 2007-01-17 10:46:21.000000000 -0500 @@ -212,6 +212,8 @@ static int sync_synctree(int level, list if(ret < 0) { if(pm_errno == PM_ERR_DB_SYNC) { /* use libdownload error */ + /* TODO breaking abstraction barrier here? + * pacman -> libalpm -> libdownload */ ERR(NL, _("failed to synchronize %s: %s\n"), sync->treename, downloadLastErrString); } else { ERR(NL, _("failed to update %s (%s)\n"), sync->treename, alpm_strerror(pm_errno)); diff -Naurp pacman-lib.orig/src/pacman/trans.c pacman-lib.codecleanup/src/pacman/trans.c --- pacman-lib.orig/src/pacman/trans.c 2006-12-29 12:07:34.000000000 -0500 +++ pacman-lib.codecleanup/src/pacman/trans.c 2007-01-17 11:54:16.000000000 -0500 @@ -41,7 +41,7 @@ extern config_t *config; -int prevpercent=0; /* for less progressbar output */ +static int prevpercent=0; /* for less progressbar output */ /* Callback to handle transaction events */ diff -Naurp pacman-lib.orig/src/pacman/util.c pacman-lib.codecleanup/src/pacman/util.c --- pacman-lib.orig/src/pacman/util.c 2006-12-28 12:20:41.000000000 -0500 +++ pacman-lib.codecleanup/src/pacman/util.c 2007-01-17 11:58:14.000000000 -0500 @@ -30,7 +30,6 @@ #include "config.h" #include <stdio.h> #include <stdlib.h> -#include <stdarg.h> #include <string.h> #include <errno.h> #include <fcntl.h> @@ -52,7 +51,7 @@ extern config_t *config; extern int neednl; /* gets the current screen column width */ -int getcols() +unsigned int getcols() { if(!isatty(1)) { /* We will default to 80 columns if we're not a tty @@ -60,19 +59,21 @@ int getcols() */ return 80; } + else { /* adding else so splint can parse */ #ifdef TIOCGSIZE - struct ttysize win; - if(ioctl(1, TIOCGSIZE, &win) == 0) { - return win.ts_cols; - } + struct ttysize win; + if(ioctl(1, TIOCGSIZE, &win) == 0) { + return win.ts_cols; + } #elif defined(TIOCGWINSZ) - struct winsize win; - if(ioctl(1, TIOCGWINSZ, &win) == 0) { - return win.ws_col; - } + struct winsize win; + if(ioctl(1, TIOCGWINSZ, &win) == 0) { + return win.ws_col; + } #endif - else { - return -1; + else { + return -1; + } } /* Original envvar way - prone to display issues const char *cenv = getenv("COLUMNS"); @@ -155,15 +156,14 @@ int rmrf(char *path) } return(errflag); } - return(0); } /* output a string, but wrap words properly with a specified indentation */ -void indentprint(const char *str, int indent) +void indentprint(const char *str, unsigned int indent) { const char *p = str; - int cidx = indent; + unsigned int cidx = indent; while(*p) { if(*p == ' ') { @@ -178,7 +178,7 @@ void indentprint(const char *str, int in len = next - p; if(len > (getcols()-cidx-1)) { /* newline */ - int i; + unsigned int i; fprintf(stdout, "\n"); for(i = 0; i < indent; i++) { fprintf(stdout, " "); @@ -200,7 +200,7 @@ void indentprint(const char *str, int in char *buildstring(list_t *strlist) { char *str; - int size = 1; + size_t size = 1; list_t *lp; for(lp = strlist; lp; lp = lp->next) { @@ -208,7 +208,7 @@ char *buildstring(list_t *strlist) } str = (char *)malloc(size); if(str == NULL) { - ERR(NL, _("failed to allocated %d bytes\n"), size); + ERR(NL, _("failed to allocate %d bytes\n"), size); } str[0] = '\0'; for(lp = strlist; lp; lp = lp->next) { diff -Naurp pacman-lib.orig/src/pacman/util.h pacman-lib.codecleanup/src/pacman/util.h --- pacman-lib.orig/src/pacman/util.h 2006-11-20 04:10:25.000000000 -0500 +++ pacman-lib.codecleanup/src/pacman/util.h 2007-01-17 11:58:57.000000000 -0500 @@ -28,7 +28,7 @@ p = malloc(b); \ if (!(p)) { \ fprintf(stderr, "malloc failure: could not allocate %d bytes\n", (int)b); \ - exit(1); \ + exit(EXIT_FAILURE); \ } \ } else { \ p = NULL; \ @@ -43,10 +43,10 @@ } while(0) #define _(str) gettext(str) -int getcols(); +unsigned int getcols(); int makepath(char *path); int rmrf(char *path); -void indentprint(const char *str, int indent); +void indentprint(const char *str, unsigned int indent); char *buildstring(list_t *strlist); char *strtoupper(char *str); char *strtrim(char *str);

4 5

[pacman-dev] proposition: alpm_list type
by Aaron Griffin 19 Jan '07

19 Jan '07

Currently the "alpm_list" type is considered fairly "private", hiding (through the use of the _ prefix) a handful of useful routines. I suggest this interface be exposed in full. This will allow us to remove the 'list' type from pacman's source and just reuse alpm_list. Somewhere in the design docs it says "ALPM shouldn't force the use of a given list type". It doesn't, and still won't. Functions which return an alpm_list now still need the accessors to get at the list, and still must be copied into a custom list type. In fact, alpm _requires_ a custom list. Does anyone have any issues with this?

4 6

[pacman-dev] Fun little bug- pacman3 fails to remove flex and words packages correctly
by Dan McGee 18 Jan '07

18 Jan '07

Steps to reproduce: 1. Ensure current/flex and extra/words packages are not installed on system. 2. Install packages with either pacman2 or pacman3 using -S operation. 3. Attempt to remove packages with pacman3. The following errors occur: $ sudo pacman3 -S flex words resolving dependencies... done. looking for inter-conflicts... done. Targets: flex-2.5.33-1 words-1.0-4 Total Package Size: 5.0 MB Proceed with installation? [Y/n] y checking package integrity... done. checking for file conflicts (2/2) [#######################] 100% (1/2) installing flex [#######################] 100% (2/2) installing words [#######################] 100% ==> Determining which 'words' file to use in /usr/share/dict ==> Setting 'words' link to /usr/share/dict/usa $ sudo pacman3 -R flex words checking dependencies... done. error: cannot remove file usr/share/dict/words error: cannot remove file usr/share/dict/usa error: cannot remove file usr/share/dict/spanish error: cannot remove file usr/share/dict/ngerman error: cannot remove file usr/share/dict/italian error: cannot remove file usr/share/dict/german error: cannot remove file usr/share/dict/french error: cannot remove file usr/share/dict/finnish error: cannot remove file usr/share/dict/catalan error: cannot remove file usr/share/dict/british (1/2) removing words [#######################] 100% error: cannot remove file usr/share/locale/zh_CN/LC_MESSAGES/flex.mo error: cannot remove file usr/share/locale/vi/LC_MESSAGES/flex.mo error: cannot remove file usr/share/locale/tr/LC_MESSAGES/flex.mo error: cannot remove file usr/share/locale/sv/LC_MESSAGES/flex.mo error: cannot remove file usr/share/locale/ru/LC_MESSAGES/flex.mo error: cannot remove file usr/share/locale/ro/LC_MESSAGES/flex.mo error: cannot remove file usr/share/locale/pt_BR/LC_MESSAGES/flex.mo error: cannot remove file usr/share/locale/pl/LC_MESSAGES/flex.mo error: cannot remove file usr/share/locale/nl/LC_MESSAGES/flex.mo error: cannot remove file usr/share/locale/ko/LC_MESSAGES/flex.mo error: cannot remove file usr/share/locale/ga/LC_MESSAGES/flex.mo error: cannot remove file usr/share/locale/fr/LC_MESSAGES/flex.mo error: cannot remove file usr/share/locale/es/LC_MESSAGES/flex.mo error: cannot remove file usr/share/locale/de/LC_MESSAGES/flex.mo error: cannot remove file usr/share/locale/da/LC_MESSAGES/flex.mo error: cannot remove file usr/share/locale/ca/LC_MESSAGES/flex.mo error: cannot remove file usr/man/man1/flex.1.gz error: cannot remove file usr/lib/libfl.a error: cannot remove file usr/include/FlexLexer.h error: cannot remove file usr/bin/lex error: cannot remove file usr/bin/flex (2/2) removing flex [#######################] 100% 4. Pacman2 can remove the packages correctly without error. $ sudo pacman -S flex words Targets: flex-2.5.33-1 words-1.0-4 Total Package Size: 5.0 MB Proceed with upgrade? [Y/n] y checking package integrity... done. loading package data... done. checking for file conflicts... done. installing flex... done. installing words... done. ==> Determining which 'words' file to use in /usr/share/dict ==> Setting 'words' link to /usr/share/dict/usa $ sudo pacman -R flex words removing words... done. removing flex... done. If you want verbose or debug output, let me know. Dan

2 9

[pacman-dev] CVS update of pacman-lib (TODO.aaron)
by Aaron Griffin 18 Jan '07

18 Jan '07

Date: Thursday, January 18, 2007 @ 15:58:03 Author: aaron Path: /home/cvs-pacman/pacman-lib Modified: TODO.aaron (1.7 -> 1.8) Blah blah commit message for testing cvslog -> email ------------+ TODO.aaron | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: pacman-lib/TODO.aaron diff -u pacman-lib/TODO.aaron:1.7 pacman-lib/TODO.aaron:1.8 --- pacman-lib/TODO.aaron:1.7 Thu Jan 18 15:46:41 2007 +++ pacman-lib/TODO.aaron Thu Jan 18 15:58:03 2007 @@ -1,6 +1,6 @@ == This is my custom TODO file == -This test should shoot a commit email to the pacman-dev list. +This (second) test should shoot a commit email to the pacman-dev list. * pacman: ALOT of functions are way too long. There should be an upper limit of 100-200 lines. _alpm_add_commit is around 600 lines, and is far too complex.

1 0

[pacman-dev] Fwd: CVS update of pacman-lib/lib/libalpm (remove.c)
by Aaron Griffin 18 Jan '07

18 Jan '07

I just wanted to run this by anyone interested. Below is what I've been using for CVS commits, sent only to myself for the time being. Is including the full diff output a good idea, or over the top? Let me know.. ---------- Forwarded message ---------- From: Aaron Griffin <aaron(a)archlinux.org> Date: Jan 18, 2007 11:04 AM Subject: CVS update of pacman-lib/lib/libalpm (remove.c) To: aaronmgriffin(a)gmail.com Date: Thursday, January 18, 2007 @ 12:04:25 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: remove.c (1.54 -> 1.55) Some confusion with variable names in unlink_file caused unlink to try and find the _relative_ file instead of absolute. The absolute path name has also been used in some of the output there too. ----------+ remove.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) Index: pacman-lib/lib/libalpm/remove.c diff -u pacman-lib/lib/libalpm/remove.c:1.54 pacman-lib/lib/libalpm/remove.c:1.55 --- pacman-lib/lib/libalpm/remove.c:1.54 Thu Jan 18 11:04:05 2007 +++ pacman-lib/lib/libalpm/remove.c Thu Jan 18 12:04:25 2007 @@ -168,7 +168,7 @@ double percent = 0.0; char *file = lp->data; char line[PATH_MAX+1]; - char *checksum = _alpm_needbackup(file, info->backup); + char *checksum = _alpm_needbackup(lp->data, info->backup); if ( *position != 0 ) { percent = (double)*position / filenum; @@ -183,15 +183,15 @@ } snprintf(line, PATH_MAX, "%s%s", handle->root, file); if ( lstat(line, &buf) ) { - _alpm_log(PM_LOG_DEBUG, _("file %s does not exist"), file); + _alpm_log(PM_LOG_DEBUG, _("file %s does not exist"), line); return; } if ( S_ISDIR(buf.st_mode) ) { if ( rmdir(line) ) { /* this is okay, other pakcages are probably using it (like /usr) */ - _alpm_log(PM_LOG_DEBUG, _("keeping directory %s"), file); + _alpm_log(PM_LOG_DEBUG, _("keeping directory %s"), line); } else { - _alpm_log(PM_LOG_DEBUG, _("removing directory %s"), file); + _alpm_log(PM_LOG_DEBUG, _("removing directory %s"), line); } } else { /* check the "skip list" before removing the file. @@ -206,7 +206,7 @@ } if ( skipit ) { _alpm_log(PM_LOG_FLOW2, _("skipping removal of %s as it has moved to another package"), - file); + line); } else { /* if the file is flagged, back it up to .pacsave */ if ( nb ) { @@ -217,16 +217,16 @@ char newpath[PATH_MAX]; snprintf(newpath, PATH_MAX, "%s.pacsave", line); rename(line, newpath); - _alpm_log(PM_LOG_WARNING, _("%s saved as %s"), file); + _alpm_log(PM_LOG_WARNING, _("%s saved as %s"), line, newpath); } } } else { - _alpm_log(PM_LOG_FLOW2, _("unlinking %s"), file); + _alpm_log(PM_LOG_FLOW2, _("unlinking %s"), line); int list_count = _alpm_list_count(trans->packages); /* this way we don't have to call _alpm_list_count twice during PROGRESS */ PROGRESS(trans, PM_TRANS_PROGRESS_REMOVE_START, info->name, (double)(percent * 100), list_count, (list_count - _alpm_list_count(targ) + 1)); ++(*position); } - if (unlink(file) == -1) { + if (unlink(line) == -1) { _alpm_log(PM_LOG_ERROR, _("cannot remove file %s: %s"), file, strerror(errno)); } }

4 9

[pacman-dev] [patch] add.c: warning: dereferencing type-punned pointer will break strict-aliasing rules
by Dan McGee 18 Jan '07

18 Jan '07

CC lib/libalpm/add.c cc1: warnings being treated as errors lib/libalpm/add.c: In function '_alpm_add_prepare': lib/libalpm/add.c:257: warning: dereferencing type-punned pointer will break strict-aliasing rules make: *** [lib/libalpm/add.o] Error 1 I think it might only happen if -std=c99 is not on the command line, but it seems like an easy fix to me. Let me know if this doesn't seem right. Signed-off-by: Dan McGee <dpmcgee(a)gmail.com> diff -aurp pacman-lib.orig/lib/libalpm/add.c pacman-lib.newmake/lib/libalpm/add.c --- pacman-lib.orig/lib/libalpm/add.c 2007-01-03 03:05:13.000000000 -0500 +++ pacman-lib.newmake/lib/libalpm/add.c 2007-01-17 22:51:41.000000000 -0500 @@ -253,9 +253,9 @@ int _alpm_add_prepare(pmtrans_t *trans, /* Attempt to resolve conflicts */ QUESTION(trans, PM_TRANS_CONV_CONFLICT_PKG, miss->target, miss->depend.name, NULL, &skip_this); if(skip_this) { - pmpkg_t *pkg = NULL; - lp = _alpm_list_remove(lp, (void *)miss->depend.name, name_cmp, (void **)&pkg); - FREEPKG(pkg); + pmpkg_t **pkg = NULL; + lp = _alpm_list_remove(lp, (void *)miss->depend.name, name_cmp, (void **)pkg); + FREEPKG(*pkg); } } if(lp != NULL) {

2 1

[pacman-dev] Possible start to a new make system
by Dan McGee 18 Jan '07

18 Jan '07

My little project for the night, and I wanted to get better with makefiles anyway. I basically copied the code directory, removed anything that started with Make or ended in .am, and dumped all the configure stuff. I used your suggestion yesterday of looking at the wmii Makefile, Aaron, and it is pretty similar. The biggest issues were the fact that we are building libraries, and we are working out of multiple subdirectories. Current status of this will hopefully build libalpm and pacman successfully. I haven't done anything for the scripts, etc, yet, but that shouldn't be hard to add. The biggest point of this was just to see if it could be done. There are currently three files involved in the build process now, all in the root of the project: Makefile, config.mk, and config.h. I didn't want to destroy the code by removing config.h, so I pretty much just ran a configure, kept config.h, and put it in the directory. Let me know what you guys think. 3 files inlined here. Obviously still a lot of work to do, but this is my start. -Dan Makefile: # Pacman 3 Package Manager # Makefile written by Dan McGee, (C) 2006 # Ideas from wmii makefile, http://wmii.suckless.org/ PACVER = 3.0.0 ALPMVER = 0.1.0 # Install/System paths DESTDIR = prefix = /usr/local exec_prefix = /usr/local BINDIR = ${exec_prefix}/bin MANDIR = ${prefix}/man include config.mk # Project directory paths TOPDIR = . PACSRCDIR = $(TOPDIR)/src/pacman/ LIBSRCDIR = $(TOPDIR)/lib/libalpm/ MANSRC = $(TOPDIR)/doc/ SCRDIR = $(TOPDIR)/scripts/ CFLAGS += -I. -Ilib/libalpm -D_GNU_SOURCE -DVERSION=\"${VERSION}\" LDFLAGS += -L/usr/lib -ldownload -larchive -lm -lmcheck -lz -lbz2 -lattr -lacl PACSRC = $(PACSRCDIR)add.c $(PACSRCDIR)conf.c $(PACSRCDIR)deptest.c \ $(PACSRCDIR)downloadprog.c $(PACSRCDIR)list.c $(PACSRCDIR)log.c \ $(PACSRCDIR)package.c $(PACSRCDIR)pacman.c $(PACSRCDIR)query.c \ $(PACSRCDIR)remove.c $(PACSRCDIR)sync.c $(PACSRCDIR)trans.c \ $(PACSRCDIR)upgrade.c $(PACSRCDIR)util.c PACOBJ = ${PACSRC:.c=.o} LIBSRC = $(LIBSRCDIR)add.c $(LIBSRCDIR)alpm.c $(LIBSRCDIR)backup.c \ $(LIBSRCDIR)be_files.c $(LIBSRCDIR)cache.c $(LIBSRCDIR)conflict.c \ $(LIBSRCDIR)db.c $(LIBSRCDIR)deps.c $(LIBSRCDIR)error.c \ $(LIBSRCDIR)group.c $(LIBSRCDIR)handle.c $(LIBSRCDIR)list.c \ $(LIBSRCDIR)log.c $(LIBSRCDIR)md5.c $(LIBSRCDIR)md5driver.c \ $(LIBSRCDIR)package.c $(LIBSRCDIR)provide.c $(LIBSRCDIR)remove.c \ $(LIBSRCDIR)server.c $(LIBSRCDIR)sha1.c $(LIBSRCDIR)sync.c \ $(LIBSRCDIR)trans.c $(LIBSRCDIR)util.c $(LIBSRCDIR)versioncmp.c LIBOBJ = ${LIBSRC:.c=.o} all: options libalpm pacman vercmp alpmdoc pacmandoc options: @echo "Pacman Build Options:" @echo "CC = ${CC}" @echo "CFLAGS = ${CFLAGS}" @echo "LD = ${LD}" @echo "LDFLAGS = ${LDFLAGS}" @echo "AR = ${AR}" @echo # put @ sign back in front of lines to be silent ${PACOBJ}: config.h config.mk @echo CC $*.c @${CC} -c ${CFLAGS} -o $*.o $*.c ${LIBOBJ}: config.h config.mk @echo CC $*.c @${CC} -fPIC -c ${CFLAGS} -o $*.o $*.c libalpm: ${LIBOBJ} @echo AR $@ @${AR} rcs $@.a ${LIBOBJ} @echo LD $@ @${LD} -shared -Wl,-soname,libalpm.so.0 -o $@.so.${ALPMVER} ${LIBOBJ} ${LDFLAGS} pacman: libalpm ${PACOBJ} @echo LD $@ @${LD} -o $@ ${PACOBJ} -L. -lalpm ${LDFLAGS} @echo LD $@.static @${LD} -o $@.static ${PACOBJ} -static -L. -lalpm ${LDFLAGS} clean: @echo "Cleaning..." @rm -f ${PACOBJ} ${LIBOBJ} @rm -f libalpm.a libalpm.so.${ALPMVER} pacman pacman.static dist: clean @echo "Creating tarball for version ${VERSION}..." mkdir -p pacman-${VERSION} # cp -R AUTHORS COPYING NEWS README tar -cf pacman-${VERSION}.tar pacman-${VERSION} gzip pacman-${VERSION}.tar rm -rf pacman-${VERSION} .PHONY: clean # End of file config.mk: # Customize below to fit your system # paths PREFIX = /usr/local CONFPREFIX = ${PREFIX}/etc MANPREFIX = ${PREFIX}/share/man # includes and libs INCS = -I${PREFIX}/include LIBS = -L${PREFIX}/lib # flags CFLAGS = -O2 -Wall -Werror -std=c99 -g ${INCS} -DPACMAN_DEBUG -D'PACCONF="/etc/pacman.conf"' LDFLAGS = ${LIBS} # compiler and linker CC = ccache cc LD = ${CC} config.h: /* config.h. */ /* This file originally generated using configure, but that got confusing. * configure could be used for just this and not the build, and it would * not be a bad idea. */ /* Architecture */ #define CARCH "i686" /* Architecture */ #define CARCHFLAGS "i686" /* Define to 1 if translation of program messages to the user's native language is requested. */ #define ENABLE_NLS 1 #define HAS_DOXYGEN TRUE #define HAS_JAVA TRUE #define HAS_MAN2HTML FALSE #define HAS_PERL TRUE #define HAS_PO4A TRUE #define HAS_PYTHON TRUE /* Architecture */ #define MARCHFLAG "march" /* Name of package */ #define PACKAGE "pacman" /* Define to the address where bug reports for this package should be sent. */ #define PACKAGE_BUGREPORT "pacman-dev(a)archlinux.org" /* Define to the full name of this package. */ #define PACKAGE_NAME "Pacman package manager" /* Define to the full name and version of this package. */ #define PACKAGE_STRING "Pacman package manager 3.0.0" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "pacman" /* Define to the version of this package. */ #define PACKAGE_VERSION "3.0.0" /* libalpm version number */ #define PM_VERSION "0.1.0" /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 #define HAVE_STRVERSCMP

1 0

[pacman-dev] [PATCH] removedeps refactoring in makepkg and bug #6215 fix
by Roman Kyrylych 17 Jan '07

17 Jan '07

Hi! I had some time today and decided to fix bug that was reported by myself. :-) While fixing it I also moved duplicate code into removedeps function. Here is the patch: ---[ cut here ]--- --- makepkg3.orig 2007-01-03 22:12:07.000000000 +0200 +++ makepkg3 2007-01-14 16:53:39.000000000 +0200 @@ -255,6 +255,25 @@ return $missingdeps } +removedeps() { + if [ "$RMDEPS" = "1" -a "$EUID" = "0" -a "$INFAKEROOT" != "1" -a $ ! -z "$deplist" -o ! -z "$makedeplist" $ ]; then + msg "Removing installed dependencies..." + pacman3 $PACMAN_OPTS -R $makedeplist $deplist + # fixes bug #6215 + elif [ "$RMDEPS" = "1" -a "$DEP_SUDO" = "1" -a $ ! -z "$deplist" -o ! -z "$makedeplist" $ ]; then + msg "Removing installed dependencies..." + if [ "$INFAKEROOT" = "1" ]; then + export FAKEROOTKEY2=$FAKEROOTKEY + unset $FAKEROOTKEY + fi + sudo pacman3 $PACMAN_OPTS -R $makedeplist $deplist + if [ "$INFAKEROOT" = "1" ]; then + export FAKEROOTKEY=$FAKEROOTKEY2 + unset $FAKEROOTKEY2 + fi + fi +} + usage() { echo "makepkg version $myver" echo @@ -752,21 +771,7 @@ if [ ${PIPESTATUS[0]} -gt 0 ]; then error "Build Failed. Aborting..." # fix flyspray bug #5923 - if [ "$RMDEPS" = "1" -a "$EUID" = "0" -a "$INFAKEROOT" != "1" -a $ ! -z "$deplist" -o ! -z "$makedeplist" $ ]; then - msg "Removing installed dependencies..." - pacman3 $PACMAN_OPTS -R $makedeplist $deplist - elif [ "$RMDEPS" = "1" -a "$DEP_SUDO" = "1" ]; then - msg "Removing installed dependencies..." - if [ "$INFAKEROOT" = "1" ]; then - export FAKEROOTKEY2=$FAKEROOTKEY - unset $FAKEROOTKEY - fi - sudo pacman3 $PACMAN_OPTS -R $makedeplist $deplist - if [ "$INFAKEROOT" = "1" ]; then - export FAKEROOTKEY=$FAKEROOTKEY2 - unset $FAKEROOTKEY2 - fi - fi + removedeps exit 2 fi else @@ -777,21 +782,7 @@ if [ $? -gt 0 ]; then error "Build Failed. Aborting..." # fix flyspray bug #5923 - if [ "$RMDEPS" = "1" -a "$EUID" = "0" -a "$INFAKEROOT" != "1" -a $ ! -z "$deplist" -o ! -z "$makedeplist" $ ]; then - msg "Removing installed dependencies..." - pacman3 $PACMAN_OPTS -R $makedeplist $deplist - elif [ "$RMDEPS" = "1" -a "$DEP_SUDO" = "1" ]; then - msg "Removing installed dependencies..." - if [ "$INFAKEROOT" = "1" ]; then - export FAKEROOTKEY2=$FAKEROOTKEY - unset $FAKEROOTKEY - fi - sudo pacman3 $PACMAN_OPTS -R $makedeplist $deplist - if [ "$INFAKEROOT" = "1" ]; then - export FAKEROOTKEY=$FAKEROOTKEY2 - unset $FAKEROOTKEY2 - fi - fi + removedeps exit 2 fi fi @@ -932,21 +923,7 @@ rm -rf ${pkgname}-${pkgver}-${pkgrel}-${CARCH}.log* fi -if [ "$RMDEPS" = "1" -a "$EUID" = "0" -a "$INFAKEROOT" != "1" -a $ ! -z "$deplist" -o ! -z "$makedeplist" $ ]; then - msg "Removing installed dependencies..." - pacman3 $PACMAN_OPTS -R $makedeplist $deplist -elif [ "$RMDEPS" = "1" -a "$DEP_SUDO" = "1" ]; then - msg "Removing installed dependencies..." - if [ "$INFAKEROOT" = "1" ]; then - FAKEROOTKEY2=$FAKEROOTKEY - unset FAKEROOTKEY - fi - sudo pacman3 $PACMAN_OPTS -R $makedeplist $deplist - if [ "$INFAKEROOT" = "1" ]; then - export FAKEROOTKEY=$FAKEROOTKEY2 - unset FAKEROOTKEY2 - fi -fi +removedeps msg "Finished making: $pkgname ($(date))" ---[ cut here ]--- -- Roman Kyrylych (Роман Кирилич)

3 4

[pacman-dev] [patch] Fix -Qii support and output, some refactoring
by Dan McGee 17 Jan '07

17 Jan '07

Libification added a regression on multiple 'i' support for a query; this option allows additional information to be printed about the backup files. While fixing, noticed the previous hack-up with SHA1 addition didn't work as expected because it had probably never been tested, so also refactored this whole section into a new function and fixed existing problems. Finally, a few formatting changes in pacman.c for clarity. -Dan --- diff -upr pacman-lib.orig/src/pacman/package.c pacman-lib/src/pacman/package.c --- pacman-lib.orig/src/pacman/package.c 2006-11-22 04:03:42.000000000 -0500 +++ pacman-lib/src/pacman/package.c 2007-01-07 20:51:18.000000000 -0500 @@ -37,92 +37,61 @@ */ void dump_pkg_full(pmpkg_t *pkg, int level) { - const char *date, *type; + const char *bdate, *type, *idate, *reason; if(pkg == NULL) { return; } - printf(_("Name : %s\n"), (char *)alpm_pkg_get_name(pkg)); - printf(_("Version : %s\n"), (char *)alpm_pkg_get_version(pkg)); - - pmlist_display(_("Groups :"), alpm_pkg_get_groups(pkg)); - - printf(_("Packager : %s\n"), (char *)alpm_pkg_get_packager(pkg)); - printf("URL : %s\n", (char *)alpm_pkg_get_url(pkg)); - pmlist_display(_("License :"), alpm_pkg_get_licenses(pkg)); - printf(_("Architecture : %s\n"), (char *)alpm_pkg_get_arch(pkg)); - printf(_("Size : %ld\n"), (long int)alpm_pkg_get_size(pkg)); - - date = alpm_pkg_get_builddate(pkg); - printf(_("Build Date : %s %s\n"), date, strlen(date) ? "UTC" : ""); + /* set variables here, do all output below */ + bdate = alpm_pkg_get_builddate(pkg); type = alpm_pkg_get_buildtype(pkg); - printf(_("Build Type : %s\n"), strlen(type) ? type : _("Unknown")); - date = alpm_pkg_get_installdate(pkg); - printf(_("Install Date : %s %s\n"), date, strlen(date) ? "UTC" : ""); + idate = alpm_pkg_get_installdate(pkg); - printf(_("Install Script : %s\n"), alpm_pkg_has_scriptlet(pkg) ? _("Yes") : _("No")); - - printf(_("Reason : ")); switch((long)alpm_pkg_get_reason(pkg)) { case PM_PKG_REASON_EXPLICIT: - printf(_("Explicitly installed\n")); + reason = "Explicitly installed"; break; case PM_PKG_REASON_DEPEND: - printf(_("Installed as a dependency for another package\n")); + reason = "Installed as a dependency for another package"; break; default: - printf(_("Unknown\n")); + reason = "Unknown"; break; } + /* actual output */ + printf(_("Name : %s\n"), (char *)alpm_pkg_get_name(pkg)); + printf(_("Version : %s\n"), (char *)alpm_pkg_get_version(pkg)); + pmlist_display(_("Groups :"), alpm_pkg_get_groups(pkg)); + printf(_("Packager : %s\n"), (char *)alpm_pkg_get_packager(pkg)); + printf(_("URL : %s\n"), (char *)alpm_pkg_get_url(pkg)); + pmlist_display(_("License :"), alpm_pkg_get_licenses(pkg)); + printf(_("Architecture : %s\n"), (char *)alpm_pkg_get_arch(pkg)); + printf(_("Installed Size : %ld\n"), (long int)alpm_pkg_get_size(pkg)); + printf(_("Build Date : %s %s\n"), bdate, strlen(bdate) ? "UTC" : ""); + printf(_("Build Type : %s\n"), strlen(type) ? type : _("Unknown")); + /* TODO only applicable if querying installed package, not a file */ + printf(_("Install Date : %s %s\n"), idate, strlen(idate) ? "UTC" : ""); + printf(_("Install Script : %s\n"), alpm_pkg_has_scriptlet(pkg) ? _("Yes") : _("No")); + printf(_("Reason : %s\n"), reason); pmlist_display(_("Provides :"), alpm_pkg_get_provides(pkg)); pmlist_display(_("Depends On :"), alpm_pkg_get_depends(pkg)); pmlist_display(_("Removes :"), alpm_pkg_get_removes(pkg)); + /* TODO only applicable if querying installed package, not a file */ pmlist_display(_("Required By :"), alpm_pkg_get_requiredby(pkg)); pmlist_display(_("Conflicts With :"), alpm_pkg_get_conflicts(pkg)); - + printf(_("Description : ")); indentprint(alpm_pkg_get_desc(pkg), 17); printf("\n"); + /* Print additional package info if info flag passed more than once */ + /* TODO only applicable if querying installed package, not a file */ if(level > 1) { - pmlist_t *i; - const char *root = alpm_option_get_root(); - fprintf(stdout, "\n"); - for(i = alpm_list_first(alpm_pkg_get_backup(pkg)); i; i = alpm_list_next(i)) { - struct stat buf; - char path[PATH_MAX]; - char *str = strdup(alpm_list_getdata(i)); - char *ptr = index(str, '\t'); - if(ptr == NULL) { - FREE(str); - continue; - } - *ptr = '\0'; - ptr++; - snprintf(path, PATH_MAX-1, "%s%s", root, str); - if(!stat(path, &buf)) { - char *md5sum = alpm_get_md5sum(path); - char *sha1sum = alpm_get_sha1sum(path); - if(md5sum == NULL && sha1sum == NULL) { - ERR(NL, _("error calculating md5sum or sha1sum for %s\n"), path); - FREE(str); - continue; - } - if (!sha1sum) - printf(_("%sMODIFIED\t%s\n"), strcmp(md5sum, ptr) ? "" : _("NOT "), path); - if (!md5sum) - printf(_("%sMODIFIED\t%s\n"), strcmp(sha1sum, ptr) ? "" : _("NOT "), path); - FREE(md5sum); - FREE(sha1sum); - } else { - printf(_("MISSING\t\t%s\n"), path); - } - FREE(str); - } + /* call new backup function */ + dump_pkg_backups(pkg); } - printf("\n"); } @@ -130,38 +99,93 @@ void dump_pkg_full(pmpkg_t *pkg, int lev */ void dump_pkg_sync(pmpkg_t *pkg, char *treename) { - char *sum; + char *md5sum, *sha1sum; if(pkg == NULL) { return; } - printf(_("Repository : %s\n"), treename); - printf(_("Name : %s\n"), (char *)alpm_pkg_get_name(pkg)); - printf(_("Version : %s\n"), (char *)alpm_pkg_get_version(pkg)); - - pmlist_display(_("Groups :"), alpm_pkg_get_groups(pkg)); - pmlist_display(_("Provides :"), alpm_pkg_get_provides(pkg)); - pmlist_display(_("Depends On :"), alpm_pkg_get_depends(pkg)); - pmlist_display(_("Removes :"), alpm_pkg_get_removes(pkg)); - pmlist_display(_("Conflicts With :"), alpm_pkg_get_conflicts(pkg)); - pmlist_display(_("Replaces :"), alpm_pkg_get_replaces(pkg)); - - printf(_("Size (compressed) : %ld\n"), (long)alpm_pkg_get_size(pkg)); - printf(_("Size (installed) : %ld\n"), (long)alpm_pkg_get_isize(pkg)); - printf(_("Description : ")); - indentprint(alpm_pkg_get_desc(pkg), 20); - - sum = (char *)alpm_pkg_get_md5sum(pkg); - if (sum != NULL && sum[0] != '\0') { - printf(_("\nMD5 Sum : %s"), sum); - } - sum = (char *)alpm_pkg_get_sha1sum(pkg); - if (sum != NULL && sum[0] != '\0') { - printf(_("\nSHA1 Sum : %s"), sum); + md5sum = (char *)alpm_pkg_get_md5sum(pkg); + sha1sum = (char *)alpm_pkg_get_sha1sum(pkg); + + printf(_("Repository : %s\n"), treename); + printf(_("Name : %s\n"), (char *)alpm_pkg_get_name(pkg)); + printf(_("Version : %s\n"), (char *)alpm_pkg_get_version(pkg)); + pmlist_display(_("Groups :"), alpm_pkg_get_groups(pkg)); + pmlist_display(_("Provides :"), alpm_pkg_get_provides(pkg)); + pmlist_display(_("Depends On :"), alpm_pkg_get_depends(pkg)); + pmlist_display(_("Removes :"), alpm_pkg_get_removes(pkg)); + pmlist_display(_("Conflicts With :"), alpm_pkg_get_conflicts(pkg)); + pmlist_display(_("Replaces :"), alpm_pkg_get_replaces(pkg)); + printf(_("Download Size : %ld\n"), (long)alpm_pkg_get_size(pkg)); + printf(_("Installed Size : %ld\n"), (long)alpm_pkg_get_isize(pkg)); + + printf(_("Description : ")); + indentprint(alpm_pkg_get_desc(pkg), 17); + printf("\n"); + + if (md5sum != NULL && md5sum[0] != '\0') { + printf(_("MD5 Sum : %s"), md5sum); + } + if (sha1sum != NULL && sha1sum[0] != '\0') { + printf(_("SHA1 Sum : %s"), sha1sum); } printf("\n"); } +/* Display list of backup files and their modification states + */ +void dump_pkg_backups(pmpkg_t *pkg) +{ + pmlist_t *i; + const char *root = alpm_option_get_root(); + printf("\nBackup Files :\n"); + for(i = alpm_list_first(alpm_pkg_get_backup(pkg)); i; i = alpm_list_next(i)) { + struct stat buf; + char path[PATH_MAX]; + char *str = strdup(alpm_list_getdata(i)); + char *ptr = index(str, '\t'); + if(ptr == NULL) { + FREE(str); + continue; + } + *ptr = '\0'; + ptr++; + snprintf(path, PATH_MAX-1, "%s%s", root, str); + /* if we find the file, calculate checksums, otherwise it is missing */ + if(!stat(path, &buf)) { + char *sum; + char *md5sum = alpm_get_md5sum(path); + char *sha1sum = alpm_get_sha1sum(path); + + if(md5sum == NULL || sha1sum == NULL) { + ERR(NL, _("error calculating checksums for %s\n"), path); + FREE(str); + continue; + } + /* TODO Is this a good way to check type of backup stored? + * We aren't storing it anywhere in the database. */ + if (strlen(ptr) == 32) { + sum = md5sum; + } else { /*if (strlen(ptr) == 40) */ + sum = sha1sum; + } + /* if checksums don't match, file has been modified */ + if (strcmp(sum, ptr)) { + printf(_("MODIFIED\t%s\n"), path); + } else { + printf(_("Not Modified\t%s\n"), path); + } + FREE(md5sum); + FREE(sha1sum); + } else { + printf(_("MISSING\t\t%s\n"), path); + } + FREE(str); + } +} + +/* List all files contained in a package + */ void dump_pkg_files(pmpkg_t *pkg) { const char *pkgname; @@ -202,6 +226,10 @@ void dump_pkg_changelog(char *clfile, co } } +/* splits package name into its respective parts + */ +/* TODO this is only used in sync.c by sync_cleancache, should it be a static + * function in there instead of global here? */ int split_pkgname(char *target, char *name, char *version) { char tmp[512]; diff -upr pacman-lib.orig/src/pacman/package.h pacman-lib/src/pacman/package.h --- pacman-lib.orig/src/pacman/package.h 2006-11-20 04:10:25.000000000 -0500 +++ pacman-lib/src/pacman/package.h 2007-01-07 17:26:34.000000000 -0500 @@ -24,6 +24,7 @@ void dump_pkg_full(pmpkg_t *pkg, int level); void dump_pkg_sync(pmpkg_t *pkg, char *treename); +void dump_pkg_backups(pmpkg_t *pkg); void dump_pkg_files(pmpkg_t *pkg); void dump_pkg_changelog(char *clfile, const char *pkgname); diff -upr pacman-lib.orig/src/pacman/pacman.c pacman-lib/src/pacman/pacman.c --- pacman-lib.orig/src/pacman/pacman.c 2006-12-14 00:23:08.000000000 -0500 +++ pacman-lib/src/pacman/pacman.c 2007-01-07 17:43:23.000000000 -0500 @@ -296,7 +296,7 @@ static int parseargs(int argc, char *arg #else config->configfile = strndup(optarg, PATH_MAX); #endif - break; + break; case 1002: config->op_s_ignore = list_add(config->op_s_ignore, strdup(optarg)); break; case 1003: config->debug = atoi(optarg); break; case 1004: config->noprogressbar = 1; break; @@ -307,11 +307,11 @@ static int parseargs(int argc, char *arg config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_DEPTEST); config->op_d_resolve = 1; config->flags |= PM_TRANS_FLAG_ALLDEPS; - break; + break; case 'F': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_UPGRADE); config->flags |= PM_TRANS_FLAG_FRESHEN; - break; + break; case 'Q': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_QUERY); break; case 'R': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_REMOVE); break; case 'S': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_SYNC); break; @@ -321,7 +321,7 @@ static int parseargs(int argc, char *arg case 'Y': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_DEPTEST); config->op_d_vertest = 1; - break; + break; case 'b': if(stat(optarg, &st) == -1 || !S_ISDIR(st.st_mode)) { pm_fprintf(stderr, NL, _("error: '%s' is not a valid db path\n"), optarg); @@ -329,21 +329,21 @@ static int parseargs(int argc, char *arg } alpm_option_set_dbpath(optarg); config->dbpath = alpm_option_get_dbpath(optarg); - break; + break; case 'c': - config->op_s_clean++; + (config->op_s_clean)++; config->flags |= PM_TRANS_FLAG_CASCADE; config->op_q_changelog = 1; - break; + break; case 'd': config->flags |= PM_TRANS_FLAG_NODEPS; break; - case 'e': config->op_q_orphans = 1; config->flags |= PM_TRANS_FLAG_DEPENDSONLY; break; + case 'e': + config->op_q_orphans = 1; + config->flags |= PM_TRANS_FLAG_DEPENDSONLY; + break; case 'f': config->flags |= PM_TRANS_FLAG_FORCE; break; - case 'g': config->group++; break; + case 'g': (config->group)++; break; case 'h': config->help = 1; break; - case 'i': - config->op_q_info++; - config->op_s_info++; - break; + case 'i': (config->op_q_info)++; (config->op_s_info)++; break; case 'k': config->flags |= PM_TRANS_FLAG_DBONLY; break; case 'l': config->op_q_list = 1; break; case 'm': config->op_q_foreign = 1; break; @@ -352,7 +352,7 @@ static int parseargs(int argc, char *arg case 'p': config->op_q_isfile = 1; config->flags |= PM_TRANS_FLAG_PRINTURIS; - break; + break; case 'r': printf("setting root path=%s\n", optarg); if(realpath(optarg, root) == NULL) { @@ -360,20 +360,20 @@ static int parseargs(int argc, char *arg return(1); } config->root = strdup(root); - break; + break; case 's': config->op_s_search = 1; config->op_q_search = 1; config->flags |= PM_TRANS_FLAG_RECURSE; - break; + break; case 'u': config->op_s_upgrade = 1; break; - case 'v': config->verbose++; break; + case 'v': (config->verbose)++; break; case 'w': config->op_s_downloadonly = 1; config->flags |= PM_TRANS_FLAG_DOWNLOADONLY; config->flags |= PM_TRANS_FLAG_NOCONFLICTS; - break; - case 'y': config->op_s_sync++; break; + break; + case 'y': (config->op_s_sync)++; break; case '?': return(1); default: return(1); }

2 3

[pacman-dev] _alpm_remove_commit refactoring
by James Rosten 17 Jan '07

17 Jan '07

This is my refactoring of _alpm_remove_commit in remove.c. In the process of refactoring I noticed somethings that I changed. For example the creation of char *md5 and *sha1 which were both _alpm_needbackup(file, info->backup), so I just made one char *md5_sha1 that is _alpm_needbackup(file, info->backup) because I'm pretty sure they are the same thing and after that they were only used once in an if statement to see if they were true or not. I also moved some variables that were only used in the for statement that unlinks the files but were declared outside of it. I also noticed that within the first for statement char pm_install[PATH_MAX] was declared, then later in that for statement it was declared again in an if statement, so I changed the second pm_install to pm_install2 (can't believe that got my the compiler). As usual the patch is below. ~ Jamie / yankees26 Signed-off-by: James Rosten <seinfeld90(a)gmail.com>

3 3

[pacman-dev] cvsignore request
by Dan McGee 17 Jan '07

17 Jan '07

Can the .cvsignore file from the doc/ directory get copied into doc/hu/ as well? And any other cvsignore touchups would be appreciated so when you have a built copy of pacman sitting around the update messages are not full of ? labeled entries. -Dan

2 2

[pacman-dev] [PATCH] _alpm_db_search-cleanup: remove needless regex compilation, string duplication and code cleanup
by Jürgen Hötzel 17 Jan '07

17 Jan '07

Hi, * avoid repeated regex compilations (regex for search string do not change while scanning the package database) * remove needless string duplication (regex function do not change target string nor free them) * code cleanup This patch improves search performance: bash-3.2$ time ./src/pacman/pacman.static.old -Ss "(database|web).*server" >/dev/null real 0m1.026s user 0m0.544s sys 0m0.208s bash-3.2$ time ./src/pacman/pacman.static -Ss "(database|web).*server" >/dev/null real 0m0.777s user 0m0.456s sys 0m0.128s bash-3.2$ Jürgen

2 1

[pacman-dev] rankmirrors script
by James Rosten 17 Jan '07

17 Jan '07

I have merged testing a single mirror into rankmirrors. Testing a mirror file is still the same usage. To test a mirror just do: rankmirrors -u ftp://archlinux.puzzle.ch/current/os/i686 or rankmirrors --url ftp://archlinux.puzzle.ch/current/os/i686 I also added a test to make sure the mirror filename provided actually exists. The patch is below. ~ Jamie / yankees26

2 1

[pacman-dev] script questions
by James Rosten 14 Jan '07

14 Jan '07

Just a few questions about some scripts. I noticed the aurbuild script (not the one written in python) in CVS isn't even included the pacman package, and if it was, it would probably never be used. So I am just kind of curious why it is there? Also, I was curious what the status of the addition for single url support ( http://archlinux.org/pipermail/pacman-dev/2006-December/000899.html ) patch is? And thanks for the add to the AUTHORS list Aaron. ~ Jamie / yankees26

1 0

[pacman-dev] [patch] Preliminary cleaning of NEWS file
by Dan McGee 12 Jan '07

12 Jan '07

Quick look through getting rid of bugfixes that occurred in never-released versions on the Arch side. Added a few TODO's. Signed-off-by: Dan McGee <dpmcgee(a)gmail.com> --- --- pacman-lib.orig/NEWS 2007-01-07 21:11:03.000000000 -0500 +++ pacman-lib/NEWS 2006-12-21 13:55:56.000000000 -0500 @@ -1,14 +1,13 @@ VERSION DESCRIPTION ----------------------------------------------------------------------------- +FUTURE - drop the NoUpgrade lines from the default config 3.0.0 - TODO this needs alot of work + *group translation/i18n stuff together + *remove anything that isn't applicable between unreleased versions - switched to libfetch in place of libftp - attempt to speed up file reading by reading /desc and /depends on demand - - bugfix for holdpkgs during an upgrade - - fix building with --enable-debug - fixed the download progressbar - - -Ss works again for multiple repos - - bugfix for -Sp - downloads are interruptable again - new libalpm function: alpm_db_search() - pactest: initial import, run make check to call it @@ -23,185 +22,67 @@ - makepkg: recoginze .TGZ, .ZIP and other uppercase extensions - python: added a few casting functions - ported libalpm to Solaris/Sparc - - bugfixes in the Hungarian translation - - bugfix for pacman -Qi -p - new function in libalpm: alpm_db_setserver() - incremented libalpm's sover due to new error codes intruduced by alpm_db_setserver() - added python bindings - - fixed a stale lockfile problem (when packages were corrupted) - fixed problem when sometimes ^C was ignored - new pacman option: --ask - libalpm: prefixed all internal functions with _alpm - makepkg: bugfix for suboptions=('nostrip') - - new package property: "build type" - it can be "chroot" or - custom - updated Hungarian translation - - the old extra repo is now merged to the frugalware one - handle the case properly when the user hits ^C during a package install - - fix the output of scriptlet messages - check if enough free space if available - - pipe and parse scriptlet messages. see man FrugalBuild - - new mirror: ftp10 - - udatesync: use bzip2 instead of gzip for package databases - - update/gensync: bugfix for the pkgdesc_localized directive - - Hungarian translation update - - fixed several compilation warning - ia64 support - - manpage split: moved the FrugalBuild specific part from - man makepkg to man FrugalBuild - - minor bugfixes in makepkg - gettext improvements - French translation - - makepkg support and documentation for pkgdesc localization - pacman: display uncompressed package size by default on upgrade - initial support for pkgdesc localization - - bugfix for -Qi and -Qm - - fix -Sg for multiple repos - - drop the NoUpgrade lines from the default config - - makepkg: when removing the pkg dir, remove the subpkgs' pkg - dir, too - - significant speedup while sorting dependencies with libalpm - fixes for pacman's -r option in pacman and libalpm - initial support for uncompressed package sizes in a sync repo - - minor fixes for de_DE, hu_HU and tr_TR - - seems that the original pacman3's release is delayed so it's - no good in waiting for it. changed the versioning scheme to - our usual x.y.z - - i18n fixes: - in the german translation - in makepkg - - gpg support in makepkg -2.8.99.28 - added gettext support + - added gettext support - added German and Hungarian translation for libalpm and pacman -2.9.99.27 - scripts: cleanup, they now require util.sh from FST - makepkg: handle spaces in source filenames - - makepkg: spelling fixes - - libalpm: fixed a few messages' verbosity level - - ./autogen.sh --dist now allows to build a snapshot fpm -2.9.99.26 - makepkg: new option -t (to be used with -R) - added i386, OpenBSD and OS X support - - updated mirror list - - spelling fixes - - bugfix in pacman (dbpath initialization) -2.9.99.25 - bugfix in the conflicts/provides handling code - - spelling fix in makepkg - - include the root string (ie. a slash) in file conflict error - messages - - gensync: bugfix for subpkgs -2.9.99.24 - fixed the location of the locally installed packages' - install/changelog file (so that pre/post_remove and -Qc works - perfectly again) - allow repo names to be longer than 128 chars - - fixed pacman -v output (not a bug just it was ugly) -2.9.99.23 - bugfix for -Sy - - gensync: ignore _darcs/ directories -2.9.99.22 - new feature: options=('scriptlet') to force executing the - install scriptlets even if one builds in a chroot - - makepkg -RC now uses the chroot's pacman.conf to determine - what packages need to be removed. this is especially useful - if you use unofficial repos only in chroot - the testsuite is replaced by pactest, see HACKING -2.9.99.21 - bugfix release -2.9.99.20 - handle --noprogress on install/upgrade, too + - handle --noprogress on install/upgrade, too - disable progressbar by default if the output is redirected - - offer deleting a packages if it is corrupted - - makepkg: install subpackages with -i, too - in chroot sync /etc/pacman.d/* from the host system - use the chroot's pacman.conf when it's available - - new pacman option: --noscriptlet for disabling install - scriptlets - - new variable in makepkg: $FCC in case the package would use - gcc directly (not from $PATH) -2.9.99.19 - more verbose error messages on corrupted packages - - makepkg: added support for clearing the cache of ccache - slice warnings for LANG!=C - - gen/updatesync: bugfix for subdescs() and subarchs() - no longer ignore the Finclude function call -2.9.99.18 - makepkg now allows to inherit install scriptlets from a - scheme + - more verbose error messages on corrupted packages - allow multiple packages to be installed at once with -U - - added SBU variable to makepkg.conf - - 3 major bugfixes from upstream -2.9.99.17 - support for having subpkgs in an other repo. this affects - gensync and updatesync, also makepkg's manpage is updated - support for handle version comparators in makepkg - - bugfix for Finclude in makepkg - removed exit() calls from libalpm - - bugfix for nobuild packages in sync -2.9.99.16 - fixed a possible infinite loop during -S - - remove stale lockfile when pacman is interrupted - - new directive: added suboptions() and subarchs() for - FrugalBuilds - - added 'nofakeroot' to options() - - new makepkg witch: -RCC, now -RC only cleans the chroot -2.9.99.15 - fix 'error: transaction already initialized' when using -D -2.9.99.14 - documentation: improved libalpm manpages an added a main + - documentation: improved libalpm manpages an added a main libalpm(3) manpage - - yet another bugfix for the install/upgrade progressbar - - remove stale lockfile after -R/-A - - fixed a segfault when removing a package that is reqired by - other packages -2.9.99.13 - Allow queries (-Q, -Si, etc) during an other pacman is - running (ie. -Syu) - - Two bugfixes in connection with provides - - Improved makepkg output for subpackages (crazy) -2.9.99.12 - fixed preparing docs, 2.9.99.11 always supposed we want to - disable that feature -2.9.99.11 - fixed progressbar when installing and upgrading packages at + - fixed progressbar when installing and upgrading packages at the same time - - in general, modified makeworld to work properly on Frugalware - - makepkg: if build fails, save the buildlog when using -R - sudo improvements for makepkg & makeworld - display "checking for conflicting files..." during -S - initial doxygen support -2.9.99.10 - fixed -Sg output - now frugalpkg works again - - fixed a double free() when installing conflicting packages - - fixed an annoying bug with progressbar, now works as it did - in the pacman 2.x times - don't care about a to-be-replaced package's newer version -2.9.99.9 - fixed -S/-U/-A segfault. hopefully not everybody upgraded - yet... -2.9.99.8 - if you have foo installed, and bar replaces + provides foo, + - if you have foo installed, and bar replaces + provides foo, then remove foo, and install bar (now works again) - upgrade only pacman first during a -Su - - removed duplicated error messages - more verbose error message for conflicting files when using -S -2.9.99.7 - bugfix for -Sg - if pacman can't create its cachedir, then use /tmp (bugfix) -2.9.99.6 - bugfix for -Rs - - pre_install/pre_upgrade scripts are working again - - added a -f option to gensync/updatesync (don't die if the fpm - is missing) - - bugfix for --ignore - added ppc support (to configure) - handle broken databases (just print an error message, don't segfault) - more verbose error messages for unsatisfied dependencies -2.9.99.5 - re-added SBU support to makepkg (which was accidently dropped - by 2.9.99.0) - - initial package splitting support - - memleak fixes - more verbose error messages on file conflicts -2.9.99.4 - fixed running scriptlets when -r is used - - don't die on up to date databases (when you do -Sy twice) - more verbose error messages (ie. when there is a missing dependency) -2.9.99.3 - fixed -v option + - fixed -v option - allow c++ usage in alpm.h - - fixed logging everything twice to pacman.log -2.9.99.2 - makepkg -R works again if you haven't had a chroot yet (was a - pacman bug) + - fixed logging everything twice to pacman.log TODO: dan- i think i saw this happen when i installed things - output fix for -Sy - if you have installed foo, and then you do a -S bar, then now pacman offers you to remove foo (as it should) -2.9.99.1 - fix makepkg -g - makepkg: fixed changelog generation - fixed --noconfirm -2.9.99.0 - this is the first release which is based on pacman-lib - (converted the initial cvs repo to darcs) + - change to pacman-lib based version 2.9.8 - Changed behaviour with original=X,current=Y,new=Z scenario - keep old in place, install new as .pacnew - Search package provides when finding matching targets with -S

4 5

[pacman-dev] pacman3 logging issues
by Dan McGee 12 Jan '07

12 Jan '07

Just thought I'd send this email before I forgot about it. Here is a log from my pacman3 -Syu yesterday: http://pastebin.archlinux.org/548 The aspell upgrade alone was logged 9 times...so I'm thinking there is a bit of an issue here with the way log entries are being written to the file. I haven't looked at the logging code enough yet to know what is going on, but I thought I'd at least present a concrete example to the list. Happy holidays to everyone! -Dan

3 5

[pacman-dev] New test install - bug fixes
by Aaron Griffin 11 Jan '07

11 Jan '07

Closed out a few bugs and threw up a new version. This includes all the recent script changes (and is built with the new makepkg). Important bug fixes: * --print-uris works again (thus, so does checkpkg, for the devs) * Roman's dep corruption (major bug, minor fix, heh) * Few others.... http://archlinux.org/~aaron/pacman/pacman-rc-3.0.0-3-i686.pkg.tar.gz If you can, please test the bugs listed here that say "Requires Testing": http://bugs.archlinux.org/index.php?project=1&type=1&cat=6 Thanks guys, Aaron

2 1

[pacman-dev] makeworld script- anyone use it?
by Dan McGee 11 Jan '07

11 Jan '07

I've noticed the makeworld script is in the pacman CVS, and I've never used the program in my life. Does anyone still use this, and is it worth updating? This, to me, seems to almost violate the KISS principle and should be spun off into another package (like srcpac is). Any thoughts appreciated. -Dan

6 6

[pacman-dev] [PATCH] _alpm_db_load_pkgcache: use mergesort to improve performance
by Jürgen Hötzel 11 Jan '07

11 Jan '07

Hi, Yesterday i started to analyze pacman's internal. pacman's db speed is typically bound by your systems IO performance: It has to read all db files, if you search repositories. But i was also surprised by the CPU time utilized. So i started profiling "pacman -Ss test": calls ms/call ms/call name 3751 0.01 0.01 _alpm_list_add_sorted 2088191 0.00 0.00 _alpm_pkg_cmp _alpm_list_add_sorted is called 2088191 times while building the pkgcache. This is because every package is sorted into a linked list while scanning the database files: while((info = _alpm_db_scan(db, NULL, infolevel)) != NULL) { ... db->pkgcache = _alpm_list_add_sorted(db->pkgcache, info, _alpm_pkg_cmp); ... Because on each insert the list has to be traversed, pkgcache building has time complexity of O(n^2). Merge-sort is the quickest sort algorithm for linked lists (O(n*log(n)). So i changed above code to use merge-sort. Results on my System: bash-3.2$ time ./src/pacman/pacman.static.old -Ss test >/dev/null real 0m0.791s user 0m0.432s sys 0m0.228s bash-3.2$ time ./src/pacman/pacman.static -Ss test >/dev/null real 0m0.493s user 0m0.232s sys 0m0.260s bash-3.2$ Well, only 0.2 seconds for 70 lines of code patch ;) The different complexity becomes obvious, if you use large repositories. I created a 15000-dummy-packages repository: bash-3.2$ time ./src/pacman/pacman.static.old -Ss test >/dev/null real 0m5.530s user 0m4.588s sys 0m0.828s bash-3.2$ time ./src/pacman/pacman.static -Ss test >/dev/null real 0m2.127s user 0m0.836s sys 0m1.032s Don't be surprised by the small real time. I started each command multiple to prevent IO. Jürgen

2 1

[pacman-dev] [patch] remove configure check for bzip2
by Dan McGee 11 Jan '07

11 Jan '07

Switch to libarchive means this check should no longer be needed. Signed-off-by: Dan McGee <dpmcgee(a)gmail.com> --- --- pacman-lib.orig/configure.ac 2007-01-07 21:11:03.000000000 -0500 +++ pacman-lib/configure.ac 2007-01-08 10:55:01.000000000 -0500 @@ -291,14 +291,6 @@ JAVASTATUS="no, disabled by configure" fi -dnl Check for bzip2 -AC_CHECK_LIB([bz2], [BZ2_bzCompress], [AC_CHECK_HEADER([bzlib.h], [LIBBZ2='-lbz2'])]) -if test -n "$LIBBZ2"; then - LDFLAGS="$LDFLAGS $LIBBZ2" -else - AC_MSG_ERROR("bzip2 library and its include files are needed to build pacman!"); -fi - dnl Check for math AC_CHECK_LIB([m], [log10], [AC_CHECK_HEADER([math.h], [LIBM='-lm'])]) if test -n "$LIBM"; then

2 1

[pacman-dev] [patch] alpm documentation updates
by Dan McGee 11 Jan '07

11 Jan '07

There is still a lot more to do...someone on this list wants to step up to the plate and fix up the documentation. Signed-off-by: Dan McGee <dpmcgee(a)gmail.com> --- --- pacman-lib.orig/lib/libalpm/alpm.c 2007-01-03 03:05:13.000000000 -0500 +++ pacman-lib/lib/libalpm/alpm.c 2007-01-07 23:23:26.000000000 -0500 @@ -66,7 +66,7 @@ pmhandle_t *handle = NULL; enum __pmerrno_t pm_errno; /** \addtogroup alpm_interface Interface Functions - * @brief Function to initialize and release libalpm + * @brief Functions to initialize and release libalpm * @{ */ @@ -127,15 +127,11 @@ int alpm_release() return(0); } -/** @} */ -/** \addtogroup alpm_options Library Options - * @brief Functions to set and get libalpm options - * @{ - */ +/** @} */ /** \addtogroup alpm_databases Database Functions - * @brief Frunctions to query and manipulate the database of libalpm + * @brief Functions to query and manipulate the database of libalpm * @{ */ @@ -553,7 +549,7 @@ int alpm_pkg_vercmp(const char *ver1, co } /* internal */ -char *_supported_archs[] = { +static char *_supported_archs[] = { "i586", "i686", "ppc", @@ -589,7 +585,6 @@ char *alpm_pkg_name_hasarch(char *pkgnam return NULL; } - /** @} */ /** \addtogroup alpm_sync Sync Functions @@ -611,6 +606,7 @@ pmlist_t *alpm_db_search(pmdb_t *db) return(_alpm_db_search(db, handle->needles)); } + /** @} */ /** \addtogroup alpm_trans Transaction Functions @@ -764,24 +760,7 @@ int alpm_trans_release() return(0); } -/** @} */ -/** \addtogroup alpm_dep Dependency Functions - * @brief Functions to get informations about a libalpm dependency - * @{ - */ -/** @} */ - -/** \addtogroup alpm_conflict File Conflicts Functions - * @brief Functions to get informations about a libalpm file conflict - * @{ - */ - -/** Get informations about a file conflict. - * @param conflict database conflict structure - * @param parm name of the info to get - * @return a void* on success (the value), NULL on error - */ /** @} */ /** \addtogroup alpm_log Logging Functions @@ -894,6 +873,7 @@ int alpm_list_count(const pmlist_t *list return(_alpm_list_count(list)); } + /** @} */ /** \addtogroup alpm_misc Miscellaneous Functions @@ -1111,7 +1091,7 @@ int alpm_parse_config(char *file, alpm_c if(!strcmp(key, "SERVER")) { /* add to the list */ if(alpm_db_setserver(db, ptr) != 0) { - /* pm_errno is set by alpm_set_option */ + /* pm_errno is set by alpm_db_setserver */ return(-1); } } else { @@ -1127,6 +1107,6 @@ int alpm_parse_config(char *file, alpm_c return(0); } -/* @} */ +/** @} */ /* vim: set ts=2 sw=2 noet: */ --- pacman-lib.orig/doc/libalpm.3.in 2006-02-01 13:04:01.000000000 -0500 +++ pacman-lib/doc/libalpm.3.in 2007-01-07 23:23:23.000000000 -0500 @@ -1,4 +1,4 @@ -.TH libalpm 3 "29 Jan 2006" "libalpm @PM_VERSION@" "" +.TH libalpm 3 "07 Jan 2007" "libalpm @PM_VERSION@" "" .SH NAME libalpm \- Arch Linux Package Management library .SH SYNOPSIS @@ -6,13 +6,10 @@ For ease of access, the libalpm manual h .nf alpm_databases Database Functions -alpm_dep Dependency Functions -alpm_groups Group Functions alpm_interface Interface Functions alpm_list List Functions alpm_log Logging Functions alpm_misc Miscellaneous Functions -alpm_options Library Options alpm_packages Package Functions alpm_sync Sync Functions alpm_trans Transaction Functions

2 1

[pacman-dev] pacman-optimize updates
by James Rosten 11 Jan '07

11 Jan '07

Ok, after testing it, some changes needed to be made and so they were made. Now it works (at least for me it worked). This is just an idea, but wouldn't it be interesting if we used the stat_busy, stat_done, and stat_fail stuff from /etc/rc.d/functions for the messages in pacman-optimize? Anyway, here is the patch for FS #5009 (woops, just caught another bug.........it wouldn't be able to work after a successful one but it would work after the failure ('cause pacman.new was still haning around.........fixed). It is below as usual. ~ Jamie / yankees26

3 9