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
don't change of directory anymore
[src/app-framework-main.git]
/
src
/
wgt.c
diff --git
a/src/wgt.c
b/src/wgt.c
index
1ae1a13
..
980719b
100644
(file)
--- a/
src/wgt.c
+++ b/
src/wgt.c
@@
-132,12
+132,10
@@
int wgt_connectat(struct wgt *wgt, int dirfd, const char *pathname)
assert(wgt);
assert(wgt);
- rfd = dirfd;
- if (pathname) {
- rfd = openat(rfd, pathname, O_PATH|O_DIRECTORY);
- if (rfd < 0)
- return rfd;
- }
+ rfd = (pathname && *pathname) ? openat(dirfd, pathname, O_PATH|O_DIRECTORY) : dup(dirfd);
+ if (rfd < 0)
+ return rfd;
+
if (wgt->rootfd >= 0)
close(wgt->rootfd);
wgt->rootfd = rfd;
if (wgt->rootfd >= 0)
close(wgt->rootfd);
wgt->rootfd = rfd;
@@
-149,6
+147,18
@@
int wgt_connect(struct wgt *wgt, const char *pathname)
return wgt_connectat(wgt, AT_FDCWD, pathname);
}
return wgt_connectat(wgt, AT_FDCWD, pathname);
}
+struct wgt *wgt_createat(int dirfd, const char *pathname)
+{
+ struct wgt *wgt = wgt_create();
+ if (wgt) {
+ if (wgt_connectat(wgt, dirfd, pathname)) {
+ wgt_unref(wgt);
+ wgt = NULL;
+ }
+ }
+ return wgt;
+}
+
int wgt_is_connected(struct wgt *wgt)
{
assert(wgt);
int wgt_is_connected(struct wgt *wgt)
{
assert(wgt);