Date: Fri, 28 Dec 2007 22:57:25 GMT From: Garrett Cooper <gcooper@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 131927 for review Message-ID: <200712282257.lBSMvP5v030695@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=131927 Change 131927 by gcooper@shiina-ibook on 2007/12/28 22:57:03 Getting OCD about file organization. Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/archive_read_open_stream.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/macros.h#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg.c#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg.h#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_db.c#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_db.h#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_db_freebsd.c#7 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_db_match.c#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_db_private.h#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_freebsd.c#6 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_freebsd.h#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_freebsd_contents.c#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_freebsd_lexer.l#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_freebsd_parser.y#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_freebsd_private.h#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_manifest.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_manifest_freebsd.c#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_private.h#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_repo.c#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_repo.h#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_repo_files.c#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_repo_ftp.c#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_repo_local_freebsd.c#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_repo_private.h#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_sandbox.c#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_sandbox.h#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_sandbox_private.h#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_util.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkgfile.c#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/trunk/tools/pkg_add/main.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/trunk/tools/pkg_create/main.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/trunk/tools/pkg_delete/main.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/trunk/tools/pkg_info/main.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/trunk/tools/pkg_sign/main.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/trunk/tools/pkg_version/main.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/add/pkg_action_add.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/add/pkg_action_add.h#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/check/pkg_action_check.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/check/pkg_action_check.h#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/clean/pkg_action_clean.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/clean/pkg_action_clean.h#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/delete/pkg_action_delete.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/delete/pkg_action_delete.h#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/info/pkg_action_info.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/info/pkg_action_info.h#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/pkg_action.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/pkg_action.h#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/show/pkg_action_show.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/show/pkg_action_show.h#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/sign/pkg_action_sign.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/sign/pkg_action_sign.h#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/update/pkg_action_update.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/update/pkg_action_update.h#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/version/pkg_action_version.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/version/pkg_action_version.h#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_add_arg_parser.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_add_arg_parser.h#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_arg_parser.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_arg_parser.h#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_check_arg_parser.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_check_arg_parser.h#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_clean_arg_parser.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_clean_arg_parser.h#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_delete_arg_parser.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_delete_arg_parser.h#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_info_arg_parser.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_info_arg_parser.h#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_show_arg_parser.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_show_arg_parser.h#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_sign_arg_parser.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_sign_arg_parser.h#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_update_arg_parser.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_update_arg_parser.h#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_version_arg_parser.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_version_arg_parser.h#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/main.c#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/pkg_action.c#3 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/pkg_action.h#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/pkg_action_add.c#3 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/pkg_action_add_arg_parser.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/pkg_action_add_arg_parser.h#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/pkg_action_arg_parser.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/pkg_action_arg_parser.h#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/pkg_action_check.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/pkg_action_check_arg_parser.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/pkg_action_check_arg_parser.h#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/pkg_action_clean.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/pkg_action_clean_arg_parser.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/pkg_action_clean_arg_parser.h#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/pkg_action_delete.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/pkg_action_delete_arg_parser.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/pkg_action_delete_arg_parser.h#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/pkg_action_info.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/pkg_action_info_arg_parser.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/pkg_action_info_arg_parser.h#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/pkg_action_show.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/pkg_action_show_arg_parser.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/pkg_action_show_arg_parser.h#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/pkg_action_sign.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/pkg_action_sign_arg_parser.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/pkg_action_sign_arg_parser.h#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/pkg_action_update.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/pkg_action_update_arg_parser.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/pkg_action_update_arg_parser.h#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/pkg_action_version.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/pkg_action_version_arg_parser.c#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/pkg_action_version_arg_parser.h#2 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/pkgman.h#2 edit Differences ... ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/archive_read_open_stream.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/macros.h#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg.c#3 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg.h#3 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_db.c#4 (text+ko) ==== @@ -107,7 +107,11 @@ /** * @brief The package action used when no output is required - * @todo Change to follow the interactive flag + * Andrew: + * @todo Change to follow the interactive flag + * Garrett: + * This isn't necessary I think, and should stick with + * the interface, not with the library. * * This is a function that does nothing. * It can be used for a pkg_action when no output is required ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_db.h#3 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_db_freebsd.c#7 (text+ko) ==== @@ -257,7 +257,32 @@ pkg_run_script(pkg, prefix, pkg_script_post); /* - * @todo Display contents of \@display + * @todo Replace __display_file with the appropriate var name pointing to + * the file by \@display. + * + * Simply, open the file denoted by @display, and print the contents to the + * screen. Simple as that.. + */ + /* + +/ * Temporary constant for defining the display buffer size * / +#define DISPLAY_BUFFER_SIZE 1024 + + char display_buffer[DISPLAY_BUFFER_SIZE+1]; + + FILE *fp = fopen(__display_file, "r"); + + if (fp == NULL) { + errx("Could not open display file -- %s\n", __display_file); + } else { + + while ( NULL != ( fgets(display_buffer, DISPLAY_BUFFER_SIZE, fp)) ) + printf("%s", display_buffer); + + } + +#undef DISPLAY_BUFFER_SIZE + */ chdir(cwd); ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_db_match.c#3 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_db_private.h#3 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_freebsd.c#6 (text+ko) ==== @@ -189,7 +189,7 @@ * @param pkg_db_dir The directory in the database the package is registered in * @todo Make this work through a pkg_db callback * @todo Remove the need for pkg_db_dir by using a struct pkg_repo - * @todo move the freebsd_package creation to an internal function + * @todo Move the freebsd_package creation to an internal function * * This creates a package object from an installed package. * It can be used to retrieve information from the pkg_db and deintall @@ -244,12 +244,12 @@ } /** - * @brief Creates an empty FreeBSD package to add files to + * @brief Creates an empty FreeBSD package to add files to the package. * @param pkg_name The name of the package * * This creates an empty FreeBSD Package. - * It can then have files added to it, eg. in pkg_create(1) - * @todo Write + * It can then have files added to it, e.g. in pkg_create(1) + * @todo Write -- what?? * @return A package object or NULL */ struct pkg * @@ -317,7 +317,6 @@ /** * @brief Callback for pkg_get_version() * - * @todo Do proper checks of line 0 * @return A string containing the package version. Do not Free. */ static const char * @@ -331,6 +330,22 @@ assert(fpkg != NULL); assert(fpkg->pkg_type != fpkg_unknown); + /** + * In a properly formatted file (assuming that things stay + * consistent between pkg_create(1) and this section of code + * when the version is generated), the +CONTENTS file should + * appear something like: + * + * [from line 0] + * @comment VERSION:[version_number] + * ... + * + * where [version_number] is interchangeable with a + * {major.minor} formatted number, such as 1.0, 1.1, etc.. + * + * Anything apart from those strict requirements is + * non-conforming and invalid.. + */ if (fpkg->version == NULL) { const char *version; ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_freebsd.h#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_freebsd_contents.c#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_freebsd_lexer.l#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_freebsd_parser.y#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_freebsd_private.h#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_manifest.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_manifest_freebsd.c#3 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_private.h#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_repo.c#3 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_repo.h#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_repo_files.c#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_repo_ftp.c#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_repo_local_freebsd.c#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_repo_private.h#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_sandbox.c#3 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_sandbox.h#3 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_sandbox_private.h#3 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_util.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkgfile.c#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/trunk/tools/pkg_add/main.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/trunk/tools/pkg_create/main.c#2 (text+ko) ==== @@ -16,7 +16,15 @@ #include "lib.h" #include "create.h" -static char Options[] = "EGYNORhjvxyzf:p:P:C:c:d:i:I:k:K:r:t:X:D:m:s:S:o:b:"; +struct pkg_create { + struct pkg_db *db; + struct pkg_repo *repo; + struct pkg **pkgs; + int flags; + char chroot[PATH_MAX]; + char *base_prefix; + char *prefix; +} match_t MatchType = MATCH_GLOB; char *Prefix = NULL; @@ -37,7 +45,6 @@ char *Conflicts = NULL; char *Origin = NULL; char *InstalledPkg = NULL; -char PlayPen[FILENAME_MAX]; int Dereference = FALSE; int PlistOnly = FALSE; int Recursive = FALSE; @@ -48,7 +55,7 @@ #endif -static void usage __P((void)); +static void usage(void); int main(int argc, char **argv) @@ -211,7 +218,6 @@ *pkgs = NULL; if ((start[0] != NULL) && (start[1] != NULL)) { warnx("only one package name allowed ('%s' extraneous)", start[1]); -// usage(); } if (start[0] == NULL) start[0] = InstalledPkg; ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/trunk/tools/pkg_delete/main.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/trunk/tools/pkg_info/main.c#2 (text+ko) ==== @@ -28,9 +28,22 @@ #include <string.h> #include <unistd.h> -static char options[] = "abcdDe:EfgGhiIjkl:LmoO:pPqQrRst:vVW:xX"; +struct pkg_info { + struct pkg_db *db; + char **pkgs; + int quiet; + match_t match_type; + int flags; + int use_blocksize; + const char *check_package; + const char *origin; + const char *search_file; + const char *separator; +}; + +static void usage(void); -static void usage (void); +static char options[] = "abcdDe:EfgGhiIjkKl:LmoO:pPqQrRst:vVW:xX"; int main(int argc, char **argv) @@ -44,7 +57,6 @@ info.quiet = 0; info.origin = NULL; info.check_package = NULL; - info.seperator = ""; info.use_blocksize = 0; info.search_file = NULL; @@ -99,7 +111,7 @@ info.flags |= SHOW_DEINSTALL; break; case 'l': - info.seperator = optarg; + info.separator = optarg; break; case 'L': info.flags |= SHOW_FILES; @@ -147,8 +159,14 @@ info.flags |= SHOW_FMTREV; break; case 'W': - /* XXX Allow multiple -W files */ - info.search_file = optarg; + /* If package list is empty, create a new one */ + if (SLIST_EMPTY(&w_package_names)) { + /* Create the head of the slist */ + SLIST_HEAD(top_package, char *) + w_package_names = SLIST_HEAD_INITIALIZER(w_packages); + } + /* Insert found argument at head of list */ + SLIST_INSERT_HEAD(); break; case 'x': info.match_type = MATCH_REGEX; @@ -220,13 +238,17 @@ } /* -W <filename> */ + SLIST_FOREACH_SAFE() { + if (info.search_file != NULL) { struct stat sb; char *abs_path; abs_path = pkg_abspath(info.search_file); + /* File couldn't be stat(2)'ed.. */ if (stat(abs_path, &sb) != 0) { - /* XXX */ + errx("File found at %s couldn't be stat(2)'ed\n", + abs_path); free(abs_path); return 1; } @@ -283,7 +305,7 @@ qsort(pkgs, cur, sizeof(struct pkg *), pkg_compare); for (cur = 0; pkgs[cur] != NULL; cur++) { show(info.db, pkgs[cur], info.flags, info.quiet, - info.seperator, info.use_blocksize); + info.separator, info.use_blocksize); } retval = 0; break; @@ -297,7 +319,7 @@ pkg = pkg_db_get_package(info.db, info.pkgs[cur]); if (pkg != NULL) show(info.db, pkg, info.flags, info.quiet, - info.seperator, info.use_blocksize); + info.separator, info.use_blocksize); else { warnx("pkg_info: can't find package '%s' " "installed or in a file!", info.pkgs[cur]); ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/trunk/tools/pkg_sign/main.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/trunk/tools/pkg_version/main.c#2 (text+ko) ==== @@ -21,56 +21,79 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD: src/usr.sbin/pkg_install/version/main.c,v 1.7 2006/06/12 22:39:32 obrien Exp $"); -#include "lib.h" -#include "version.h" +#include <pkg_db.h> +#include <pkg_freebsd.h> #include <err.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> -static char Options[] = "dIhl:L:qs:XtTO:ov"; +static char options[] = "dIhl:L:qs:XtTO:ov"; char *LimitChars = NULL; char *PreventChars = NULL; char *MatchName = NULL; char *LookUpOrigin = NULL; -Boolean RegexExtended = FALSE; -Boolean UseINDEXOnly = FALSE; -Boolean ShowOrigin = FALSE; + +#define VERSION_USE_INDEX_ONLY 0x0001 +#define VERSION_SHOW_PKG_ORIGIN 0x0002 + +struct pkg_version { + struct pkg_db *db; + char **pkgs; + int quiet; + match_t match_type; + int flags; + const char *check_package; + const char *origin; + const char *search_file; + const char *seperator; +}; -static void usage __P((void)); +static void usage(void); int main(int argc, char **argv) { + struct pkg_version version; + int ch, cmp = 0; if (argc == 4 && !strcmp(argv[1], "-t")) { - cmp = version_cmp(argv[2], argv[3]); + cmp = pkg_version_cmp(argv[2], argv[3]); printf(cmp > 0 ? ">\n" : (cmp < 0 ? "<\n" : "=\n")); exit(0); } else if (argc == 4 && !strcmp(argv[1], "-T")) { - cmp = version_match(argv[3], argv[2]); + cmp = pkg_version_match(argv[3], argv[2]); exit(cmp == 1 ? 0 : 1); } - else while ((ch = getopt(argc, argv, Options)) != -1) { + else while ((ch = getopt(argc, argv, options)) != -1) { switch(ch) { case 'v': Verbose++; break; + /* + * Use /usr/ports/INDEX* instead of the Makefiles for version + * comparison bases. + */ case 'I': - UseINDEXOnly = TRUE; + version.flags |= VERSION_USE_INDEX_ONLY; break; + /* Look only for the specified installed statuses */ case 'l': LimitChars = optarg; break; + /* Avoid looking for package installed statuses */ case 'L': PreventChars = optarg; break; case 'q': - Quiet = TRUE; + version.flags |= QUIET; break; case 's': @@ -82,7 +105,7 @@ break; case 'o': - ShowOrigin = TRUE; + version.flags |= VERSION_SHOW_PKG_ORIGIN; break; case 't': @@ -94,7 +117,7 @@ break; case 'X': - RegexExtended = TRUE; + version.match_type = MATCH_EREGEX; break; case 'h': @@ -108,7 +131,7 @@ argc -= optind; argv += optind; - return pkg_perform(argv); + return pkg_version(version); } static void ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/main.c#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/pkgman.h#2 (text+ko) ====
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200712282257.lBSMvP5v030695>