Date: Tue, 7 Jul 2009 05:32:22 GMT From: David Forsythe <dforsyth@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 165729 for review Message-ID: <200907070532.n675WMAr091910@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=165729 Change 165729 by dforsyth@squirrel on 2009/07/07 05:32:16 Renamed pkgdb to pkg_db and moved some things around. Pushed for backup. Affected files ... .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg.c#32 edit .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg.h#30 edit .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_cfl.h#4 edit .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_db.c#1 branch .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_db.h#1 branch .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_db_hierdb.c#1 branch .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_db_hierdb.h#1 branch .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_db_private.h#1 branch .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_dep.h#6 edit .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_file.h#6 edit .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_plist.c#24 edit .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_plist.h#20 edit .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_sub.c#5 edit .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_sub.h#5 edit .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkgdb.c#21 delete .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkgdb.h#14 delete .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkgdb_hierdb.c#12 delete .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkgdb_hierdb.h#7 delete .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkgdb_private.h#6 delete .. //depot/projects/soc2009/dforsyth_libpkg/pkg_info/main.c#20 edit Differences ... ==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg.c#32 (text+ko) ==== @@ -2,15 +2,13 @@ #include <stdlib.h> #include <string.h> -#include <sys/queue.h> - #include "pkg_util.h" #include "pkg_dep.h" #include "pkg_file.h" #include "pkg_cfl.h" #include "pkg_plist.h" -#include "pkgdb_hierdb.h" -#include "pkgdb.h" +#include "pkg_db_hierdb.h" +#include "pkg_db.h" #include "pkg_private.h" #include "pkg_sub.h" #include "pkg.h" @@ -25,7 +23,6 @@ char *mtree_dirs; char *required_by; - struct pkg_sub *psub; struct pkg_plist *plist; short dirty; ==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg.h#30 (text+ko) ==== @@ -108,31 +108,31 @@ /* TODO: Add installation/deinstallation routine modification... routines. */ -/* pkgdb */ +/* pkg_db */ -struct pkgdb *pkgdb_new(); -void pkgdb_delete(struct pkgdb *db); +struct pkg_db *pkg_db_new(); +void pkg_db_delete(struct pkg_db *db); -int pkgdb_open(struct pkgdb *db, const char *path, int db_type); +int pkg_db_open(struct pkg_db *db, const char *path, int db_type); /* With the new design, is "init" even needed? */ -int pkgdb_init(struct pkgdb *db); +int pkg_db_init(struct pkg_db *db); /* Return a list of packages by _ident_. */ -const char *pkgdb_all_pkgs(struct pkgdb *db); /* rename. this is lulz. */ -int pkgdb_select_pkg(struct pkgdb *db, struct pkg *p, const char *pkgident); +const char *pkg_db_all_pkgs(struct pkg_db *db); /* rename. this is lulz. */ +int pkg_db_select_pkg(struct pkg_db *db, struct pkg *p, const char *pkgident); -int pkgdb_insert_pkg(struct pkgdb *db, struct pkg *p); -int pkgdb_delete_pkg(struct pkgdb *db, const char *pkgident); -int pkgdb_update_pkg(struct pkgdb *db, const char *pkgident, struct pkg *p); +int pkg_db_insert_pkg(struct pkg_db *db, struct pkg *p); +int pkg_db_delete_pkg(struct pkg_db *db, const char *pkgident); +int pkg_db_update_pkg(struct pkg_db *db, const char *pkgident, struct pkg *p); -/* pkgrepo */ +/* pkg_repo */ struct pkgrepo *pkgrepo_new(); void pkgrepo_delete(struct pkgrepo *pr); -/* pkgarcv */ +/* pkgarchive */ -struct pkgarcv *pkgarcv_new(); -void pkgarcv_delete(struct pkgarcv *pa; +struct pkgarchive *pkgarchive_new(); +void pkgarchive_delete(struct pkgarchive *pa; #endif ==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_cfl.h#4 (text+ko) ==== @@ -1,12 +1,9 @@ #ifndef __PKG_CFL_H__ #define __PKG_CFL_H__ -/* Yes, I'm that lazy. */ struct pkg_cfl { char *name; int version; - - TAILQ_ENTRY(pkg_cfl) next; }; #if 0 ==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_dep.h#6 (text+ko) ==== @@ -10,8 +10,6 @@ char *origin; int version; - - TAILQ_ENTRY(pkg_dep) next; }; #if 0 ==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_file.h#6 (text+ko) ==== @@ -11,8 +11,6 @@ char *owner; char *group; char *mode; - - TAILQ_ENTRY(pkg_file) next; }; #if 0 ==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_plist.c#24 (text+ko) ==== @@ -14,7 +14,7 @@ #include "pkg_dep.h" #include "pkg_file.h" #include "pkg_plist.h" -#include "pkgdb.h" +#include "pkg_db.h" #include "pkg.h" /* TODO: Create plist setter functions for building packages. */ @@ -50,11 +50,7 @@ void pkg_plist_delete(struct pkg_plist *pl) { - /* TODO: Write this function. */ -#if 0 - pkg_plist_pkg_list_free(pl); - pkg_plist_pkg_dep_free(pl); -#endif + pkg_plist_reset(pl); free(pl); return; } @@ -74,16 +70,28 @@ if (pl == NULL) arg_rage_quit(__func__, "Not a valid plist.", RAGE_AT_LIBPKG); - /* TODO: Write this. */ + int c; + + free(pl->rev); + free(pl->cwd); + free(pl->name); + free(pl->origin); + free(pl->srcdir); + for (c = 0; c < pl->pkg_file_cnt; ++c) + pkg_file_reset(pl->pkg_file_list[c]); free(pl->pkg_file_list); pl->pkg_file_cnt = 0; - free(pl->pkg_dep_list); - pl->pkg_dep_cnt = 0; + for (c = 0; c < pl->pkg_depends_cnt; ++c) + pkg_depend_reset(pl->pkg_depends_list[c]); + free(pl->pkg_depend_list); + pl->pkg_depend_cnt = 0; - free(pl->pkg_cfl_list); - pl->pkg_cfl_cnt = 0; + for (c = 0; c < pl->pkg_conflicts_cnt; ++c) + pkg_conflict_reset(pl->pkg_conflicts_list[c]); + free(pl->pkg_conflict_list); + pl->pkg_conflict_cnt = 0; pl->extract_in_place = 0; pl->preserve = 0; @@ -333,8 +341,6 @@ return (s); } -/* pkg_file list manipulation and access. */ - char * pkg_plist_name(struct pkg_plist *pl) { @@ -362,15 +368,6 @@ return (pl->origin); } -char * -pkg_plist_mtree_file(struct pkg_plist *pl) -{ - if (pl == NULL) - arg_rage_quit(__func__, "Not a valid plist.", RAGE_AT_LIBPKG); - - return (pl->mtree_file); -} - int pkg_plist_extract_in_place(struct pkg_plist *pl) { ==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_plist.h#20 (text+ko) ==== @@ -70,11 +70,9 @@ struct pkg_plist { char *rev; char *cwd; - char *srcdir; char *name; char *origin; - char *display; - char *mtree_file; + char *srcdir; short extract_in_place; short preserve; short complete; /* fat. */ @@ -104,10 +102,13 @@ int pkg_plist_parse_line(struct pkg_plist *pl, char *line, struct parse_state *st); -char *pkg_plist_name(struct pkg_plist *pl); -char *pkg_plist_cwd(struct pkg_plist *pl); -char *pkg_plist_origin(struct pkg_plist *pl); -char *pkg_plist_mtree_file(struct pkg_plist *pl); +const char *pkg_plist_name(struct pkg_plist *pl); +const char *pkg_plist_cwd(struct pkg_plist *pl); +const char *pkg_plist_origin(struct pkg_plist *pl); + +int pkg_plist_set_name(struct pkg_plist *pl, const char *name); +int pkg_plist_set_cwd(struct pkg_plist *pl, const char *cwd); +int pkg_plist_set_origin(struct pkg_plist *pl, const char *origin); int pkg_plist_extract_in_place(struct pkg_plist *pl); int pkg_plist_preserve(struct pkg_plist *pl); ==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_sub.c#5 (text+ko) ==== @@ -198,10 +198,10 @@ return (PKG_SUB_OK); } -/* Initialize a pkg_sub in a pkgdb. */ +/* Initialize a pkg_sub in a pkg_db. */ int -pkg_sub_init(struct pkg_sub *ps, struct pkgdb *db, const char *ident) +pkg_sub_init(struct pkg_sub *ps, struct pkg_db *db, const char *ident) { char *pathp; @@ -210,7 +210,7 @@ pkg_sub_reset(ps); pkg_sub_set_ident(ps, ident); - pathp = path_build(pkgdb_db_root(db), ident); + pathp = path_build(pkg_db_db_root(db), ident); if (pathp == NULL) { free(ps->ident); ==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_sub.h#5 (text+ko) ==== @@ -1,7 +1,7 @@ #ifndef __PKG_DIR_H__ #define __PKG_DIR_H__ -#include "pkgdb.h" +#include "pkg_db.h" #define PKG_SUB_MEM_ERR(x) x & SUB_MEMORY_ERR @@ -49,7 +49,7 @@ int pkg_sub_mark_unread(struct pkg_sub *ps); -int pkg_sub_init(struct pkg_sub *ps, struct pkgdb *db, const char *ident); +int pkg_sub_init(struct pkg_sub *ps, struct pkg_db *db, const char *ident); int pkg_sub_reset(struct pkg_sub *ps); ==== //depot/projects/soc2009/dforsyth_libpkg/pkg_info/main.c#20 (text+ko) ==== @@ -27,7 +27,7 @@ { int status; const char *db_root; - struct pkgdb *db; + struct pkg_db *db; if (argc == 1 && argv != NULL /* Giving argv something to do */) { opt_all = 1; @@ -40,16 +40,16 @@ if (db_root == NULL) db_root = PKG_DBDIR_DEFAULT; /* Default */ #if 0 - db = pkgdb_new(HIER_DB); + db = pkg_db_new(HIER_DB); if (db == NULL) { fprintf(stderr, "Could not attach to database \"%s\"\n", db_root); } #endif - db = pkgdb_new(HIER_DB); + db = pkg_db_new(HIER_DB); if (db == NULL) exit(EXIT_FAILURE); - status = pkgdb_db_open(db, db_root); + status = pkg_db_db_open(db, db_root); if (status) { fprintf(stderr, "Could not open database \"%s\"\n", db_root); exit(EXIT_FAILURE); @@ -57,7 +57,7 @@ perform_on_db(db); - // pkgdb_db_delete(db); + // pkg_db_db_delete(db); return (EXIT_SUCCESS); } @@ -85,7 +85,7 @@ } void -perform_on_db(struct pkgdb *db) +perform_on_db(struct pkg_db *db) { int status; /* char *target; */ @@ -98,14 +98,14 @@ if (p == NULL) exit(EXIT_FAILURE); - status = pkgdb_db_init(db); + status = pkg_db_db_init(db); if (status) { fprintf(stderr, "Could not initialize database \"%s\"\n", - pkgdb_db_root(db)); + pkg_db_db_root(db)); exit(EXIT_FAILURE); } - while ((status = pkgdb_pkg_next(db, p)) != DB_NO_PKG) { + while ((status = pkg_db_pkg_next(db, p)) != DB_NO_PKG) { if (!opt_all) { /* Wont happen at this point. */ /* Do some matching magic that I haven't written yet. */ print_pkg_information(p);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200907070532.n675WMAr091910>