[rox-devel] Re: blank lines in .desktop-files

[Thomas L. <ta...@ec...>]

On Tue, 23 May 2006 09:45:53 +0200, Dennis Tomas wrote:

> Dennis Tomas wrote:
>>
>> 2) An odd thing happens with desktop-files that have blank lines in it.
>> All entries below the first blank line aren't recognized. E.g. it shows
>> no icon if there's a blank line before the Icon-entry and it won't
>> execute if there is one before the Exec-entry. Is this a bug or is it
>> not allowed to have blank lines in a desktop-file?
>>
> It looks like a bug. I've attached a patch that fixes it.

Well spotted! However, I think there's a slight problem with the patch.
The file isn't terminated by any character (e.g., '\0') so if the file
ends with a load of blank lines you'll end up reading from uninitialised
memory. Here's my attempt (committed) - does it look OK to you?

Index: support.c
===================================================================
--- support.c	(revision 4576)
+++ support.c	(working copy)
@@ -1511,6 +1511,9 @@
 	{
 		const char *nl;
 
+		if (next[1] == '\n')
+			continue; /* Cope with blank lines */
+
 		next++;		/* Skip newline */
 
 		if (next[0] == '[')


-- 
Dr Thomas Leonard		http://rox.sourceforge.net
GPG: 9242 9807 C985 3C07 44A6  8B9A AE07 8280 59A5 3CC1