util: replace close_nointr_nofail() by a more useful safe_close()

[elogind.git] / src / reply-password / reply-password.c

diff --git a/src/reply-password/reply-password.c b/src/reply-password/reply-password.c
index a935d0f08401fe9794f0870083270b5ebdd273e3..c730216b73c6aacf4d17536078357f1586d63f6e 100644 (file)
--- a/src/reply-password/reply-password.c
+++ b/src/reply-password/reply-password.c
@@ -41,14 +41,14 @@ static int send_on_socket(int fd, const char *socket_name, const void *packet, s
         union {
                 struct sockaddr sa;
                 struct sockaddr_un un;
         union {
                 struct sockaddr sa;
                 struct sockaddr_un un;

-        } sa;
+        } sa = {
+                .un.sun_family = AF_UNIX,
+        };

 
         assert(fd >= 0);
         assert(socket_name);
         assert(packet);
 
 
         assert(fd >= 0);
         assert(socket_name);
         assert(packet);
 

-        zero(sa);
-        sa.un.sun_family = AF_UNIX;

         strncpy(sa.un.sun_path, socket_name, sizeof(sa.un.sun_path));
 
         if (sendto(fd, packet, size, MSG_NOSIGNAL, &sa.sa, offsetof(struct sockaddr_un, sun_path) + strlen(socket_name)) < 0) {
         strncpy(sa.un.sun_path, socket_name, sizeof(sa.un.sun_path));
 
         if (sendto(fd, packet, size, MSG_NOSIGNAL, &sa.sa, offsetof(struct sockaddr_un, sun_path) + strlen(socket_name)) < 0) {


@@ -91,7 +91,8 @@ int main(int argc, char *argv[]) {
                 goto finish;
         }
 
                 goto finish;
         }
 

-        if ((fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0)) < 0) {
+        fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
+        if (fd < 0) {

                 log_error("socket() failed: %m");
                 goto finish;
         }
                 log_error("socket() failed: %m");
                 goto finish;
         }


@@ -102,8 +103,7 @@ int main(int argc, char *argv[]) {
         r = EXIT_SUCCESS;
 
 finish:
         r = EXIT_SUCCESS;
 
 finish:

-        if (fd >= 0)
-                close_nointr_nofail(fd);
+        safe_close(fd);

 
         return r;
 }
 
         return r;
 }