Patch to ignore empty lines in files under /control/

Patch to ignore empty lines in files under /control/

[Christian Laursen]

Since empty lines in some of the files in the control dir can result in
suprising behaviour I have made a small patch that makes mlmmj ignore
those.

As far as I can see empty lines doesn't make any sense in any of the
existing tunables, so it should be safe to ignore them.

Unless there are any protests I will probably commit this change
sometime tomorrow.

Index: src/ctrlvalues.c
=================================RCS file: /home/mmj/MMJCVS/mlmmj/src/ctrlvalues.c,v
retrieving revision 1.2
diff -u -w -r1.2 ctrlvalues.c
--- src/ctrlvalues.c	19 Jun 2004 03:44:47 -0000	1.2
+++ src/ctrlvalues.c	1 Feb 2007 10:52:35 -0000
@@ -52,6 +52,8 @@
 	ret->strs = NULL;
 	while((value = mygetline(ctrlfd)) != NULL) {
 		chomp(value);
+		if (*value = '\0')
+			continue;
 		ret->count++;
 		ret->strs = (char **) myrealloc(ret->strs, sizeof(char *) *
 					(ret->count + 1));



-- 
Christian Laursen

Re: Patch to ignore empty lines in files under /control/

[Sven 'Darkman' Michels]

Christian Laursen wrote:
> Unless there are any protests I will probably commit this change
> sometime tomorrow.

What about the footer file? ;)

Regards,

Re: Patch to ignore empty lines in files under /control/

[Christian Laursen]

Sven 'Darkman' Michels <sven@darkman.de> writes:

> Christian Laursen wrote:
>> Unless there are any protests I will probably commit this change
>> sometime tomorrow.
>
> What about the footer file? ;)

As far as I can tell the footer file isn't read by ctrlvalues() so it
should remain unaffected.

-- 
Christian Laursen

Re: Patch to ignore empty lines in files under /control/

[Morten K. Poulsen]

Christian Laursen <xi@borderworlds.dk> wrote:
> Sven 'Darkman' Michels <sven@darkman.de> writes:
>> Christian Laursen wrote:
>>> Unless there are any protests I will probably commit this
>>> change sometime tomorrow.
>>
>> What about the footer file? ;)
> 
> As far as I can tell the footer file isn't read by ctrlvalues()
> so it should remain unaffected.

True. The footer is added with a call to dumpfd2fd().

I think the patch is fine. You might want to add a comment like /* ignore empty lines */ or something :)

Morten

-- 
Morten K. Poulsen <morten@afdelingp.dk>
http://www.afdelingp.dk/