X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcommands.c;h=427887cbb67554bd5d4670856a953e74947907be;hb=4eb74b26380dfde31c86c685f0589e0c653aebf0;hp=d46e7afbc141f7f3d9ebfef0a3b650fe18268a08;hpb=0fb62857e6f4c081bf304f04eee55b06122e784d;p=citadel.git

diff --git a/citadel/commands.c b/citadel/commands.c
index d46e7afbc..427887cbb 100644
--- a/citadel/commands.c
+++ b/citadel/commands.c
@@ -4,6 +4,21 @@
  * This file contains functions which implement parts of the
  * text-mode user interface.
  *
+ * Copyright (c) 1987-2009 by the citadel.org team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "sysdep.h"
@@ -1569,7 +1584,7 @@ void look_for_ansi(void)
 	struct timeval tv;
 	char abuf[512];
 	time_t now;
-	int a;
+	int a, rv;
 
 	if (rc_ansi_color == 0) {
 		enable_color = 0;
@@ -1594,7 +1609,7 @@ void look_for_ansi(void)
 			select(1, &rfds, NULL, NULL, &tv);
 			if (FD_ISSET(0, &rfds)) {
 				abuf[strlen(abuf) + 1] = 0;
-				read(0, &abuf[strlen(abuf)], 1);
+				rv = read(0, &abuf[strlen(abuf)], 1);
 			}
 		} while (FD_ISSET(0, &rfds));
 
@@ -1645,7 +1660,7 @@ char keymenu(char *menuprompt, char *menustring) {
 	choices = num_tokens(menustring, '|');
 
 	if (menuprompt != NULL) do_prompt = 1;
-	if (menuprompt != NULL) if (IsEmptyStr(menuprompt)) do_prompt = 0;
+	if ((menuprompt != NULL) && (IsEmptyStr(menuprompt))) do_prompt = 0;
 
 	while (1) {
 		if (display_prompt) {