X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod_command.c;h=b49d659e0ac0bd784b2002b941b3471540ee5ac9;hp=dfb014aebc1c1d12659364189ac79813c952139c;hb=5cb5db1fbf8f9b96c3b5a1e0cc7de9e710757540;hpb=a5ad3d4c598bafe28e90e5b623e0a754d6e973d5

diff --git a/audiod_command.c b/audiod_command.c
index dfb014ae..b49d659e 100644
--- a/audiod_command.c
+++ b/audiod_command.c
@@ -1,14 +1,13 @@
 /*
- * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
-/** \file audiod_command.c commands for para_audiod */
+/** \file audiod_command.c Commands for para_audiod. */
 
 #include <regex.h>
 #include <sys/types.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "audiod.cmdline.h"
@@ -27,8 +26,12 @@
 #include "fd.h"
 #include "audiod_command_list.h"
 
+extern struct sched sched;
 extern char *stat_item_values[NUM_STAT_ITEMS];
 
+
+struct audiod_command audiod_cmds[] = {DEFINE_AUDIOD_CMD_ARRAY};
+
 /** Iterate over the array of all audiod commands. */
 #define FOR_EACH_COMMAND(c) for (c = 0; audiod_cmds[c].name; c++)
 
@@ -249,7 +252,7 @@ static int dump_commands(int fd)
  * to each individual command to close the fd if necessary.
  */
 
-int com_help(int fd, int argc, char **argv)
+static int com_help(int fd, int argc, char **argv)
 {
 	int i, ret;
 	char *buf;
@@ -284,9 +287,9 @@ out:
 	return ret;
 }
 
-int com_tasks(int fd, __a_unused int argc, __a_unused char **argv)
+static int com_tasks(int fd, __a_unused int argc, __a_unused char **argv)
 {
-	char *tl = get_task_list();
+	char *tl = get_task_list(&sched);
 	int ret = 1;
 	if (tl)
 		ret = client_write(fd, tl);
@@ -296,7 +299,7 @@ int com_tasks(int fd, __a_unused int argc, __a_unused char **argv)
 	return ret;
 }
 
-int com_stat(int fd, int argc, char **argv)
+static int com_stat(int fd, int argc, char **argv)
 {
 	int i, ret, parser_friendly = 0;
 	uint64_t mask = 0;
@@ -342,39 +345,39 @@ int com_stat(int fd, int argc, char **argv)
 	return ret;
 }
 
-int com_grab(int fd, int argc, char **argv)
+static int com_grab(int fd, int argc, char **argv)
 {
-	return grab_client_new(fd, argc, argv);
+	return grab_client_new(fd, argc, argv, &sched);
 }
 
-__noreturn int com_term(int fd, __a_unused int argc, __a_unused char **argv)
+__noreturn static int com_term(int fd, __a_unused int argc, __a_unused char **argv)
 {
 	close(fd);
 	clean_exit(EXIT_SUCCESS, "terminating on user request");
 }
 
-int com_on(int fd, __a_unused int argc, __a_unused char **argv)
+static int com_on(int fd, __a_unused int argc, __a_unused char **argv)
 {
 	audiod_status = AUDIOD_ON;
 	close(fd);
 	return 1;
 }
 
-int com_off(int fd, __a_unused int argc, __a_unused char **argv)
+static int com_off(int fd, __a_unused int argc, __a_unused char **argv)
 {
 	audiod_status = AUDIOD_OFF;
 	close(fd);
 	return 1;
 }
 
-int com_sb(int fd, __a_unused int argc, __a_unused char **argv)
+static int com_sb(int fd, __a_unused int argc, __a_unused char **argv)
 {
 	audiod_status = AUDIOD_STANDBY;
 	close(fd);
 	return 1;
 }
 
-int com_cycle(int fd, int argc, char **argv)
+static int com_cycle(int fd, int argc, char **argv)
 {
 	switch (audiod_status) {
 		case  AUDIOD_ON:
@@ -439,7 +442,7 @@ int handle_connect(int accept_fd, fd_set *rfds)
 	if (ret < 0)
 		goto out;
 	ret = create_argv(buf, "\n", &argv);
-	if (ret < 0)
+	if (ret <= 0)
 		goto out;
 	argc = ret;
 	//PARA_INFO_LOG("argv[0]: %s, argc = %d\n", argv[0], argc);