Sophie

Sophie

distrib > Mandriva > 2008.1 > x86_64 > by-pkgid > d6704b4b123984c98765a19514868fe2 > files > 1

catdoc-0.94-1mdv2008.1.src.rpm

--- catdoc-0.93.4/src/rtfread.c.pix	2004-11-17 18:50:39.222116739 +0100
+++ catdoc-0.93.4/src/rtfread.c	2004-11-17 18:49:33.025276158 +0100
@@ -187,7 +187,7 @@
  * @param f - file stream descriptor
  */
 int parse_rtf(FILE *f) {
-	int para_mode=0, data_skip_mode=0,i;
+	int para_mode=0, data_skip_mode=0;
 	RTFGroupData *groups=NULL;
 	int group_count=0, group_store=20;
 	int bufptr=-1;
@@ -254,9 +254,17 @@
 					break;
 /*  				fprintf(stderr, "Unicode char %d\n", com.numarg);  */
 				if (data_skip_mode == 0)
-					add_to_buffer(&bufptr,rtf_to_unicode(com.numarg));
-				for(i=0;i<groups[group_count].uc;i++)
-					fgetc(f);
+					add_to_buffer(&bufptr,com.numarg);
+				{ 
+					char c;
+					do c = fgetc(f); 
+					while (c == '\n' || c == '\r');
+
+					if (c == '\\') {
+						RTFcommand command;
+						getRtfCommand(f, &command);
+					}
+				}
 				break;
 			case RTF_PARA:
 				/*if (para_mode > 0) {*/