X-Git-Url: http://www.wagner.pp.ru/gitweb/?p=oss%2Fcatdoc.git;a=blobdiff_plain;f=src%2Freader.c;h=d28878b85c7857edf821e2b5a71edf10478fb85a;hp=b51996e7666b5ac09f47c137fbb22dca03415dde;hb=666a23f1c6f51c09f4aa4ad7e863bf901025a82f;hpb=51f0f8ed69b065cd2577a27c2a2911cdda243b99

diff --git a/src/reader.c b/src/reader.c
index b51996e..d28878b 100644
--- a/src/reader.c
+++ b/src/reader.c
@@ -31,9 +31,9 @@ void copy_out (FILE *f,char *header) {
 		 */
 		if ((unsigned char)header[0]==0xFE && (unsigned char)header[1]==0xFF) {
 			get_unicode_char = get_utf16msb;
-			fputs(convert_char(header[2]<<8|header[3]),stdout); 
-			fputs(convert_char(header[4]<<8|header[5]),stdout); 
-			fputs(convert_char(header[6]<<8|header[7]),stdout); 
+			fputs(convert_char((header[2]<<8)|header[3]),stdout); 
+			fputs(convert_char((header[4]<<8)|header[5]),stdout); 
+			fputs(convert_char((header[6]<<8)|header[7]),stdout); 
 		} else if ((unsigned char)header[0]!=0xFF ||
 				(unsigned char)header[1]!=0xFE) {
 			int c,j,d;
@@ -57,16 +57,16 @@ void copy_out (FILE *f,char *header) {
 						} else {
 							d=fgetc(f);
 						}
-						c=c<<6 | (d & 0x3F);
+						c=(c<<6) | (d & 0x3F);
 					}
 				}
 				fputs (convert_char(c),stdout);
 			}
 		} else {
 			get_unicode_char = get_utf16lsb;
-			fputs(convert_char(header[3]<<8|header[2]),stdout); 
-			fputs(convert_char(header[5]<<8|header[4]),stdout); 
-			fputs(convert_char(header[7]<<8|header[6]),stdout); 
+			fputs(convert_char((header[3]<<8)|header[2]),stdout); 
+			fputs(convert_char((header[5]<<8)|header[4]),stdout); 
+			fputs(convert_char((header[7]<<8)|header[6]),stdout); 
 		}	    
 		while (!catdoc_eof(f)) {
 			i=get_unicode_char(f,&offset,0x7FFFFFFF); 
@@ -170,7 +170,7 @@ int process_file(FILE *f,long stop) {
 				 * else*/
 				buffer[++bufptr]=c;
 			}
-		} while (bufptr<PARAGRAPH_BUFFER-2 &&
+		} while (bufptr<=PARAGRAPH_BUFFER-2 &&
 				 !catdoc_eof(f) &&
 				 buffer[bufptr]!=0x000a);
 		if (bufptr>0) {