| index : pacman | |
| Archlinux32 fork of pacman | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | src/util/.gitignore | 3 | ||||
| -rw-r--r-- | src/util/Makefile.am | 20 | ||||
| -rw-r--r-- | src/util/testdb.c | 154 | ||||
| -rw-r--r-- | src/util/testpkg.c | 30 | ||||
| -rw-r--r-- | src/util/vercmp.c | 52 |
diff --git a/src/util/.gitignore b/src/util/.gitignore index 8bfb0085..36688806 100644 --- a/src/util/.gitignore +++ b/src/util/.gitignore @@ -1,6 +1,5 @@ .deps .libs -Makefile -Makefile.in vercmp testpkg +testdb diff --git a/src/util/Makefile.am b/src/util/Makefile.am index e79e726d..97a0ffa1 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -1,9 +1,27 @@ -bin_PROGRAMS = vercmp testpkg +# paths set at make time +conffile = ${sysconfdir}/pacman.conf +dbpath = ${localstatedir}/lib/pacman/ +cachedir = ${localstatedir}/cache/pacman/pkg/ +bin_PROGRAMS = vercmp testpkg testdb + +DEFS = -DLOCALEDIR=\"@localedir@\" \ + -DCONFFILE=\"$(conffile)\" \ + -DROOTDIR=\"$(ROOTDIR)\" \ + -DDBPATH=\"$(dbpath)\" \ + -DCACHEDIR=\"$(cachedir)\" \ + @DEFS@ INCLUDES = -I$(top_srcdir)/lib/libalpm +AM_CFLAGS = -pedantic -D_GNU_SOURCE + vercmp_SOURCES = vercmp.c vercmp_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la testpkg_SOURCES = testpkg.c testpkg_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la + +testdb_SOURCES = testdb.c +testdb_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la + +# vim:set ts=2 sw=2 noet: diff --git a/src/util/testdb.c b/src/util/testdb.c new file mode 100644 index 00000000..31b4ff0d --- /dev/null +++ b/src/util/testdb.c @@ -0,0 +1,154 @@ +/* + * testdb.c : Test a pacman local database for validity + * + * Copyright (c) 2007 by Aaron Griffin <aaronmgriffin@gmail.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * USA. + */ + +#include <unistd.h> +#include <stdio.h> +#include <stdlib.h> +#include <errno.h> +#include <limits.h> +#include <string.h> +#include <sys/stat.h> +#include <dirent.h> +#include <libgen.h> + +#include <alpm.h> +#include <alpm_list.h> + +#define BASENAME "testdb" + +int str_cmp(const void *s1, const void *s2) +{ + return(strcmp(s1, s2)); +} + +static void cleanup(int signum) { + if(alpm_release() == -1) { + fprintf(stderr, "error releasing alpm: %s\n", alpm_strerrorlast()); + } + + exit(signum); +} + +void output_cb(pmloglevel_t level, char *fmt, va_list args) +{ + if(strlen(fmt)) { + switch(level) { + case PM_LOG_ERROR: printf("error: "); break; + case PM_LOG_WARNING: printf("warning: "); break; + default: return; + } + vprintf(fmt, args); + printf("\n"); + } +} + +static int db_test(char *dbpath) +{ + struct dirent *ent; + char path[PATH_MAX]; + struct stat buf; + int ret = 0; + + DIR *dir; + + if(!(dir = opendir(dbpath))) { + fprintf(stderr, "error : %s : %s\n", dbpath, strerror(errno)); + return(1); + } + + while ((ent = readdir(dir)) != NULL) { + if(!strcmp(ent->d_name, ".") || !strcmp(ent->d_name, "..")) { + continue; + } + /* check for desc, depends, and files */ + snprintf(path, PATH_MAX, "%s/%s/desc", dbpath, ent->d_name); + if(stat(path, &buf)) { + printf("%s: description file is missing\n", ent->d_name); + ret++; + } + snprintf(path, PATH_MAX, "%s/%s/depends", dbpath, ent->d_name); + if(stat(path, &buf)) { + printf("%s: dependency file is missing\n", ent->d_name); + ret++; + } + snprintf(path, PATH_MAX, "%s/%s/files", dbpath, ent->d_name); + if(stat(path, &buf)) { + printf("%s: file list is missing\n", ent->d_name); + ret++; + } + } + return(ret); +} + +int main(int argc, char **argv) +{ + int retval = 0; /* default = false */ + pmdb_t *db = NULL; + char *dbpath; + char localdbpath[PATH_MAX]; + alpm_list_t *i; + + if(argc == 1) { + dbpath = DBPATH; + } else if(argc == 3 && strcmp(argv[1], "-b") == 0) { + dbpath = argv[2]; + } else { + fprintf(stderr, "usage: %s -b <pacman db>\n", BASENAME); + return(1); + } + + snprintf(localdbpath, PATH_MAX, "%s/local", dbpath); + retval = db_test(localdbpath); + if(retval) { + return(retval); + } + + if(alpm_initialize() == -1) { + fprintf(stderr, "cannot initialize alpm: %s\n", alpm_strerrorlast()); + return(1); + } + + /* let us get log messages from libalpm */ + alpm_option_set_logcb(output_cb); + + alpm_option_set_dbpath(dbpath); + + db = alpm_db_register_local(); + if(db == NULL) { + fprintf(stderr, "error: could not register 'local' database (%s)\n", + alpm_strerrorlast()); + cleanup(EXIT_FAILURE); + } + + /* check dependencies */ + alpm_list_t *data; + data = alpm_checkdeps(db, 0, alpm_db_getpkgcache(db), NULL); + for(i = data; i; i = alpm_list_next(i)) { + pmdepmissing_t *miss = alpm_list_getdata(i); + pmdepend_t *dep = alpm_miss_get_dep(miss); + char *depstring = alpm_dep_get_string(dep); + printf("missing dependency for %s : %s\n", alpm_miss_get_target(miss), + depstring); + free(depstring); + } + + cleanup(retval); +} diff --git a/src/util/testpkg.c b/src/util/testpkg.c index a64e6b34..d724bb8a 100644 --- a/src/util/testpkg.c +++ b/src/util/testpkg.c @@ -2,7 +2,7 @@ * testpkg.c : Test a pacman package for validity * * Copyright (c) 2007 by Aaron Griffin <aaronmgriffin@gmail.com> - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -15,27 +15,29 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ #include "config.h" -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <libgen.h> +#include <stdio.h> /* printf */ +#include <stdarg.h> /* va_list */ +#include <string.h> /* strlen */ #include <alpm.h> -void output_cb(unsigned short level, char *msg) +#define BASENAME "testpkg" + +static void output_cb(pmloglevel_t level, char *fmt, va_list args) { - if(strlen(msg)) { + if(strlen(fmt)) { switch(level) { case PM_LOG_ERROR: printf("error: "); break; case PM_LOG_WARNING: printf("warning: "); break; + default: break; } - puts(msg); + vprintf(fmt, args); } } @@ -45,27 +47,27 @@ int main(int argc, char **argv) pmpkg_t *pkg = NULL; if(argc != 2) { - fprintf(stderr, "usage: %s <package file>\n", basename(argv[0])); + fprintf(stderr, "usage: %s <package file>\n", BASENAME); return(1); } if(alpm_initialize() == -1) { - fprintf(stderr, "cannot initilize alpm: %s\n", alpm_strerror(pm_errno)); + fprintf(stderr, "cannot initilize alpm: %s\n", alpm_strerrorlast()); return(1); } /* let us get log messages from libalpm */ alpm_option_set_logcb(output_cb); - if(alpm_pkg_load(argv[1], &pkg) == -1 || pkg == NULL) { + if(alpm_pkg_load(argv[1], 1, &pkg) == -1 || pkg == NULL) { retval = 1; } else { alpm_pkg_free(pkg); retval = 0; } - + if(alpm_release() == -1) { - fprintf(stderr, "error releasing alpm: %s\n", alpm_strerror(pm_errno)); + fprintf(stderr, "error releasing alpm: %s\n", alpm_strerrorlast()); } return(retval); diff --git a/src/util/vercmp.c b/src/util/vercmp.c index cc951988..29ab121d 100644 --- a/src/util/vercmp.c +++ b/src/util/vercmp.c @@ -1,8 +1,8 @@ /* * vercmp.c - * + * * Copyright (c) 2002-2005 by Judd Vinet <jvinet@zeroflux.org> - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -15,40 +15,58 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ #include "config.h" -#include <stdio.h> -#include <string.h> -#include <errno.h> -#include <unistd.h> -#include <limits.h> -/* TODO this is probably not the best way to do this */ -#ifndef PATH_MAX -#define PATH_MAX 1024 -#endif +#include <stdio.h> /* printf */ +#include <string.h> /* strncpy */ #include <alpm.h> +#define BASENAME "vercmp" + +#define MAX_LEN 255 + +static void usage() +{ + fprintf(stderr, "usage: %s <ver1> <ver2>\n\n", BASENAME); + fprintf(stderr, "return values:\n"); + fprintf(stderr, " < 0 : if ver1 < ver2\n"); + fprintf(stderr, " 0 : if ver1 == ver2\n"); + fprintf(stderr, " > 0 : if ver1 > ver2\n"); +} + int main(int argc, char *argv[]) { - char s1[255] = ""; - char s2[255] = ""; + char s1[MAX_LEN] = ""; + char s2[MAX_LEN] = ""; int ret; + if(argc == 1) { + usage(); + return(2); + } + if(argc > 1 && + (strcmp(argv[1], "-h") == 0 || strcmp(argv[1], "--help") == 0 + || strcmp(argv[1], "--usage") == 0)) { + usage(); + return(0); + } if(argc > 1) { - strncpy(s1, argv[1], 255); + strncpy(s1, argv[1], MAX_LEN); + s1[MAX_LEN -1] = '\0'; } if(argc > 2) { - strncpy(s2, argv[2], 255); + strncpy(s2, argv[2], MAX_LEN); + s2[MAX_LEN -1] = '\0'; } else { printf("0\n"); return(0); } - + ret = alpm_pkg_vercmp(s1, s2); printf("%d\n", ret); return(ret); |