X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.c;h=6286806013471ea55278593d0cbf2de74f8934b7;hp=1350db3423c3a184cb645e09cae9a2ebb060358b;hb=8dab386f;hpb=fb62100d23baea388cec78e572b0f36d051a61c0

diff --git a/afs.c b/afs.c
index 1350db34..62868060 100644
--- a/afs.c
+++ b/afs.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2010 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -930,14 +930,11 @@ static void command_post_select(struct sched *s, struct task *t)
 		free(client);
 	}
 	/* Accept connections on the local socket. */
-	if (!FD_ISSET(ct->fd, &s->rfds))
-		return;
-	ret = para_accept(ct->fd, &unix_addr, sizeof(unix_addr));
-	if (ret < 0) {
+	ret = para_accept(ct->fd, &s->rfds, &unix_addr, sizeof(unix_addr), &fd);
+	if (ret < 0)
 		PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
+	if (ret <= 0)
 		return;
-	}
-	fd = ret;
 	ret = mark_fd_nonblocking(fd);
 	if (ret < 0) {
 		PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
@@ -1151,12 +1148,30 @@ void afs_event(enum afs_events event, struct para_buffer *pb,
 	}
 }
 
+/**
+ * Dummy event handler for the images table.
+ *
+ * \param event Unused.
+ * \param pb Unused.
+ * \param data Unused.
+ *
+ * This table does not honor events.
+ */
 int images_event_handler(__a_unused enum afs_events event,
 	__a_unused  struct para_buffer *pb, __a_unused void *data)
 {
 	return 1;
 }
 
+/**
+ * Dummy event handler for the lyrics table.
+ *
+ * \param event Unused.
+ * \param pb Unused.
+ * \param data Unused.
+ *
+ * This table does not honor events.
+ */
 int lyrics_event_handler(__a_unused enum afs_events event,
 	__a_unused struct para_buffer *pb, __a_unused void *data)
 {