- 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