X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gui.c;h=64fab61b7859e5192a3d1583a693622be8977087;hp=394b69fe5466efe19fb532a2cf43e18381409d8e;hb=98f2c8aea52a49fad3fd6df67b1eb32c1499176c;hpb=fb62100d23baea388cec78e572b0f36d051a61c0

diff --git a/gui.c b/gui.c
index 394b69fe..64fab61b 100644
--- a/gui.c
+++ b/gui.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1998-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1998-2010 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -45,7 +45,7 @@ struct rb_entry {
 	size_t len;
 	int color;
 };
-struct ringbuffer *bot_win_rb;
+static struct ringbuffer *bot_win_rb;
 #define NUM_LINES(len) (1 + (len) / bot.cols)
 
 static unsigned scroll_position;
@@ -91,8 +91,8 @@ struct stat_item {
 
 static struct gui_theme theme;
 
-int _argc;
-char **_argv;
+static int _argc;
+static char **_argv;
 
 static void com_help(void);
 static void com_reread_conf(void);
@@ -110,7 +110,7 @@ static void com_scroll_down(void);
 static void com_page_up(void);
 static void com_page_down(void);
 
-struct gui_command command_list[] = {
+static struct gui_command command_list[] = {
 	{
 		.key = "?",
 		.name = "help",
@@ -309,7 +309,7 @@ static int align_str(WINDOW* win, char *str, unsigned int len,
 		num = 0;
 	}
 	/* replace newlines by spaces */
-	for (i = 0; i < len; i++) {
+	for (i = 0; i < len && str[i]; i++) {
 		if (str[i] == '\n')
 			str[i] = ' ';
 	}
@@ -730,6 +730,8 @@ static int read_audiod_pipe(int fd)
 	ret = for_each_stat_item(buf, loaded, update_item);
 	if (ret < 0)
 		return ret;
+	if (ret > 0 && ret < loaded)
+		memmove(buf, buf + loaded - ret, ret);
 	loaded = ret;
 	return 1;
 }
@@ -1348,31 +1350,30 @@ static void handle_command(int c)
 
 	/* first check user's key bindings */
 	for (i = 0; i < conf.key_map_given; ++i) {
-		char tmp[MAXLINE], *handler, *arg;
+		char *tmp, *handler, *arg;
 
-		strcpy(tmp, conf.key_map_arg[i]);
-		if (!split_key_map(tmp, &handler, &arg))
+		tmp = para_strdup(conf.key_map_arg[i]);
+		if (!split_key_map(tmp, &handler, &arg)) {
+			free(tmp);
 			return;
-		if (!strcmp(tmp, km_keyname(c))) {
-			if (*handler == 'd') {
-				display_cmd(arg);
-				return;
-			}
-			if (*handler == 'x') {
-				external_cmd(arg);
-				return;
-			}
-			if (*handler == 'p') {
-				client_cmd_cmdline(arg);
-				return;
-			}
-			if (*handler == 'i') {
-				int num = find_cmd_byname(arg);
-				if (num >= 0)
-					command_list[num].handler();
-				return;
-			}
 		}
+		if (strcmp(tmp, km_keyname(c))) {
+			free(tmp);
+			continue;
+		}
+		if (*handler == 'd')
+			display_cmd(arg);
+		else if (*handler == 'x')
+			external_cmd(arg);
+		else if (*handler == 'p')
+			client_cmd_cmdline(arg);
+		else if (*handler == 'i') {
+			int num = find_cmd_byname(arg);
+			if (num >= 0)
+				command_list[num].handler();
+		}
+		free(tmp);
+		return;
 	}
 	/* not found, check internal key bindings */
 	for (i = 0; command_list[i].handler; i++) {