emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replaced config/system {repo,preserve,virtualpkg}.d with a single directory.

Browse Source 
See the NEWS file for more information.
This commit is contained in:
Juan RP
2014-11-06 09:58:04 +01:00
parent 578c3add0c
commit 5b522109f7
38 changed files with 278 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
include/xbps.h.in
View File

@@ -48,7 +48,7 @@
*
* This header documents the full API for the XBPS Library.
*/
#define XBPS_API_VERSION "20141104"
#define XBPS_API_VERSION "20141105"
#ifndef XBPS_VERSION
#define XBPS_VERSION "UNSET"
@@ -68,12 +68,12 @@
* @def XBPS_SYSCONF_PATH
* Default configuration PATH to find XBPS_CONF_PLIST.
*/
#define XBPS_SYSDIR "/xbps"
#define XBPS_SYSDIR "/xbps.d"
#ifndef XBPS_SYSCONF_PATH
# define XBPS_SYSCONF_PATH "/etc" XBPS_SYSDIR
#endif
#ifndef XBPS_SYSDEFCONF_PATH
# define XBPS_SYSDEFCONF_PATH "usr/share" XBPS_SYSDIR
# define XBPS_SYSDEFCONF_PATH "/usr/share" XBPS_SYSDIR
#endif
/**
@@ -88,42 +88,6 @@
*/
#define XBPS_CACHE_PATH "var/cache/xbps"
/**
* @def XBPS_VPKG_PATH
* Configuration virtualpkg directory to store virtualpkg configuration files.
*/
#define XBPS_VPKG_PATH XBPS_SYSCONF_PATH "/virtualpkg.d"
/**
* @def XBPS_SYS_VPKG_PATH
* System virtualpkg PATH to store virtualpkg configuration files.
*/
#define XBPS_SYS_VPKG_PATH XBPS_SYSDEFCONF_PATH "/virtualpkg.d"
/**
* @def XBPS_REPOD_PATH
* Configuration directory to store repository configuration files.
*/
#define XBPS_REPOD_PATH XBPS_SYSCONF_PATH "/repo.d"
/**
* @def XBPS_SYS_REPOD_PATH
* System directory to store repository configuration files.
*/
#define XBPS_SYS_REPOD_PATH XBPS_SYSDEFCONF_PATH "/repo.d"
/**
* @def XBPS_PRESERVED_PATH
* Configuration directory to store preserve configuration files.
*/
#define XBPS_PRESERVED_PATH XBPS_SYSCONF_PATH "/preserve.d"
/**
* @def XBPS_SYS_PRESERVED_PATH
* System directory to store preserve configuration files.
*/
#define XBPS_SYS_PRESERVED_PATH XBPS_SYSDEFCONF_PATH "/preserve.d"
/**
* @def XBPS_PKGDB
* Filename for the package database.
@@ -160,12 +124,6 @@
*/
#define XBPS_REPOIDX_META "index-meta.plist"
/**
* @def XBPS_CONF_DEF
* Filename for the XBPS plist configuration file.
*/
#define XBPS_CONF_DEF XBPS_SYSCONF_PATH "/xbps.conf"
/**
* @def XBPS_FLAG_VERBOSE
* Verbose flag that can be used in the function callbacks to alter
@@ -586,11 +544,11 @@ struct xbps_handle {
*/
const char *target_arch;
/**
* @var conffile
* @var confdir
*
* Full path to the xbps configuration file.
* Full path to the xbps configuration directory.
*/
char conffile[XBPS_MAXPATH];
char confdir[XBPS_MAXPATH];
/**
* @var rootdir
*
@@ -1834,7 +1792,8 @@ bool xbps_pkg_arch_match(struct xbps_handle *xhp,
* @return A negative number is returned on error, 0 otherwise.
*/
int xbps_humanize_number(char *buf, int64_t bytes);
size_t xbps_strlcat(char *dest, const char *src, size_t siz);
size_t xbps_strlcpy(char *dest, const char *src, size_t siz);
/**
* Tests if pkgver is reverted by pkg
*