moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-11-10 19:45:01 -05:00
Code Issues Releases Wiki Activity

Allow alpm_depend_t to have a description

Browse Source 
This is the first step in parsing and handling optdepends. There is no
behavior change introduced in this commit; however, depends that contain
a ": " string will now be parsed as having a description and it will be
stored in the depend structure. Later patches will utilize this new
field as appropriate.

This is heavily based on the work of Benedikt, who did something similar
but introduced a new type for this rather than only a new field to the
existing type.

Heavily-influenced-by: Benedikt Morbach <benedikt.morbach@googlemail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2011-12-12 13:34:48 -06:00
parent 6a636b2b6e
commit 00f29cbc14
2 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/libalpm/alpm.h
View File

@ -136,6 +136,7 @@ typedef struct __alpm_trans_t alpm_trans_t;
typedef struct _alpm_depend_t { typedef struct _alpm_depend_t {
char *name; char *name;
char *version; char *version;
char *desc;
unsigned long name_hash; unsigned long name_hash;
alpm_depmod_t mod; alpm_depmod_t mod;
} alpm_depend_t; } alpm_depend_t;

40
lib/libalpm/deps.c
View File

@ -39,6 +39,7 @@ void _alpm_dep_free(alpm_depend_t *dep)
{ {
FREE(dep->name); FREE(dep->name);
FREE(dep->version); FREE(dep->version);
FREE(dep->desc);
FREE(dep); FREE(dep);
} }
@ -409,7 +410,7 @@ int _alpm_depcmp(alpm_pkg_t *pkg, alpm_depend_t *dep)
alpm_depend_t *_alpm_splitdep(const char *depstring) alpm_depend_t *_alpm_splitdep(const char *depstring)
{ {
alpm_depend_t *depend; alpm_depend_t *depend;
const char *ptr, *version; const char *ptr, *version, *desc;
size_t deplen; size_t deplen;
if(depstring == NULL) { if(depstring == NULL) {
@ -417,7 +418,17 @@ alpm_depend_t *_alpm_splitdep(const char *depstring)
} }
MALLOC(depend, sizeof(alpm_depend_t), return NULL); MALLOC(depend, sizeof(alpm_depend_t), return NULL);
/* Note the extra space in ": " to avoid matching the epoch */
if((desc = strstr(depstring, ": ")) != NULL) {
STRDUP(depend->desc, desc + 2, return NULL);
deplen = desc - depstring;
} else {
/* no description- point desc at NULL at end of string for later use */
depend->desc = NULL;
deplen = strlen(depstring); deplen = strlen(depstring);
desc = depstring + deplen;
}
/* Find a version comparator if one exists. If it does, set the type and /* Find a version comparator if one exists. If it does, set the type and
* increment the ptr accordingly so we can copy the right strings. */ * increment the ptr accordingly so we can copy the right strings. */
@ -442,21 +453,18 @@ alpm_depend_t *_alpm_splitdep(const char *depstring)
depend->mod = ALPM_DEP_MOD_EQ; depend->mod = ALPM_DEP_MOD_EQ;
version = ptr + 1; version = ptr + 1;
} else { } else {
/* no version specified, leave ptr NULL and set version to NULL */ /* no version specified, set ptr to end of string and version to NULL */
ptr = depstring + deplen;
depend->mod = ALPM_DEP_MOD_ANY; depend->mod = ALPM_DEP_MOD_ANY;
depend->version = NULL; depend->version = NULL;
version = NULL; version = NULL;
} }
/* copy the right parts to the right places */ /* copy the right parts to the right places */
if(ptr) {
STRNDUP(depend->name, depstring, ptr - depstring, return NULL); STRNDUP(depend->name, depstring, ptr - depstring, return NULL);
} else {
STRDUP(depend->name, depstring, return NULL);
}
depend->name_hash = _alpm_hash_sdbm(depend->name); depend->name_hash = _alpm_hash_sdbm(depend->name);
if(version) { if(version) {
STRDUP(depend->version, version, return NULL); STRNDUP(depend->version, version, desc - version, return NULL);
} }
return depend; return depend;
@ -468,8 +476,9 @@ alpm_depend_t *_alpm_dep_dup(const alpm_depend_t *dep)
CALLOC(newdep, 1, sizeof(alpm_depend_t), return NULL); CALLOC(newdep, 1, sizeof(alpm_depend_t), return NULL);
STRDUP(newdep->name, dep->name, return NULL); STRDUP(newdep->name, dep->name, return NULL);
newdep->name_hash = dep->name_hash;
STRDUP(newdep->version, dep->version, return NULL); STRDUP(newdep->version, dep->version, return NULL);
STRDUP(newdep->desc, dep->desc, return NULL);
newdep->name_hash = dep->name_hash;
newdep->mod = dep->mod; newdep->mod = dep->mod;
return newdep; return newdep;
@ -792,7 +801,7 @@ int _alpm_resolvedeps(alpm_handle_t *handle, alpm_list_t *localpkgs,
*/ */
char SYMEXPORT *alpm_dep_compute_string(const alpm_depend_t *dep) char SYMEXPORT *alpm_dep_compute_string(const alpm_depend_t *dep)
{ {
const char *name, *opr, *ver; const char *name, *opr, *ver, *desc_delim, *desc;
char *str; char *str;
size_t len; size_t len;
@ -834,12 +843,21 @@ char SYMEXPORT *alpm_dep_compute_string(const alpm_depend_t *dep)
ver = ""; ver = "";
} }
if(dep->desc) {
desc_delim = ": ";
desc = dep->desc;
} else {
desc_delim = "";
desc = "";
}
/* we can always compute len and print the string like this because opr /* we can always compute len and print the string like this because opr
* and ver will be empty when ALPM_DEP_MOD_ANY is the depend type. the * and ver will be empty when ALPM_DEP_MOD_ANY is the depend type. the
* reassignments above also ensure we do not do a strlen(NULL). */ * reassignments above also ensure we do not do a strlen(NULL). */
len = strlen(name) + strlen(opr) + strlen(ver) + 1; len = strlen(name) + strlen(opr) + strlen(ver)
+ strlen(desc_delim) + strlen(desc) + 1;
MALLOC(str, len, return NULL); MALLOC(str, len, return NULL);
snprintf(str, len, "%s%s%s", name, opr, ver); snprintf(str, len, "%s%s%s%s%s", name, opr, ver, desc_delim, desc);
return str; return str;
} }