Minor code edits - add a few braces, a few minor safety checks, etc.

darcs-hash:20060608235719-ac50b-bec405da5ae101ff50bb3390bb83ef8b0948e4e9.gz

1 files changed, 2 insertions, 2 deletions

diff --git a/parser.c b/parser.c
index 66ebe833..6eebc2ee 100644
--- a/parser.c
+++ b/parser.c
@@ -76,7 +76,7 @@ The fish parser. Contains functions for parsing code.
 /**
    Error message for short circuit command error.
 */
-#define COND_ERR_MSG _( L"Pipe or short circuit command requires additional command")
+#define COND_ERR_MSG _( L"An additional command is required" )
 
 /**
    Error message on reaching maximum recusrion depth
@@ -1232,7 +1232,7 @@ static int printed_width( const wchar_t *str, int len )
 {
 	int res=0;
 	int i;
-	for( i=0; i<len; i++ )
+	for( i=0; str[i] && i<len; i++ )
 	{
 		if( str[i] == L'\t' )
 		{