Commit ecd332c5 authored by vvb2060's avatar vvb2060 Committed by John Wu

Close fd

parent a0fe78a7
...@@ -361,7 +361,7 @@ static void daemon_entry() { ...@@ -361,7 +361,7 @@ static void daemon_entry() {
} }
} }
sockaddr_un sun; sockaddr_un sun{};
socklen_t len = setup_sockaddr(&sun, MAIN_SOCKET); socklen_t len = setup_sockaddr(&sun, MAIN_SOCKET);
fd = xsocket(AF_LOCAL, SOCK_STREAM | SOCK_CLOEXEC, 0); fd = xsocket(AF_LOCAL, SOCK_STREAM | SOCK_CLOEXEC, 0);
if (xbind(fd, (sockaddr*) &sun, len)) if (xbind(fd, (sockaddr*) &sun, len))
...@@ -380,12 +380,13 @@ static void daemon_entry() { ...@@ -380,12 +380,13 @@ static void daemon_entry() {
} }
int connect_daemon(bool create) { int connect_daemon(bool create) {
sockaddr_un sun; sockaddr_un sun{};
socklen_t len = setup_sockaddr(&sun, MAIN_SOCKET); socklen_t len = setup_sockaddr(&sun, MAIN_SOCKET);
int fd = xsocket(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0); int fd = xsocket(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0);
if (connect(fd, (sockaddr*) &sun, len)) { if (connect(fd, (sockaddr*) &sun, len)) {
if (!create || getuid() != UID_ROOT) { if (!create || getuid() != UID_ROOT) {
LOGE("No daemon is currently running!\n"); LOGE("No daemon is currently running!\n");
close(fd);
return -1; return -1;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment