wmii

commit 048e3e7c0cf2456b2daa66324f29d276bb531bb0
parent 2d97fc681b5efdb1d4a277b37cca3cb218f088fa
Author: Anselm R. Garbe <garbeam@wmii.de>
Date:   Sun, 29 Jan 2006 03:29:59 +0200

we unlink now socket files, the server creator has to take care of not using existing socket files


Diffstat:
cmd/wmiibar2.c
 | 
8
--------
libixp2/socket.c
 | 
1
+

2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/cmd/wmiibar2.c b/cmd/wmiibar2.c
@@ -107,13 +107,6 @@ dummy_error_handler(Display * dpy, XErrorEvent * err)
 }
 
 static void
-exit_cleanup()
-{
-    if(mypid == getpid())
-        unlink(address);
-}
-
-static void
 new_item()
 {
 	size_t i;
@@ -753,7 +746,6 @@ main(int argc, char *argv[])
     root_qid.path = mkqpath(Droot, 0);
 
     mypid = getpid();
-    atexit(exit_cleanup);
 
     /* default item settings */
 	new_item();
diff --git a/libixp2/socket.c b/libixp2/socket.c
@@ -163,6 +163,7 @@ create_unix_sock(char *file, char **errstr)
     strncpy(addr.sun_path, file, sizeof(addr.sun_path));
     su_len = sizeof(struct sockaddr) + strlen(addr.sun_path);
 
+	unlink(file); /* remove old socket, if any */
     if(bind(fd, (struct sockaddr *) &addr, su_len) < 0) {
         *errstr = "cannot bind socket";
         close(fd);