X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod_command.c;h=1c22f58b3eea76d91d89af50196c0fbed7c8ab31;hp=a5f1bde6eb85be5865ce88db75a45e1b0ac97cf0;hb=c0abcee0da53a6b399c3d16a62830aaa9ae21349;hpb=eecc102ad0abeb0335fe994bb72031a15b9090d7

diff --git a/audiod_command.c b/audiod_command.c
index a5f1bde6..1c22f58b 100644
--- a/audiod_command.c
+++ b/audiod_command.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -8,7 +8,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
-#include <dirent.h>
 #include <stdbool.h>
 
 #include "para.h"
@@ -121,24 +120,22 @@ void stat_client_write_item(int item_num)
 	struct para_buffer pb = {.flags = 0};
 	struct para_buffer pfpb = {.flags = PBF_SIZE_PREFIX};
 	const uint64_t one = 1;
+	char *msg = stat_item_values[item_num];
+	struct para_buffer *b;
 
 	list_for_each_entry_safe(sc, tmp, &client_list, node) {
 		int fd = sc->fd, ret;
 
 		if (!((one << item_num) & sc->item_mask))
 			continue;
-		if (write_ok(fd) > 0) {
-			struct para_buffer *b =
-				(sc->flags & SCF_PARSER_FRIENDLY)? &pfpb : &pb;
-			char *msg = stat_item_values[item_num];
-			if (!b->buf)
-				WRITE_STATUS_ITEM(b, item_num, "%s\n",
-					msg? msg : "");
-			ret = write(fd, b->buf, b->offset);
-			if (ret == b->offset)
-				continue;
-		}
-		/* write error or fd not ready for writing */
+		b = (sc->flags & SCF_PARSER_FRIENDLY)? &pfpb : &pb;
+		if (!b->buf)
+			(void)WRITE_STATUS_ITEM(b, item_num, "%s\n",
+				msg? msg : "");
+		ret = write(fd, b->buf, b->offset);
+		if (ret == b->offset)
+			continue;
+		/* write error or short write */
 		close(fd);
 		num_clients--;
 		PARA_INFO_LOG("deleting client on fd %d\n", fd);
@@ -148,8 +145,6 @@ void stat_client_write_item(int item_num)
 	}
 	free(pb.buf);
 	free(pfpb.buf);
-//	if (num_clients)
-//		PARA_DEBUG_LOG("%d client(s)\n", num_clients);
 }
 
 /**
@@ -199,7 +194,7 @@ static int get_play_time_slot_num(void)
 	FOR_EACH_SLOT(i) {
 		struct slot_info *s = &slot[i];
 		struct timeval wstime;
-		if (!s->wns)
+		if (!s->wns || !s->wns[0].btrn)
 			continue;
 		btr_get_node_start(s->wns[0].btrn, &wstime);
 		if (oldest_slot >= 0 && tv_diff(&wstime, &oldest_wstime, NULL) > 0)
@@ -301,21 +296,6 @@ int com_tasks(int fd, __a_unused int argc, __a_unused char **argv)
 	return ret;
 }
 
-int com_kill(int fd, int argc, char **argv)
-{
-	int i, ret = 1;
-	if (argc < 2)
-		return -E_AUDIOD_SYNTAX;
-	for (i = 1; i < argc; i++) {
-		ret = kill_task(argv[i]);
-		if (ret < 0)
-			break;
-	}
-	if (ret > 0)
-		close(fd);
-	return ret;
-}
-
 int com_stat(int fd, int argc, char **argv)
 {
 	int i, ret, parser_friendly = 0;
@@ -323,6 +303,9 @@ int com_stat(int fd, int argc, char **argv)
 	const uint64_t one = 1;
 	struct para_buffer b = {.flags = 0};
 
+	ret = mark_fd_nonblocking(fd);
+	if (ret < 0)
+		return ret;
 	for (i = 1; i < argc; i++) {
 		const char *arg = argv[i];
 		if (arg[0] != '-')
@@ -350,7 +333,7 @@ int com_stat(int fd, int argc, char **argv)
 		char *item = stat_item_values[i];
 		if (!((one << i) & mask))
 			continue;
-		WRITE_STATUS_ITEM(&b, i, "%s\n", item? item : "");
+		(void)WRITE_STATUS_ITEM(&b, i, "%s\n", item? item : "");
 	}
 	ret = client_write(fd, b.buf);
 	if (ret >= 0)
@@ -421,31 +404,32 @@ static int check_perms(uid_t uid)
 }
 
 /**
- * handle arriving connections on the local socket
+ * Handle arriving connections on the local socket.
  *
- * \param accept_fd the fd to call accept() on
+ * \param accept_fd The fd to accept connections on.
+ * \param rfds If \a accept_fd is not set in \a rfds, do nothing.
  *
- * This is called whenever para_audiod's main task detects an incoming
- * connection by the readability of \a accept_fd. This function reads the
- * command sent by the peer, checks the connecting user's permissions by using
- * unix socket credentials (if supported by the OS) and calls the corresponding
- * command handler if permissions are OK.
+ * This is called in each iteration of the select loop. If there is an incoming
+ * connection on \a accept_fd, this function reads the command sent by the peer,
+ * checks the connecting user's permissions by using unix socket credentials
+ * (if supported by the OS) and calls the corresponding command handler if
+ * permissions are OK.
  *
- * \return positive on success, negative on errors
+ * \return Positive on success, negative on errors, zero if there was no
+ * connection to accept.
  *
  * \sa para_accept(), recv_cred_buffer()
  * */
-int handle_connect(int accept_fd)
+int handle_connect(int accept_fd, fd_set *rfds)
 {
-	int i, argc, ret, clifd = -1;
+	int i, argc, ret, clifd;
 	char buf[MAXLINE], **argv = NULL;
 	struct sockaddr_un unix_addr;
 	uid_t uid;
 
-	ret = para_accept(accept_fd, &unix_addr, sizeof(struct sockaddr_un));
-	if (ret < 0)
-		goto out;
-	clifd = ret;
+	ret = para_accept(accept_fd, rfds, &unix_addr, sizeof(struct sockaddr_un), &clifd);
+	if (ret <= 0)
+		return ret;
 	ret = recv_cred_buffer(clifd, buf, sizeof(buf) - 1);
 	if (ret < 0)
 		goto out;