9b71965 Concat all the header file of the cli — HardenedBSD-pkg

modified pkg/Makefile

@@ -28,7 +28,7 @@ MANDIR= ${PREFIX}/man/man

 .if exists(../.git) && exists(/usr/local/bin/git)
 GITHASH!=	git rev-parse HEAD
 CFLAGS+=	-DGITHASH=\"${GITHASH}\"
 CFLAGS+=	-DGITHASH="\" ${GITHASH}\""
 .endif
 DEBUG_FLAGS+=	-g -O0

modified pkg/add.c

@@ -11,7 +11,7 @@

 #include <pkg.h>
 #include "add.h"
 #include "pkgcli.h"
 static int
 is_url(const char * const pattern)

deleted pkg/add.h

@@ -1,7 +0,0 @@

 #ifndef _ADD_H
 #define _ADD_H
 int exec_add(int, char **);
 void usage_add(void);
 #endif

modified pkg/audit.c

@@ -15,7 +15,7 @@

 #include <pkg.h>
 #include "audit.h"
 #include "pkgcli.h"
 #define AUDIT_URL "http://portaudit.FreeBSD.org/auditfile.tbz"

deleted pkg/audit.h

@@ -1,7 +0,0 @@

 #ifndef _AUDIT_H
 #define _AUDIT_H
 int exec_audit(int, char **);
 void usage_audit(void);
 #endif

modified pkg/autoremove.c

@@ -12,8 +12,7 @@

 #include <pkg.h>
 #include "utils.h"
 #include "autoremove.h"
 #include "pkgcli.h"
 void
 usage_autoremove(void)

deleted pkg/autoremove.h

@@ -1,7 +0,0 @@

 #ifndef _AUTOREMOVE_H
 #define _AUTOREMOVE_H
 int exec_autoremove(int, char **);
 void usage_autoremove(void);
 #endif

modified pkg/backup.c

@@ -1,7 +1,7 @@

 #include <pkg.h>
 #include <sysexits.h>
 #include "backup.h"
 #include "pkgcli.h"
 void
 usage_backup(void)

deleted pkg/backup.h

@@ -1,6 +0,0 @@

 #ifndef _BACKUP_H
 #define _BACKUP_H
 int exec_backup(int, char **);
 void usage_backup(void);
 #endif

modified pkg/check.c

@@ -12,8 +12,7 @@

 #include <pkg.h>
 #include "check.h"
 #include "utils.h"
 #include "pkgcli.h"
 struct deps_entry {
 	char *name;

deleted pkg/check.h

@@ -1,7 +0,0 @@

 #ifndef _CHECK_H
 #define _CHECK_H
 int exec_check(int, char **);
 void usage_check(void);
 #endif

modified pkg/clean.c

@@ -8,7 +8,7 @@

 #include <string.h>
 #include <unistd.h>
 #include "clean.h"
 #include "pkgcli.h"
 void
 usage_clean(void)

deleted pkg/clean.h

@@ -1,7 +0,0 @@

 #ifndef _CLEAN_H
 #define _CLEAN_H
 int exec_clean(int, char **);
 void usage_clean(void);
 #endif

modified pkg/create.c

@@ -7,8 +7,7 @@

 #include <unistd.h>
 #include <sysexits.h>
 #include "create.h"
 #include "utils.h"
 #include "pkgcli.h"
 void
 usage_create(void)

deleted pkg/create.h

@@ -1,7 +0,0 @@

 #ifndef _CREATE_H
 #define _CREATE_H
 int exec_create(int, char **);
 void usage_create(void);
 #endif

modified pkg/delete.c

@@ -9,8 +9,7 @@

 #include <pkg.h>
 #include "utils.h"
 #include "delete.h"
 #include "pkgcli.h"
 void
 usage_delete(void)

deleted pkg/delete.h

@@ -1,7 +0,0 @@

 #ifndef _DELETE_H
 #define _DELETE_H
 void usage_delete(void);
 int exec_delete(int, char **);
 #endif

modified pkg/event.c

@@ -5,7 +5,7 @@

 #include "pkg.h"
 #include "progressmeter.h"
 #include "event.h"
 #include "pkgcli.h"
 static off_t fetched = 0;
 static char url[MAXPATHLEN+1];

deleted pkg/event.h

@@ -1,6 +0,0 @@

 #ifndef __PKG_EVENT_H__
 #define	__PKG_EVENT_H__
 int event_callback(void *data, struct pkg_event *ev);
 #endif

modified pkg/info.c

@@ -9,8 +9,7 @@

 #include <sysexits.h>
 #include <unistd.h>
 #include "info.h"
 #include "utils.h"
 #include "pkgcli.h"
 enum sign {
 	LT,

deleted pkg/info.h

@@ -1,7 +0,0 @@

 #ifndef _INFO_H
 #define _INFO_H
 int exec_info(int, char **);
 void usage_info(void);
 #endif

modified pkg/install.c

@@ -11,8 +11,7 @@

 #include <pkg.h>
 #include "utils.h"
 #include "install.h"
 #include "pkgcli.h"
 void
 usage_install(void)

@@ -127,12 +126,12 @@ exec_install(int argc, char **argv)

 	humanize_number(size, sizeof(size), dlsize, "B", HN_AUTOSCALE, 0);
 	printf("%s to be downloaded\n", size);
 	if (yes == false)
 	if (!yes)
 		pkg_config_bool(PKG_CONFIG_ASSUME_ALWAYS_YES, &yes);
 	if (yes == false)
 	if (!yes)
 		yes = query_yesno("\nProceed with installing packages [y/N]: ");
 	if (yes == true)
 	if (yes)
 		if (pkg_jobs_apply(jobs, 0) != EPKG_OK)
 			goto cleanup;

deleted pkg/install.h

@@ -1,7 +0,0 @@

 #ifndef _INSTALL_H
 #define _INSTALL_H
 int exec_install(int, char **);
 void usage_install(void);
 #endif

modified pkg/main.c

@@ -12,30 +12,11 @@

 #include <pkg.h>
 #include "add.h"
 #include "audit.h"
 #include "autoremove.h"
 #include "backup.h"
 #include "check.h"
 #include "clean.h"
 #include "create.h"
 #include "delete.h"
 #include "event.h"
 #include "info.h"
 #include "install.h"
 #include "query.h"
 #include "register.h"
 #include "repo.h"
 #include "search.h"
 #include "update.h"
 #include "updating.h"
 #include "upgrade.h"
 #include "version.h"
 #include "which.h"
 #include "pkgcli.h"
 #define PKGVERSION "1.0-beta1"
 #ifndef GITHASH
 #define GITHASH "unknown"
 #define GITHASH ""
 #endif
 static void usage(void);

@@ -163,7 +144,7 @@ main(int argc, char **argv)

 				jail_str = optarg;
 				break;
 			case 'v':
 				printf("%s %s\n", PKGVERSION, GITHASH);
 				printf(PKGVERSION""GITHASH"\n");
 				exit(EXIT_SUCCESS);
 				break; /* NOT REACHED */
 			default:

added pkg/pkgcli.h

@@ -0,0 +1,111 @@

 #ifndef _PKGCLI_H
 #define _PKGCLI_H
 /* pkg add */
 int exec_add(int, char **);
 void usage_add(void);
 /* pkg audit */
 int exec_audit(int, char **);
 void usage_audit(void);
 /* pkg autoremove */
 int exec_autoremove(int, char **);
 void usage_autoremove(void);
 /* pkg backup */
 int exec_backup(int, char **);
 void usage_backup(void);
 /* pkg check */
 int exec_check(int, char **);
 void usage_check(void);
 /* pkg clean */
 int exec_clean(int, char **);
 void usage_clean(void);
 /* pkg create */
 int exec_create(int, char **);
 void usage_create(void);
 /* pkg delete */
 void usage_delete(void);
 int exec_delete(int, char **);
 /* pkg info */
 int exec_info(int, char **);
 void usage_info(void);
 /* pkg install */
 int exec_install(int, char **);
 void usage_install(void);
 /* pkg query */
 int exec_query(int, char **);
 void usage_query(void);
 /* pkg register */
 void usage_register(void);
 int exec_register(int argc, char **argv);
 /* pkg repo */
 int exec_repo(int, char **);
 void usage_repo(void);
 /* pkg search */
 int exec_search(int, char **);
 void usage_search(void);
 /* pkg update */
 int exec_update(int, char **);
 void usage_update(void);
 /* pkg updating */
 int exec_updating(int, char **);
 void usage_updating(void);
 /* pkg upgrade */
 int exec_upgrade(int, char **);
 void usage_upgrade(void);
 /* pkg version */
 #define VERSION_INDEX (1<<0)
 #define VERSION_ORIGIN (1<<1)
 #define VERSION_QUIET (1<<2)
 #define VERSION_VERBOSE (1<<3)
 #define VERSION_STATUS (1<<4)
 #define VERSION_NOSTATUS (1<<5)
 #define VERSION_EREGEX (1<<6)
 #define VERSION_STRING (1<<7)
 #define VERSION_WITHORIGIN (1<<8)
 #define VERSION_TESTVERSION (1<<9)
 #define VERSION_TESTPATTERN (1<<10)
 int exec_version(int, char **);
 void usage_version(void);
 /* pkg which */
 int exec_which(int, char **);
 void usage_which(void);
 /* utils */
 #define INFO_PRINT_DEP (1<<0)
 #define INFO_PRINT_RDEP (1<<1)
 #define INFO_EXISTS (1<<2)
 #define INFO_LIST_FILES (1<<3)
 #define INFO_SIZE (1<<4)
 #define INFO_QUIET (1<<5)
 #define INFO_ORIGIN (1<<6)
 #define INFO_ORIGIN_SEARCH (1<<7)
 #define INFO_PREFIX (1<<8)
 #define INFO_FULL (1<<9)
 #define INFO_RAW (1<<10)
 bool query_yesno(const char *msg);
 int print_info(struct pkg * const pkg, unsigned int opt);
 char *absolutepath(const char *src, char *dest, size_t dest_len);
 int event_callback(void *data, struct pkg_event *ev);
 #endif

modified pkg/query.c

@@ -11,7 +11,7 @@

 #include <sysexits.h>
 #include <unistd.h>
 #include "query.h"
 #include "pkgcli.h"
 static struct query_flags {
         const char flag;

modified pkg/register.c

@@ -13,7 +13,7 @@

 #include <stdbool.h>
 #include <regex.h>
 #include "register.h"
 #include "pkgcli.h"
 static const char * const scripts[] = {
 	"+INSTALL",

deleted pkg/register.h

@@ -1,6 +0,0 @@

 #ifndef _REGISTER_H
 #define _REGISTER_H
 void usage_register(void);
 int exec_register(int argc, char **argv);
 #endif

modified pkg/repo.c

@@ -5,10 +5,9 @@

 #include <readpassphrase.h>
 #include <pkg.h>
 #include <fcntl.h>
 #include "repo.h"
 #include "pkgcli.h"
 void
 usage_repo(void)

deleted pkg/repo.h

@@ -1,7 +0,0 @@

 #ifndef _REPO_H
 #define _REPO_H
 int exec_repo(int, char **);
 void usage_repo(void);
 #endif

modified pkg/search.c

@@ -6,8 +6,7 @@

 #include <pkg.h>
 #include "search.h"
 #include "utils.h"
 #include "pkgcli.h"
 void
 usage_search(void)

modified pkg/update.c

@@ -15,7 +15,7 @@

 #include <pkg.h>
 #include "update.h"
 #include "pkgcli.h"
 #define EXTRACT_ARCHIVE_FLAGS  (ARCHIVE_EXTRACT_OWNER |ARCHIVE_EXTRACT_PERM| \
 		ARCHIVE_EXTRACT_TIME  |ARCHIVE_EXTRACT_ACL | \

deleted pkg/update.h

@@ -1,7 +0,0 @@

 #ifndef _UPDATE_H
 #define _UPDATE_H
 int exec_update(int, char **);
 void usage_update(void);
 #endif

modified pkg/updating.c

@@ -9,7 +9,7 @@

 #include <sysexits.h>
 #include <unistd.h>
 #include "updating.h"
 #include "pkgcli.h"
 struct installed_ports {
 	char *origin;

deleted pkg/updating.h

@@ -1,7 +0,0 @@

 #ifndef _UPDATING_H
 #define _UPDATING_H
 int exec_updating(int, char **);
 void usage_updating(void);
 #endif

modified pkg/upgrade.c

@@ -12,8 +12,7 @@

 #include <pkg.h>
 #include "upgrade.h"
 #include "utils.h"
 #include "pkgcli.h"
 void
 usage_upgrade(void)

deleted pkg/upgrade.h

@@ -1,7 +0,0 @@

 #ifndef _UPGRADE_H
 #define _UPGRADE_H
 int exec_upgrade(int, char **);
 void usage_upgrade(void);
 #endif

modified pkg/utils.c

@@ -8,7 +8,7 @@

 #include <unistd.h>
 #include <pkg.h>
 #include "utils.h"
 #include "pkgcli.h"
 bool
 query_yesno(const char *msg)

deleted pkg/utils.h

@@ -1,20 +0,0 @@

 #ifndef _UTILS_H
 #define _UTILS_H
 #define INFO_PRINT_DEP (1<<0)
 #define INFO_PRINT_RDEP (1<<1)
 #define INFO_EXISTS (1<<2)
 #define INFO_LIST_FILES (1<<3)
 #define INFO_SIZE (1<<4)
 #define INFO_QUIET (1<<5)
 #define INFO_ORIGIN (1<<6)
 #define INFO_ORIGIN_SEARCH (1<<7)
 #define INFO_PREFIX (1<<8)
 #define INFO_FULL (1<<9)
 #define INFO_RAW (1<<10)
 bool query_yesno(const char *msg);
 int print_info(struct pkg * const pkg, unsigned int opt);
 char *absolutepath(const char *src, char *dest, size_t dest_len);
 #endif

modified pkg/version.c

@@ -15,7 +15,7 @@

 #include <unistd.h>
 #include <fnmatch.h>
 #include "version.h"
 #include "pkgcli.h"
 struct index_entry {
 	char *origin;

deleted pkg/version.h

@@ -1,19 +0,0 @@

 #ifndef _VERSION_H
 #define _VERSION_H
 #define VERSION_INDEX (1<<0)
 #define VERSION_ORIGIN (1<<1)
 #define VERSION_QUIET (1<<2)
 #define VERSION_VERBOSE (1<<3)
 #define VERSION_STATUS (1<<4)
 #define VERSION_NOSTATUS (1<<5)
 #define VERSION_EREGEX (1<<6)
 #define VERSION_STRING (1<<7)
 #define VERSION_WITHORIGIN (1<<8)
 #define VERSION_TESTVERSION (1<<9)
 #define VERSION_TESTPATTERN (1<<10)
 int exec_version(int, char **);
 void usage_version(void);
 #endif

modified pkg/which.c

@@ -9,8 +9,7 @@

 #include <unistd.h>
 #include <sysexits.h>
 #include "which.h"
 #include "utils.h"
 #include "pkgcli.h"
 void
 usage_which(void)

deleted pkg/which.h

@@ -1,7 +0,0 @@

 #ifndef _WHICH_H
 #define _WHICH_H
 int exec_which(int, char **);
 void usage_which(void);
 #endif