X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwgt.c;h=db590914290436c1d002aa6af73f988c08a0ce2f;hb=f3d64b7c741677cd28e2a11deed67196cd02b46a;hp=dd889d5d6cc238c9e7cd00472cb83a2a4686ae42;hpb=63f8720a3e610c0dc37bda3138d2e8de98ec1a78;p=src%2Fapp-framework-main.git diff --git a/src/wgt.c b/src/wgt.c index dd889d5..db59091 100644 --- a/src/wgt.c +++ b/src/wgt.c @@ -30,6 +30,7 @@ #include "wgt.h" struct wgt { + int refcount; int rootfd; int nrlocales; char **locales; @@ -73,7 +74,10 @@ static int validsubpath(const char *subpath) struct wgt *wgt_create() { struct wgt *wgt = malloc(sizeof * wgt); - if (wgt) { + if (!wgt) + errno = ENOMEM; + else { + wgt->refcount = 1; wgt->rootfd = -1; wgt->nrlocales = 0; wgt->locales = NULL; @@ -96,9 +100,16 @@ void wgt_locales_reset(struct wgt *wgt) free(wgt->locales[--wgt->nrlocales]); } -void wgt_destroy(struct wgt *wgt) +void wgt_addref(struct wgt *wgt) +{ + assert(wgt); + wgt->refcount++; +} + +void wgt_unref(struct wgt *wgt) { - if (wgt) { + assert(wgt); + if (!--wgt->refcount) { wgt_disconnect(wgt); wgt_locales_reset(wgt); free(wgt->locales); @@ -106,13 +117,13 @@ void wgt_destroy(struct wgt *wgt) } } -int wgt_connect(struct wgt *wgt, const char *pathname) +int wgt_connectat(struct wgt *wgt, int dirfd, const char *pathname) { int rfd; assert(wgt); - rfd = AT_FDCWD; + rfd = dirfd; if (pathname) { rfd = openat(rfd, pathname, O_PATH|O_DIRECTORY); if (rfd < 0) @@ -124,6 +135,11 @@ int wgt_connect(struct wgt *wgt, const char *pathname) return 0; } +int wgt_connect(struct wgt *wgt, const char *pathname) +{ + return wgt_connectat(wgt, AT_FDCWD, pathname); +} + int wgt_is_connected(struct wgt *wgt) { assert(wgt);