Index: logmsg.c
===================================================================
RCS file: /home/dron/CVS/ccvs-local/src/logmsg.c,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.9
diff -u -r1.1.1.1 -r1.1.1.1.2.9
--- logmsg.c	2002/08/15 08:59:46	1.1.1.1
+++ logmsg.c	2002/08/16 18:21:50	1.1.1.1.2.9
@@ -646,6 +646,8 @@
 {
     struct logfile_info *li;
     char *c;
+		char * chp, * chp2;
+		int spaceCount;
 
     li = (struct logfile_info *) p->data;
     if (li->type == type)
@@ -674,10 +676,27 @@
 		switch (*c)
 		{
 		case 's':
+			/* If p->key contains spaces we must escape it */
+			spaceCount = 0;
+	  	for (chp=p->key;chp[0];chp++) {
+	  		spaceCount += ((unsigned char)chp[0]==(unsigned char)0x20);
+	  	}
 		    str_list =
 			xrealloc (str_list,
-				  strlen (str_list) + strlen (p->key) + 5);
-		    (void) strcat (str_list, p->key);
+				  strlen (str_list) + strlen (p->key) + 5 + spaceCount);
+				if (spaceCount) {
+					chp=p->key;
+			  	for (chp2=strchr(chp,' ');chp2;) {
+						(void) strncat (str_list, chp, chp2-chp);
+						(void) strcat (str_list, "\\ ");
+						chp=chp2+1;
+						chp2=strchr(chp,' ');
+			  	}
+			  	/* the rest of key in chp */
+					(void) strcat (str_list, chp);
+				} else 
+				(void) strcat (str_list, p->key);
+		  
 		    break;
 		case 'V':
 		    str_list =