Code Review
/
src
/
app-framework-main.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
added info retrieval
[src/app-framework-main.git]
/
src
/
wgt.c
diff --git
a/src/wgt.c
b/src/wgt.c
index
dd889d5
..
db59091
100644
(file)
--- a/
src/wgt.c
+++ b/
src/wgt.c
@@
-30,6
+30,7
@@
#include "wgt.h"
struct wgt {
#include "wgt.h"
struct wgt {
+ int refcount;
int rootfd;
int nrlocales;
char **locales;
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);
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;
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]);
}
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);
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_connect
at(struct wgt *wgt, int dirfd
, const char *pathname)
{
int rfd;
assert(wgt);
{
int rfd;
assert(wgt);
- rfd =
AT_FDCWD
;
+ rfd =
dirfd
;
if (pathname) {
rfd = openat(rfd, pathname, O_PATH|O_DIRECTORY);
if (rfd < 0)
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;
}
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);
int wgt_is_connected(struct wgt *wgt)
{
assert(wgt);