quark

commit 27f8bbfac440d95ef354005d5f7353ec9f3d9294
parent 1ccaac023caa4ae415041c190516b0f7ae6ba647
Author: Laslo Hunhold <dev@frign.de>
Date:   Sun, 23 Aug 2020 13:35:49 +0200

Refactor sock_get_uds() a bit

This refines the error messages a bit and makes clearer what went
wrong.

Signed-off-by: Laslo Hunhold <dev@frign.de>

Diffstat:
M
sock.c
 | 
11
++++++-----

1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/sock.c b/sock.c
@@ -63,7 +63,7 @@ void
 sock_rem_uds(const char *udsname)
 {
 	if (unlink(udsname) < 0) {
-		die("unlink:");
+		die("unlink '%s':", udsname);
 	}
 }
 
@@ -74,7 +74,8 @@ sock_get_uds(const char *udsname, uid_t uid, gid_t gid)
 		.sun_family = AF_UNIX,
 	};
 	size_t udsnamelen;
-	int insock, sockmode = S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH;
+	int insock, sockmode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP |
+	                       S_IROTH | S_IWOTH;
 
 	if ((insock = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) {
 		die("socket:");
@@ -86,7 +87,7 @@ sock_get_uds(const char *udsname, uid_t uid, gid_t gid)
 	memcpy(addr.sun_path, udsname, udsnamelen + 1);
 
 	if (bind(insock, (const struct sockaddr *)&addr, sizeof(addr)) < 0) {
-		die("bind %s:", udsname);
+		die("bind '%s':", udsname);
 	}
 
 	if (listen(insock, SOMAXCONN) < 0) {
@@ -96,12 +97,12 @@ sock_get_uds(const char *udsname, uid_t uid, gid_t gid)
 
 	if (chmod(udsname, sockmode) < 0) {
 		sock_rem_uds(udsname);
-		die("chmod:");
+		die("chmod '%s':", udsname);
 	}
 
 	if (chown(udsname, uid, gid) < 0) {
 		sock_rem_uds(udsname);
-		die("chown:");
+		die("chown '%s':", udsname);
 	}
 
 	return insock;