X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod_command.c;h=0f7aa7e625ffcd0c7274f16e184f308b0322ceab;hp=eed9fc154c7191513c3e315a65fe552641823b1b;hb=656a02453498156bab09763011ff43b81db57634;hpb=9417eae5ca2b9f10d25f769221e8fd91048bc68a

diff --git a/audiod_command.c b/audiod_command.c
index eed9fc15..0f7aa7e6 100644
--- a/audiod_command.c
+++ b/audiod_command.c
@@ -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);
 }
 
 /**
@@ -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)