From 4197d0708ea4905de0f7c47a7a79d31cb5bede89 Mon Sep 17 00:00:00 2001
From: "rjc%netscape.com" <rjc%netscape.com>
Date: Fri, 9 Oct 1998 01:31:01 +0000
Subject: [PATCH] Fix HTML bookmark parsing code to look for actual tokens
 instead of just guessing.

---
 modules/rdf/src/bmk2mcf.c | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/modules/rdf/src/bmk2mcf.c b/modules/rdf/src/bmk2mcf.c
index 13d966708b59..3492d998cc69 100644
--- a/modules/rdf/src/bmk2mcf.c
+++ b/modules/rdf/src/bmk2mcf.c
@@ -166,6 +166,8 @@ parseNextBkBlob (RDFFile f, char* blob, int32 size)
 void
 parseNextBkToken (RDFFile f, char* token)
 {
+  int16 pos;
+
  /*	printf(token); */
   if (token[0] == '<') {
     bkStateTransition(f, token);
@@ -198,6 +200,10 @@ parseNextBkToken (RDFFile f, char* token)
 			  RDF_RESOURCE_TYPE, true);
 */
     } else if (f->status == IN_ITEM_DESCRIPTION) {
+      if ((pos = charSearch(0x0D, token)) >=0)
+      {
+      	token[pos] = '\0';
+      }
       addDescription(f, f->lastItem, token);
     }
   }
@@ -276,32 +282,36 @@ newLeafBkItem (RDFFile f, char* token)
   char* addDate = NULL;
   char* lastVisit = NULL;
   char* lastModified = NULL;
-  uint8 current = 0;
   int32 len = strlen(token); 
-  int32 n = 0;
+  int32 n = 0, cmdIndex = 0;
   char c = token[n++];
   PRBool inString = false;
   RDF_Resource newR;
   
   while (n < len) {
+    if ((inString == false) && ((c == ' ') || (c == '\t'))) {
+      cmdIndex = n;
+    }
     if (c == '"') {
       if (inString) {
 	token[n-1] = '\0';
 	inString = false;
       } else {
 	inString = true;
-	if (current == 0) {
+	if (startsWith("HREF=", &token[cmdIndex])) {
 	  url = &token[n];
-	} else if (current == 1) {
+	  }
+	else if (startsWith("ADD_DATE=", &token[cmdIndex])) {
 	  addDate = &token[n];
-	} else if (current == 2) {
+	  }
+	else if (startsWith("LAST_VISIT=", &token[cmdIndex])) {
 	  lastVisit = &token[n];
-	} else if (current == 3) {
+	  }
+	else if (startsWith("LAST_MODIFIED=", &token[cmdIndex])) {
 	  lastModified = &token[n];
+	  }
 	}
-	current++;
       }
-    }
     c = token[n++];
   }
   if (url == NULL) return;