From owner-p4-projects@FreeBSD.ORG Mon Jan 14 04:26:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 863AE16A41B; Mon, 14 Jan 2008 04:26:45 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 31B5F16A418 for ; Mon, 14 Jan 2008 04:26:45 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2AECB13C4EF for ; Mon, 14 Jan 2008 04:26:45 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0E4QiGp018297 for ; Mon, 14 Jan 2008 04:26:44 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0E4Qheb018294 for perforce@freebsd.org; Mon, 14 Jan 2008 04:26:43 GMT (envelope-from gcooper@FreeBSD.org) Date: Mon, 14 Jan 2008 04:26:43 GMT Message-Id: <200801140426.m0E4Qheb018294@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 133216 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jan 2008 04:26:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=133216 Change 133216 by gcooper@shiina-ibook on 2008/01/14 04:26:26 Rechecking in for RCS... Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/Makefile#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/Makefile.inc#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/Makefile#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/Makefile.inc#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/README#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/add/Makefile#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/add/add.h#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/add/extract.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/add/futil.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/add/main.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/add/perform.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/add/pkg_add.1#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/create/Makefile#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/create/create.h#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/create/main.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/create/perform.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/create/pkg_create.1#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/create/pl.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/delete/Makefile#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/delete/delete.h#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/delete/main.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/delete/perform.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/delete/pkg_delete.1#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/info/Makefile#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/info/info.h#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/info/main.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/info/perform.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/info/pkg_info.1#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/info/show.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/.match.c.swp#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/Makefile#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/add_del.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/deps.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/exec.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/file.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/global.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/lib.h#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/match.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/msg.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/pen.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/pkgwrap.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/plist.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/str.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/url.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lib/version.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/lsof.gmon#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/prof_scripts/prof_postprocess.pl#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/prof_scripts/prof_process.pl#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/prof_scripts/run_prof.sh#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/Makefile#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/README#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/check.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/common.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/extern.h#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/gzip.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/gzip.h#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/main.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/pgp.h#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/pgp_check.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/pgp_sign.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/pkg_sign.1#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/sha1.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/sign.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/stand.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/stand.h#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/sign/x509.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/tkpkg#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/unlocker.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/version/Makefile#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/version/main.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/version/perform.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/version/perform.old.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/version/pkg_version.1#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/version/test-pkg_version.sh#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/usr/src/usr.sbin/pkg_install/version/version.h#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/archive_read_open_stream.c#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/macros.h#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg.c#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg.h#5 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_db.c#6 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_db.h#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_db_freebsd.c#8 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_db_match.c#5 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_db_private.h#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_freebsd.c#7 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_freebsd.h#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_freebsd_contents.c#5 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_freebsd_lexer.l#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_freebsd_parser.y#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_freebsd_private.h#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_manifest.c#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_manifest_freebsd.c#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_private.h#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_repo.c#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_repo.h#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_repo_files.c#5 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_repo_ftp.c#5 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_repo_local_freebsd.c#6 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_repo_private.h#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_sandbox.c#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_sandbox.h#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_sandbox_private.h#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_util.c#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkgfile.c#6 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/scripts/styleify.pl#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/trunk/tools/pkg_create/main.c#4 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/add/section.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/add/section.h#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/base.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/base.h#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/check/section.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/check/section.h#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/clean/section.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/clean/section.h#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/delete/section.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/delete/section.h#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/info/pkg_action_info.h#3 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/info/section.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/info/section.h#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/show/section.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/show/section.h#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/sign/section.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/sign/section.h#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/update/section.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/update/section.h#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/version/section.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/version/section.h#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_add_arg_parser.c#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_add_arg_parser.h#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_arg_parser.c#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_arg_parser.h#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_check_arg_parser.c#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_check_arg_parser.h#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_clean_arg_parser.c#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_clean_arg_parser.h#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_delete_arg_parser.c#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_delete_arg_parser.h#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_info_arg_parser.c#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_info_arg_parser.h#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_show_arg_parser.c#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_show_arg_parser.h#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_sign_arg_parser.c#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_sign_arg_parser.h#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_update_arg_parser.c#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_update_arg_parser.h#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_version_arg_parser.c#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_version_arg_parser.h#3 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/main.c#6 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/pkgman.h#4 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/register/INCOMPLETE_SOURCES#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/register/connection_manage.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/register/db_manage.c#2 edit .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/register/main.c#2 edit Differences ... ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/archive_read_open_stream.c#3 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/macros.h#3 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg.c#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg.h#5 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_db.c#6 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_db.h#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_db_freebsd.c#8 (text+ko) ==== @@ -52,8 +52,9 @@ int empty_dirs; /* Used in the removal of files */ struct pkg_db *db; const char *last_dir; - char last_file[FILENAME_MAX]; + char last_file[FILENAME_MAX+1]; char directory[MAXPATHLEN]; + char display_file[FILENAME_MAX+1]; }; /* @@ -189,7 +190,7 @@ int force, pkg_db_action *pkg_action) { struct pkg_install_data install_data; - char cwd[MAXPATHLEN]; + char cwd[MAXPATHLEN+1]; assert(db != NULL); assert(pkg != NULL); @@ -200,13 +201,17 @@ /* Set the package environment */ if (prefix == NULL) { + const char *pkg_prefix = pkg_get_prefix(pkg); - if (pkg_prefix == NULL) + if (pkg_prefix == NULL) { setenv("PKG_PREFIX", "/usr/local", 1); - else + } else { setenv("PKG_PREFIX", pkg_prefix, 1); - } else + } + + } else { setenv("PKG_PREFIX", prefix, 1); + } pkg_action(PKG_DB_PACKAGE, "Package name is %s", pkg_get_name(pkg)); ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_db_match.c#5 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_db_private.h#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_freebsd.c#7 (text+ko) ==== @@ -118,7 +118,7 @@ * * This creates a pkg object from a given file pointer. * It is able to then manipulate the package and install the it to the pkg_db. - * @todo Write + * * @return A new package object or NULL */ struct pkg * ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_freebsd.h#3 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_freebsd_contents.c#5 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_freebsd_lexer.l#3 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_freebsd_parser.y#3 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_freebsd_private.h#3 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_manifest.c#3 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_manifest_freebsd.c#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_private.h#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_repo.c#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_repo.h#3 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_repo_files.c#5 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_repo_ftp.c#5 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_repo_local_freebsd.c#6 (text+ko) ==== @@ -42,6 +42,11 @@ static struct pkg *file_get_pkg(struct pkg_repo *, const char *); +struct local_freebsd_repo { + char *path; + +}; + /** * @defgroup PackageRepoLocalFreebsd FreeBSD local files repository * @ingroup PackageRepo ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_repo_private.h#3 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_sandbox.c#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_sandbox.h#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_sandbox_private.h#4 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_util.c#3 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkgfile.c#6 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/scripts/styleify.pl#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/add/section.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/add/section.h#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/base.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/base.h#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/check/section.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/check/section.h#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/clean/section.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/clean/section.h#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/delete/section.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/delete/section.h#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/info/section.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/info/section.h#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/show/section.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/show/section.h#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/sign/section.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/sign/section.h#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/update/section.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/update/section.h#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/version/section.c#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/version/section.h#2 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_add_arg_parser.c#3 (text+ko) ==== @@ -1,1 +1,59 @@ #include "pkg_add_arg_parser.h" + +void +parse_args() +{ + + while ((ch = getopt(argc, argv, options)) != -1) { + switch(ch) { + case 'C': + strlcpy(add.chroot, optarg, PATH_MAX); + break; + case 'f': + add.flags |= force_flag; + break; + case 'I': + add.flags |= no_run_script_flag; + break; + case 'K': + /* Save the package file in . or ${PKGDIR} */ + add.flags |= keep_file_flag; + break; + case 'M': + errx(1, "Unsupported argument"); + break; + case 'n': + add.flags |= no_run_flag; + break; + case 'P': + add.base_prefix = optarg; + add.prefix = optarg; + break; + case 'p': + add.base_prefix = optarg; + add.prefix = NULL; + break; + case 'R': + add.flags |= no_record_install_flag; + break; + case 'r': + remote = 1; + break; + case 'S': + errx(1, "Unsupported argument"); + break; + case 't': + errx(1, "The -t argument is unneeded as the staging area is unused"); + break; + case 'v': + add.flags |= verbosity_flag; + break; + case 'h': + case '?': + default: + usage(); + break; + } + } + +} ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_add_arg_parser.h#3 (text+ko) ==== @@ -1,0 +1,7 @@ +#ifndef __PKG_ACT_ADD_AP_H + +#define __PKG_ACT_ADD_AP_H + + + +#endif ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_arg_parser.c#3 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_arg_parser.h#3 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_check_arg_parser.c#3 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_check_arg_parser.h#3 (text+ko) ==== @@ -1,0 +1,7 @@ +#ifndef __PKG_ACT_CHECK_AP_H + +#define __PKG_ACT_CHECK_AP_H + + + +#endif ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_clean_arg_parser.c#3 (text+ko) ==== @@ -1,1 +1,3 @@ -#include "pkg_add_arg_parser.h" +#include "pkg_action_clean_arg_parser.h" + + ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_clean_arg_parser.h#3 (text+ko) ==== @@ -1,0 +1,7 @@ +#ifndef __PKG_ACT_CLEAN_AP_H + +#define __PKG_ACT_CLEAN_AP_H + + + +#endif ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_delete_arg_parser.c#3 (text+ko) ==== @@ -1,1 +1,49 @@ #include "pkg_add_arg_parser.h" + +int +parse() +{ + + /** Parse args **/ + { + + case 'a': + delete.match_type = PKG_DB_MATCH_ALL; + break; + case 'd': + delete.flags |= remove_empty_dirs_flag; + break; + case 'D': + delete.flags |= no_run_script_flag; + break; + case 'f': + delete.flags |= force_flag; + break; + case 'G': + delete.match_type = PKG_DB_MATCH_EXACT; + break; + case 'i': + delete.flags |= interactive_flag; + break; + case 'n': + delete.flags |= no_run_flag; + break; + case 'p': + delete.prefix = optarg; + errx(1, "Unsupported argument"); + break; + case 'r': + delete.flags |= recursive_flag; + break; + case 'v': + delete.flags |= verbosity_flag; + break; + case 'x': + delete.match_type = PKG_DB_MATCH_REGEX; + break; + case 'X': + delete.match_type = PKG_DB_MATCH_EREGEX; + + } + +} ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_delete_arg_parser.h#3 (text+ko) ==== @@ -1,0 +1,7 @@ +#ifndef __PKG_ACT_DELETE_AP_H + +#define __PKG_ACT_DELETE_AP_H + + + +#endif ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_info_arg_parser.c#3 (text+ko) ==== @@ -1,1 +1,112 @@ #include "pkg_add_arg_parser.h" + +int +parse() +{ + + /** getopt blah goes here.. **/ + { + + case 'a': + info.match_type = MATCH_ALL; + break; + case 'b': + info.use_blocksize = 1; + break; + case 'c': + info.flags |= SHOW_COMMENT; + break; + case 'd': + info.flags |= SHOW_DESC; + break; + case 'D': + info.flags |= SHOW_DISPLAY; + break; + case 'e': + info.check_package = optarg; + break; + case 'E': + info.flags |= SHOW_PKGNAME; + break; + case 'f': + info.flags |= SHOW_PLIST; + break; + case 'g': + info.flags |= SHOW_CKSUM; + break; + case 'G': + info.match_type = MATCH_EXACT; + break; + case 'i': + info.flags |= SHOW_INSTALL; + break; + case 'I': + info.flags |= SHOW_INDEX; + break; + case 'j': + info.flags |= SHOW_REQUIRE; + break; + case 'k': + info.flags |= SHOW_DEINSTALL; + break; + case 'l': + info.separator = optarg; + break; + case 'L': + info.flags |= SHOW_FILES; + break; + case 'm': + info.flags |= SHOW_MTREE; + break; + case 'o': + info.flags |= SHOW_ORIGIN; + break; + case 'O': + info.origin = optarg; + break; + case 'p': + info.flags |= SHOW_PREFIX; + break; + case 'P': + info.flags |= SHOW_PTREV; + break; + case 'q': + info.quiet = 1; + break; + case 'Q': + info.quiet = 2; + break; + case 'r': + info.flags |= SHOW_DEPEND; + break; + case 'R': + info.flags |= SHOW_REQBY; + break; + case 's': + info.flags |= SHOW_SIZE; + break; + case 't': + errx(1, "Unsupported argument"); + break; + case 'V': + info.flags |= SHOW_FMTREV; + break; + case 'W': + /* 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; + break; + case 'X': + info.match_type = MATCH_EREGEX; + + } + +} ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_info_arg_parser.h#3 (text+ko) ==== @@ -1,0 +1,7 @@ +#ifndef __PKG_ACT_INFO_AP_H + +#define __PKG_ACT_INFO_AP_H + + + +#endif ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_show_arg_parser.c#3 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_show_arg_parser.h#3 (text+ko) ==== @@ -1,0 +1,7 @@ +#ifndef __PKG_ACT_SHOW_AP_H + +#define __PKG_ACT_SHOW_AP_H + + + +#endif ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_sign_arg_parser.c#3 (text+ko) ==== @@ -1,1 +1,37 @@ #include "pkg_add_arg_parser.h" + +int +parse() +{ + + case 't': + if (strcmp(optarg, "pgp") == 0) + type = TAG_PGP; + else if (strcmp(optarg, "sha1") == 0) + type = TAG_SHA1; + else if (strcmp(optarg, "x509") == 0) + type = TAG_X509; + else + usage(); + break; + case 'u': + userid = strdup(optarg); + break; + + case 'k': + userkey = optarg; + break; + + case 'q': + quiet = 1; + break; + +#ifndef CHECKER_ONLY + case 's': + mode = SIGN; + break; +#endif + case 'c': + mode = CHECK; + +} ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_sign_arg_parser.h#3 (text+ko) ==== @@ -1,0 +1,7 @@ +#ifndef __PKG_ACT_SIGN_AP_H + +#define __PKG_ACT_SIGN_AP_H + + + +#endif ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_update_arg_parser.c#3 (text+ko) ==== ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_update_arg_parser.h#3 (text+ko) ==== @@ -1,0 +1,7 @@ +#ifndef __PKG_ACT_UPDATE_AP_H + +#define __PKG_ACT_UPDATE_AP_H + + + +#endif ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_version_arg_parser.c#3 (text+ko) ==== @@ -1,1 +1,53 @@ #include "pkg_add_arg_parser.h" + +int +parse() +{ + + /* + * Use /usr/ports/INDEX* instead of the Makefiles for version + * comparison bases. + */ + case 'I': + 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': + version.flags |= QUIET; + break; + + case 's': + MatchName = optarg; + break; + + case 'O': + LookUpOrigin = optarg; + break; + + case 'o': + version.flags |= VERSION_SHOW_PKG_ORIGIN; + break; + + case 't': + errx(2, "Invalid -t usage."); + break; + + case 'T': + errx(2, "Invalid -T usage."); + break; + + case 'X': + version.match_type = MATCH_EREGEX; + break; + +} ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/ap/pkg_action_version_arg_parser.h#3 (text+ko) ==== @@ -1,0 +1,7 @@ +#ifndef __PKG_ACT_VERSION_AP_H + +#define __PKG_ACT_VERSION_AP_H + + + +#endif ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/main.c#6 (text+ko) ==== @@ -8,11 +8,11 @@ main(int argc, char **argv) { + char action_type; + char *cmd_str; char **optional_opt_str_p; - uint64 global_flags = 0; - pkg_action_arg_parser parsers[COMMAND_LENGTH-1]; STAILQ_HEAD(fpkg_actions_stailq, freebsd_pkg_action) fpkg_actions_queue_head = @@ -25,106 +25,119 @@ optional_opt_str_p = (char**) malloc(sizeof(char*)+1); if (0 == strcmp(cmd_str, ADD)) { - action_type = add; + action_type = _pkg_add; } else if (0 == strcmp(cmd_str, CLEAN)) { - action_type = clean; + action_type = _pkg_clean; } else if (0 == strcmp(cmd_str, CHECK)) { - action_type = check; + action_type = _pkg_check; } else if (0 == strcmp(cmd_str, CREATE)) { - action_type = create; + action_type = _pkg_create; } else if (0 == strcmp(cmd_str, DELETE)) { - action_type = delete; + action_type = _pkg_delete; } else if (0 == strcmp(cmd_str, INFO)) { - action_type = info; + action_type = _pkg_info; } else if (0 == strcmp(cmd_str, SEARCH)) { - action_type = search; + action_type = _pkg_search; } else if (0 == strcmp(cmd_str, SIGN)) { - action_type = sign; + action_type = _pkg_sign; } else if (0 == strcmp(cmd_str, UPDATE)) { - action_type = update; + action_type = _pkg_update; } else if (0 == strcmp(cmd_str, VERSION)) { - action_type = version; + action_type = _pkg_version; } else { - action_type = NULL; + action_type = _pkg_null; } - /** Skip over command string.. **/ - optind = OPTION_OFFSET; + /* + * Global command args parsing is in following block. + * + * Skip over the _pkg_null option, as no one prescribed + * what action should be performed.. + */ + if (action_type != _pkg_null) { + + /** Skip over action / command string.. **/ + optind = OPTION_OFFSET; - char opt_char; + char opt_char; - int old_optind; - int optional_opts_ind; - int i; + int old_optind; + int optional_opts_ind; + int i; - /** Preset the initial counter variables to 0. **/ - old_optind = optional_opts_ind = 0; + /** Preset the initial counter variables to 0. **/ + old_optind = optional_opts_ind = 0; - /** Don't error out on unknown / non-globally applied flags, yet.. **/ - opterr = 0; + /** Don't error out on unknown / non-globally applied flags, yet.. **/ + opterr = 0; - /** Parse in global arguments **/ - while ( (opt_char = getopt(argc, argv, GLOBAL_OPT_STRING)) != -1 ) { + /** Parse in global arguments **/ + while ( (opt_char = getopt(argc, argv, GLOBAL_OPT_STRING)) != -1 ) { - switch (opt_char) { - /** Force **/ - case 'f': - global_settings->opts |= FORCE_FLAG; - break; - /** Interactive **/ - case 'i': - global_settings->opts |= INTERACTIVE_FLAG; - break; - /** No-exec command **/ - case 'o': - if (optarg != NULL && strlen(optarg)) { - char *tmp_pkg_origin; - strdup(tmp_pkg_origin, optarg); - /* - * @todo: Add tmp_pkg_origin to STAILQ here - * with origin names.. - * - * Does this get freed with pkg_freebsd_pkg_new - * (or whatever the constructor was..)? - */ + switch (opt_char) { + /** Force **/ + case 'f': + global_settings->iu_opts |= FORCE_FLAG; + break; + /** Interactive **/ + case 'i': + global_settings->iu_opts |= INTERACTIVE_FLAG; + break; + /** No-exec command **/ + case 'o': + if (optarg != NULL && strlen(optarg)) { + char *tmp_pkg_origin; + strdup(tmp_pkg_origin, optarg); + /* + * @todo: Add tmp_pkg_origin to STAILQ here + * with origin names.. + * + * Does this get freed with pkg_freebsd_pkg_new + * (or whatever the constructor was..)? + */ + } + break; + /** Prefix **/ + case 'p': + if (optarg != NULL && strlen(optarg)) { + strdup(global_settings->prefix_path_str, optarg); + } else { + + } + break; + /** Quiet **/ + case 'q': + if (global_settings->opts & VERBOSE_FLAG) { + errx(QV_ERR_MSG); + } + global_settings->iu_opts |= QUIET_FLAG; + break; + /** Recursive **/ + case 'r': + global_settings->misc_opts |= RECURSIVE_FLAG; + break; + /** Verbose **/ + case 'v': + if (global_settings->opts & QUIET_FLAG) { + errx(QV_ERR_MSG); + } + global_settings->iu_opts |= VERBOSE_FLAG; + break; } - break; - /** Prefix **/ - case 'p': - if (optarg != NULL && strlen(optarg)) { - strdup(global_settings->prefix_path_str, optarg); + + /* + * Copy down all char* pointers to optional_opt_str_p to parse + * later on [in pkg_action_arg_parser->parse_args(..)].. + */ + for (i = old_optind; i < optind; i++) { >>> TRUNCATED FOR MAIL (1000 lines) <<<