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

Punt STAILQ and just use TAILQ so we're a bit more portable.

Browse Source
This commit is contained in:
Roy Marples 2008-07-07 14:16:46 +00:00
parent 157db50df7
commit 7a6112d3b0
3 changed files with 34 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/includes/rc-misc.h
View File

@ -62,16 +62,6 @@
#endif #endif
/* Some libc implemntations don't have these */ /* Some libc implemntations don't have these */
#ifndef STAILQ_CONCAT
#define STAILQ_CONCAT(head1, head2) do { \
if (!STAILQ_EMPTY((head2))) { \
*(head1)->stqh_last = (head2)->stqh_first; \
(head1)->stqh_last = (head2)->stqh_last; \
STAILQ_INIT((head2)); \
} \
} while (0)
#endif
#ifndef TAILQ_CONCAT #ifndef TAILQ_CONCAT
#define TAILQ_CONCAT(head1, head2, field) do { \ #define TAILQ_CONCAT(head1, head2, field) do { \
if (!TAILQ_EMPTY(head2)) { \ if (!TAILQ_EMPTY(head2)) { \
@ -83,13 +73,6 @@
} while (0) } while (0)
#endif #endif
#ifndef STAILQ_FOREACH_SAFE
#define STAILQ_FOREACH_SAFE(var, head, field, tvar) \
for ((var) = STAILQ_FIRST((head)); \
(var) && ((tvar) = STAILQ_NEXT((var), field), 1); \
(var) = (tvar))
#endif
#ifndef TAILQ_FOREACH_SAFE #ifndef TAILQ_FOREACH_SAFE
#define TAILQ_FOREACH_SAFE(var, head, field, tvar) \ #define TAILQ_FOREACH_SAFE(var, head, field, tvar) \
for ((var) = TAILQ_FIRST((head)); \ for ((var) = TAILQ_FIRST((head)); \

60
src/librc/librc-depend.c
View File

@ -72,12 +72,12 @@ rc_deptree_free(RC_DEPTREE *deptree)
if (!deptree) if (!deptree)
return; return;
di = STAILQ_FIRST(deptree); di = TAILQ_FIRST(deptree);
while (di) { while (di) {
di2 = STAILQ_NEXT(di, entries); di2 = TAILQ_NEXT(di, entries);
dt = STAILQ_FIRST(&di->depends); dt = TAILQ_FIRST(&di->depends);
while (dt) { while (dt) {
dt2 = STAILQ_NEXT(dt, entries); dt2 = TAILQ_NEXT(dt, entries);
rc_stringlist_free(dt->services); rc_stringlist_free(dt->services);
free(dt->type); free(dt->type);
free(dt); free(dt);
@ -96,7 +96,7 @@ get_depinfo(const RC_DEPTREE *deptree, const char *service)
{ {
RC_DEPINFO *di; RC_DEPINFO *di;
STAILQ_FOREACH(di, deptree, entries) TAILQ_FOREACH(di, deptree, entries)
if (strcmp(di->service, service) == 0) if (strcmp(di->service, service) == 0)
return di; return di;
return NULL; return NULL;
@ -107,7 +107,7 @@ get_deptype(const RC_DEPINFO *depinfo, const char *type)
{ {
RC_DEPTYPE *dt; RC_DEPTYPE *dt;
STAILQ_FOREACH(dt, &depinfo->depends, entries) TAILQ_FOREACH(dt, &depinfo->depends, entries)
if (strcmp(dt->type, type) == 0) if (strcmp(dt->type, type) == 0)
return dt; return dt;
return NULL; return NULL;
@ -131,7 +131,7 @@ rc_deptree_load(void)
return NULL; return NULL;
deptree = xmalloc(sizeof(*deptree)); deptree = xmalloc(sizeof(*deptree));
STAILQ_INIT(deptree); TAILQ_INIT(deptree);
while ((rc_getline(&line, &len, fp))) while ((rc_getline(&line, &len, fp)))
{ {
p = line; p = line;
@ -149,9 +149,9 @@ rc_deptree_load(void)
if (! e || *e == '\0') if (! e || *e == '\0')
continue; continue;
depinfo = xmalloc(sizeof(*depinfo)); depinfo = xmalloc(sizeof(*depinfo));
STAILQ_INIT(&depinfo->depends); TAILQ_INIT(&depinfo->depends);
depinfo->service = xstrdup(e); depinfo->service = xstrdup(e);
STAILQ_INSERT_TAIL(deptree, depinfo, entries); TAILQ_INSERT_TAIL(deptree, depinfo, entries);
deptype = NULL; deptype = NULL;
continue; continue;
} }
@ -166,7 +166,7 @@ rc_deptree_load(void)
deptype = xmalloc(sizeof(*deptype)); deptype = xmalloc(sizeof(*deptype));
deptype->services = rc_stringlist_new(); deptype->services = rc_stringlist_new();
deptype->type = xstrdup(type); deptype->type = xstrdup(type);
STAILQ_INSERT_TAIL(&depinfo->depends, deptype, entries); TAILQ_INSERT_TAIL(&depinfo->depends, deptype, entries);
} }
rc_stringlist_add(deptype->services, e); rc_stringlist_add(deptype->services, e);
} }
@ -731,7 +731,7 @@ rc_deptree_update(void)
return false; return false;
deptree = xmalloc(sizeof(*deptree)); deptree = xmalloc(sizeof(*deptree));
STAILQ_INIT(deptree); TAILQ_INIT(deptree);
config = rc_stringlist_new(); config = rc_stringlist_new();
while ((rc_getline(&line, &len, fp))) while ((rc_getline(&line, &len, fp)))
{ {
@ -746,9 +746,9 @@ rc_deptree_update(void)
depinfo = get_depinfo(deptree, service); depinfo = get_depinfo(deptree, service);
if (!depinfo) { if (!depinfo) {
depinfo = xmalloc(sizeof(*depinfo)); depinfo = xmalloc(sizeof(*depinfo));
STAILQ_INIT(&depinfo->depends); TAILQ_INIT(&depinfo->depends);
depinfo->service = xstrdup(service); depinfo->service = xstrdup(service);
STAILQ_INSERT_TAIL(deptree, depinfo, entries); TAILQ_INSERT_TAIL(deptree, depinfo, entries);
} }
} }
@ -764,7 +764,7 @@ rc_deptree_update(void)
deptype = xmalloc(sizeof(*deptype)); deptype = xmalloc(sizeof(*deptype));
deptype->type = xstrdup(type); deptype->type = xstrdup(type);
deptype->services = rc_stringlist_new(); deptype->services = rc_stringlist_new();
STAILQ_INSERT_TAIL(&depinfo->depends, deptype, entries); TAILQ_INSERT_TAIL(&depinfo->depends, deptype, entries);
} }
} }
@ -826,20 +826,20 @@ rc_deptree_update(void)
nosys[i + 2] = (char)tolower((unsigned char)sys[i]); nosys[i + 2] = (char)tolower((unsigned char)sys[i]);
nosys[i + 2] = '\0'; nosys[i + 2] = '\0';
STAILQ_FOREACH_SAFE(depinfo, deptree, entries, depinfo_np) TAILQ_FOREACH_SAFE(depinfo, deptree, entries, depinfo_np)
if ((deptype = get_deptype(depinfo, "keyword"))) if ((deptype = get_deptype(depinfo, "keyword")))
TAILQ_FOREACH(s, deptype->services, entries) TAILQ_FOREACH(s, deptype->services, entries)
if (strcmp(s->value, nosys) == 0) { if (strcmp(s->value, nosys) == 0) {
provide = get_deptype(depinfo, "iprovide"); provide = get_deptype(depinfo, "iprovide");
STAILQ_REMOVE(deptree, depinfo, rc_depinfo, entries); TAILQ_REMOVE(deptree, depinfo, entries);
STAILQ_FOREACH(di, deptree, entries) { TAILQ_FOREACH(di, deptree, entries) {
STAILQ_FOREACH_SAFE(dt, &di->depends, entries, dt_np) { TAILQ_FOREACH_SAFE(dt, &di->depends, entries, dt_np) {
rc_stringlist_delete(dt->services, depinfo->service); rc_stringlist_delete(dt->services, depinfo->service);
if (provide) if (provide)
TAILQ_FOREACH(s2, provide->services, entries) TAILQ_FOREACH(s2, provide->services, entries)
rc_stringlist_delete(dt->services, s2->value); rc_stringlist_delete(dt->services, s2->value);
if (!TAILQ_FIRST(dt->services)) { if (!TAILQ_FIRST(dt->services)) {
STAILQ_REMOVE(&di->depends, dt, rc_deptype, entries); TAILQ_REMOVE(&di->depends, dt, entries);
free(dt->type); free(dt->type);
free(dt->services); free(dt->services);
free(dt); free(dt);
@ -852,25 +852,25 @@ rc_deptree_update(void)
/* Phase 3 - add our providers to the tree */ /* Phase 3 - add our providers to the tree */
providers = xmalloc(sizeof(*providers)); providers = xmalloc(sizeof(*providers));
STAILQ_INIT(providers); TAILQ_INIT(providers);
STAILQ_FOREACH(depinfo, deptree, entries) TAILQ_FOREACH(depinfo, deptree, entries)
if ((deptype = get_deptype(depinfo, "iprovide"))) if ((deptype = get_deptype(depinfo, "iprovide")))
TAILQ_FOREACH(s, deptype->services, entries) { TAILQ_FOREACH(s, deptype->services, entries) {
STAILQ_FOREACH(di, providers, entries) TAILQ_FOREACH(di, providers, entries)
if (strcmp(di->service, s->value) == 0) if (strcmp(di->service, s->value) == 0)
break; break;
if (!di) { if (!di) {
di = xmalloc(sizeof(*di)); di = xmalloc(sizeof(*di));
STAILQ_INIT(&di->depends); TAILQ_INIT(&di->depends);
di->service = xstrdup(s->value); di->service = xstrdup(s->value);
STAILQ_INSERT_TAIL(providers, di, entries); TAILQ_INSERT_TAIL(providers, di, entries);
} }
} }
STAILQ_CONCAT(deptree, providers); TAILQ_CONCAT(deptree, providers, entries);
free(providers); free(providers);
/* Phase 4 - backreference our depends */ /* Phase 4 - backreference our depends */
STAILQ_FOREACH(depinfo, deptree, entries) TAILQ_FOREACH(depinfo, deptree, entries)
for (i = 0; deppairs[i].depend; i++) { for (i = 0; deppairs[i].depend; i++) {
deptype = get_deptype(depinfo, deppairs[i].depend); deptype = get_deptype(depinfo, deppairs[i].depend);
if (!deptype) if (!deptype)
@ -891,7 +891,7 @@ rc_deptree_update(void)
dt = xmalloc(sizeof(*dt)); dt = xmalloc(sizeof(*dt));
dt->type = xstrdup(deppairs[i].addto); dt->type = xstrdup(deppairs[i].addto);
dt->services = rc_stringlist_new(); dt->services = rc_stringlist_new();
STAILQ_INSERT_TAIL(&di->depends, dt, entries); TAILQ_INSERT_TAIL(&di->depends, dt, entries);
} }
rc_stringlist_addu(dt->services, depinfo->service); rc_stringlist_addu(dt->services, depinfo->service);
} }
@ -903,7 +903,7 @@ rc_deptree_update(void)
rc_stringlist_add(types, "ineed"); rc_stringlist_add(types, "ineed");
rc_stringlist_add(types, "iuse"); rc_stringlist_add(types, "iuse");
rc_stringlist_add(types, "iafter"); rc_stringlist_add(types, "iafter");
STAILQ_FOREACH(depinfo, deptree, entries) { TAILQ_FOREACH(depinfo, deptree, entries) {
deptype = get_deptype(depinfo, "ibefore"); deptype = get_deptype(depinfo, "ibefore");
if (!deptype) if (!deptype)
continue; continue;
@ -957,10 +957,10 @@ rc_deptree_update(void)
*/ */
if ((fp = fopen(RC_DEPTREE_CACHE, "w"))) { if ((fp = fopen(RC_DEPTREE_CACHE, "w"))) {
i = 0; i = 0;
STAILQ_FOREACH(depinfo, deptree, entries) { TAILQ_FOREACH(depinfo, deptree, entries) {
fprintf(fp, "depinfo_%zu_service='%s'\n", fprintf(fp, "depinfo_%zu_service='%s'\n",
i, depinfo->service); i, depinfo->service);
STAILQ_FOREACH(deptype, &depinfo->depends, entries) { TAILQ_FOREACH(deptype, &depinfo->depends, entries) {
k = 0; k = 0;
TAILQ_FOREACH(s, deptype->services, entries) { TAILQ_FOREACH(s, deptype->services, entries) {
fprintf(fp, fprintf(fp,

8
src/librc/rc.h.in
View File

@ -281,7 +281,7 @@ typedef struct rc_deptype
/*! list of services */ /*! list of services */
RC_STRINGLIST *services; RC_STRINGLIST *services;
/*! list of types */ /*! list of types */
STAILQ_ENTRY(rc_deptype) entries; TAILQ_ENTRY(rc_deptype) entries;
} RC_DEPTYPE; } RC_DEPTYPE;
/*! Singly linked list of services and their dependencies */ /*! Singly linked list of services and their dependencies */
@ -290,12 +290,12 @@ typedef struct rc_depinfo
/*! Name of service */ /*! Name of service */
char *service; char *service;
/*! Dependencies */ /*! Dependencies */
STAILQ_HEAD(, rc_deptype) depends; TAILQ_HEAD(, rc_deptype) depends;
/*! List of entries */ /*! List of entries */
STAILQ_ENTRY(rc_depinfo) entries; TAILQ_ENTRY(rc_depinfo) entries;
} RC_DEPINFO; } RC_DEPINFO;
typedef STAILQ_HEAD(,rc_depinfo) RC_DEPTREE; typedef TAILQ_HEAD(,rc_depinfo) RC_DEPTREE;
#else #else
/* Handles to internal structures */ /* Handles to internal structures */
typedef void *RC_DEPTREE; typedef void *RC_DEPTREE;