moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

Improve binpkg priorities, dynamically allocate mem, etc.

Browse source 
--HG--
extra : convert_revision : 479011aba6e9da4e5662137381e04042e762d428
This commit is contained in:
Juan RP 2008-12-27 22:19:04 +01:00
parent 86cdb7dae6
commit 926b1dfa4a
7 changed files with 167 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

36
lib/util.c
View file

@ -88,14 +88,15 @@ xbps_set_rootdir(const char *dir)
rootdir = dir;
}
bool
xbps_append_full_path(bool use_rootdir, char *buf, const char *basedir,
const char *plistf)
char *
xbps_append_full_path(bool use_rootdir, const char *basedir, const char *plist)
{
const char *env;
char *buf;
size_t len = 0;
assert(buf != NULL);
assert(plistf != NULL);
assert(plist != NULL);
if (basedir)
env = basedir;
@ -103,18 +104,31 @@ xbps_append_full_path(bool use_rootdir, char *buf, const char *basedir,
env = XBPS_META_PATH;
if (rootdir && use_rootdir) {
if (snprintf(buf, PATH_MAX - 1, "%s/%s/%s",
rootdir, env, plistf) < 0) {
len = strlen(rootdir) + strlen(env) + strlen(plist) + 2;
buf = malloc(len + 1);
if (buf == NULL) {
errno = ENOMEM;
return NULL;
}
if (snprintf(buf, len + 1, "%s/%s/%s",
rootdir, env, plist) < 0) {
errno = ENOSPC;
return false;
return NULL;
}
} else {
if (snprintf(buf, PATH_MAX - 1, "%s/%s",
env, plistf) < 0) {
len = strlen(env) + strlen(plist) + 1;
buf = malloc(len + 1);
if (buf == NULL) {
errno = ENOMEM;
return NULL;
}
if (snprintf(buf, len + 1, "%s/%s", env, plist) < 0) {
errno = ENOSPC;
return false;
return NULL;
}
}
return true;
return buf;
}