X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=1f94bbc25cc634d4b889e975106e32bb67c0c69f;hp=3b92be657bd28b49ca690923583d2b42cb5dd770;hb=e0e5a7c1a04c6a2ee4a475e823657e06e6df2f99;hpb=df445c2b07824c950c38d06e74f2b84843bbeb6c

diff --git a/command.c b/command.c
index 3b92be65..1f94bbc2 100644
--- a/command.c
+++ b/command.c
@@ -309,7 +309,7 @@ static struct server_command cmd_struct[] = {
 }
 };
 
-static void dummy(__unused int s)
+static void dummy(__a_unused int s)
 {}
 
 static void mmd_dup(struct misc_meta_data *new_mmd)
@@ -453,22 +453,21 @@ static int check_sender_args(int argc, char **argv, struct sender_command_data *
 	const char *subcmds[] = {"add", "delete", "allow", "deny", "on", "off", NULL};
 
 	scd->sender_num = -1;
-	if (argc < 0)
+	if (argc < 2)
 		return -E_COMMAND_SYNTAX;
 	for (i = 0; senders[i].name; i++)
-		if (!strcmp(senders[i].name, argv[0]))
+		if (!strcmp(senders[i].name, argv[1]))
 			break;
-//	PARA_DEBUG_LOG("%d:%s\n", argc, argv[0]);
+	PARA_DEBUG_LOG("%d:%s\n", argc, argv[1]);
 	if (!senders[i].name)
 		return -E_COMMAND_SYNTAX;
 	scd->sender_num = i;
 	for (i = 0; subcmds[i]; i++)
-		if (!strcmp(subcmds[i], argv[1]))
+		if (!strcmp(subcmds[i], argv[2]))
 			break;
 	if (!subcmds[i])
 		return -E_COMMAND_SYNTAX;
 	scd->cmd_num = i;
-//	scd->self = *in_addr;
 	mmd_lock();
 	if (!senders[scd->sender_num].client_cmds[scd->cmd_num]) {
 		mmd_unlock();
@@ -478,31 +477,31 @@ static int check_sender_args(int argc, char **argv, struct sender_command_data *
 	switch (scd->cmd_num) {
 	case SENDER_ON:
 	case SENDER_OFF:
-		if (argc != 1)
+		if (argc != 3)
 			return -E_COMMAND_SYNTAX;
 		break;
 	case SENDER_DENY:
 	case SENDER_ALLOW:
-		if (argc != 2 && argc != 3)
+		if (argc != 4 && argc != 5)
 			return -E_COMMAND_SYNTAX;
-		if (!inet_aton(argv[2], &scd->addr))
+		if (!inet_aton(argv[3], &scd->addr))
 			return -E_COMMAND_SYNTAX;
 		scd->netmask = 32;
-		if (argc == 3) {
-			scd->netmask = atoi(argv[3]);
+		if (argc == 5) {
+			scd->netmask = atoi(argv[4]);
 			if (scd->netmask < 0 || scd->netmask > 32)
 				return -E_COMMAND_SYNTAX;
 		}
 		break;
 	case SENDER_ADD:
 	case SENDER_DELETE:
-		if (argc != 2 && argc != 3)
+		if (argc != 4 && argc != 5)
 			return -E_COMMAND_SYNTAX;
-		if (!inet_aton(argv[2], &scd->addr))
+		if (!inet_aton(argv[3], &scd->addr))
 			return -E_COMMAND_SYNTAX;
 		scd->port = -1;
-		if (argc == 3) {
-			scd->port = atoi(argv[3]);
+		if (argc == 5) {
+			scd->port = atoi(argv[4]);
 			if (scd->port < 0 || scd->port > 65535)
 				return -E_COMMAND_SYNTAX;
 		}
@@ -518,7 +517,7 @@ static int com_sender(int fd, int argc, char **argv)
 	int i, ret;
 	struct sender_command_data scd;
 
-	if (!argc) {
+	if (argc < 2) {
 		char *msg = NULL;
 		for (i = 0; senders[i].name; i++) {
 			char *tmp = make_message("%s%s\n",
@@ -530,7 +529,7 @@ static int com_sender(int fd, int argc, char **argv)
 		free(msg);
 		return ret;
 	}
-	ret = check_sender_args(argc - 1, argv + 1, &scd);
+	ret = check_sender_args(argc, argv, &scd);
 	if (ret < 0) {
 		char *msg;
 		if (scd.sender_num < 0)
@@ -555,14 +554,14 @@ static int com_sender(int fd, int argc, char **argv)
 }
 
 /* server info */
-static int com_si(int fd, int argc, __unused char **argv)
+static int com_si(int fd, int argc, __a_unused char **argv)
 {
 	int i, ret;
 	char *ut;
 	char *selector_string = NULL, *sender_info = NULL, *sender_list = NULL;
 	struct mallinfo mi = mallinfo();
 
-	if (argc)
+	if (argc != 1)
 		return -E_COMMAND_SYNTAX;
 	mmd_lock();
 	for (i = 0; selectors[i].name; i++) {
@@ -607,9 +606,9 @@ static int com_si(int fd, int argc, __unused char **argv)
 }
 
 /* version */
-static int com_version(int socket_fd, int argc, __unused char **argv)
+static int com_version(int socket_fd, int argc, __a_unused char **argv)
 {
-	if (argc)
+	if (argc != 1)
 		return -E_COMMAND_SYNTAX;
 	return send_buffer(socket_fd, "para_server-" VERSION ", \"" CODENAME "\"\n"
 			COPYRIGHT "\n"
@@ -624,7 +623,7 @@ static int com_sc(int socket_fd, int argc, char **argv)
 	char *name = NULL;
 	int ret, old = 0, count = -1; /* print af change forever */
 
-	if (argc)
+	if (argc > 1)
 		count = atoi(argv[1]);
 repeat:
 	mmd_lock();
@@ -639,7 +638,7 @@ repeat:
 		name = NULL;
 		if (ret < 0)
 			return ret;
-		if (argc && !--count)
+		if (argc > 1 && !--count)
 			return 1;
 	}
 	usleep(500000);
@@ -654,7 +653,7 @@ static int com_sb(int socket_fd, int argc, char **argv)
 				 * times. Negative value means: print
 				 * forever
 				 */
-	if (argc)
+	if (argc > 1)
 		nr = atoi(argv[1]);
 	while (nr) {
 		mmd_lock();
@@ -684,7 +683,7 @@ static int com_stat(int socket_fd, int argc, char **argv)
 
 	signal(SIGUSR1, dummy);
 
-	if (argc)
+	if (argc > 1)
 		num = atoi(argv[1]);
 	for (;;) {
 
@@ -720,7 +719,7 @@ static int send_description(int fd, struct server_command *cmd, const char *hand
 	return 1;
 }
 
-/* always returns string that must be freed by the caller in handeler */
+/* always returns string that must be freed by the caller in handler */
 static struct server_command *get_cmd_ptr(char *name, char **handler)
 {
 	struct server_command *cmd = cmd_struct;
@@ -751,7 +750,7 @@ static int com_help(int fd, int argc, char **argv)
 	char *perms, *handler;
 	int ret;
 
-	if (!argc) {
+	if (argc < 2) {
 		/* no argument given, print list of commands */
 		if ((ret = send_description(fd, cmd_struct, "server", 0)) < 0)
 			return ret;
@@ -792,26 +791,26 @@ static int com_help(int fd, int argc, char **argv)
 }
 
 /* hup */
-static int com_hup(__unused int socket_fd, int argc, __unused char **argv)
+static int com_hup(__a_unused int socket_fd, int argc, __a_unused char **argv)
 {
-	if (argc)
+	if (argc != 1)
 		return -E_COMMAND_SYNTAX;
 	kill(getppid(), SIGHUP);
 	return 1;
 }
 
 /* term */
-static int com_term(__unused int socket_fd, int argc, __unused char **argv)
+static int com_term(__a_unused int socket_fd, int argc, __a_unused char **argv)
 {
-	if (argc)
+	if (argc != 1)
 		return -E_COMMAND_SYNTAX;
 	kill(getppid(), SIGTERM);
 	return 1;
 }
 
-static int com_play(__unused int socket_fd, int argc, __unused char **argv)
+static int com_play(__a_unused int socket_fd, int argc, __a_unused char **argv)
 {
-	if (argc)
+	if (argc != 1)
 		return -E_COMMAND_SYNTAX;
 	mmd_lock();
 	mmd->new_afs_status_flags |= AFS_PLAYING;
@@ -822,9 +821,9 @@ static int com_play(__unused int socket_fd, int argc, __unused char **argv)
 }
 
 /* stop */
-static int com_stop(__unused int socket_fd, int argc, __unused char **argv)
+static int com_stop(__a_unused int socket_fd, int argc, __a_unused char **argv)
 {
-	if (argc)
+	if (argc != 1)
 		return -E_COMMAND_SYNTAX;
 	mmd_lock();
 	mmd->new_afs_status_flags &= ~AFS_PLAYING;
@@ -835,9 +834,9 @@ static int com_stop(__unused int socket_fd, int argc, __unused char **argv)
 }
 
 /* pause */
-static int com_pause(__unused int socket_fd, int argc, __unused char **argv)
+static int com_pause(__a_unused int socket_fd, int argc, __a_unused char **argv)
 {
-	if (argc)
+	if (argc != 1)
 		return -E_COMMAND_SYNTAX;
 	mmd_lock();
 	if (!afs_paused())
@@ -852,7 +851,7 @@ static int com_chs(int fd, int argc, char **argv)
 {
 	int i, ret;
 
-	if (!argc) {
+	if (argc == 1) {
 		char *selector;
 		mmd_lock();
 		selector = para_strdup(selectors[mmd->selector_num].name);
@@ -874,9 +873,9 @@ static int com_chs(int fd, int argc, char **argv)
 }
 
 /* next */
-static int com_next(__unused int socket_fd, int argc, __unused char **argv)
+static int com_next(__a_unused int socket_fd, int argc, __a_unused char **argv)
 {
-	if (argc)
+	if (argc != 1)
 		return -E_COMMAND_SYNTAX;
 	mmd_lock();
 	mmd->events++;
@@ -886,9 +885,9 @@ static int com_next(__unused int socket_fd, int argc, __unused char **argv)
 }
 
 /* nomore */
-static int com_nomore(__unused int socket_fd, int argc, __unused char **argv)
+static int com_nomore(__a_unused int socket_fd, int argc, __a_unused char **argv)
 {
-	if (argc)
+	if (argc != 1)
 		return -E_COMMAND_SYNTAX;
 	mmd_lock();
 	if (afs_playing() || afs_paused())
@@ -898,14 +897,14 @@ static int com_nomore(__unused int socket_fd, int argc, __unused char **argv)
 }
 
 /* ff */
-static int com_ff(__unused int socket_fd, int argc, char **argv)
+static int com_ff(__a_unused int socket_fd, int argc, char **argv)
 {
 	long promille;
 	int ret, backwards = 0;
 	unsigned i;
 	char c;
 
-	if (!argc)
+	if (argc != 2)
 		return -E_COMMAND_SYNTAX;
 	if (!(ret = sscanf(argv[1], "%u%c", &i, &c)))
 		return -E_COMMAND_SYNTAX;
@@ -937,12 +936,12 @@ out:
 }
 
 /* jmp */
-static int com_jmp(__unused int socket_fd, int argc, char **argv)
+static int com_jmp(__a_unused int socket_fd, int argc, char **argv)
 {
 	long unsigned int i;
 	int ret;
 
-	if (!argc)
+	if (argc != 2)
 		return -E_COMMAND_SYNTAX;
 	if (sscanf(argv[1], "%lu", &i) <= 0)
 		return -E_COMMAND_SYNTAX;
@@ -1204,7 +1203,7 @@ int handle_connect(int fd, struct sockaddr_in *addr)
 		goto err_out;
 	/* valid command and sufficient perms */
 	alarm(0);
-	argc = split_args(command, &argv, '\n');
+	argc = split_args(command, &argv, "\n");
 	mmd_lock();
 	mmd->num_commands++;
 	mmd_unlock();