From 0caadb6ceed0de07fc0b778b77674c06cd115175 Mon Sep 17 00:00:00 2001 From: michael Date: Wed, 31 Dec 2008 06:12:29 +0000 Subject: handle config files with (DOS line ending) ported from volker_dev (r826) git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@920 3ae390bd-cb1e-0410-b409-cd5a39f66f1f --- cfg.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cfg.c b/cfg.c index cef48d4..d712db9 100644 --- a/cfg.c +++ b/cfg.c @@ -132,15 +132,19 @@ static char *strip(char *s, const int strip_comments) if (*p == '"') do p++; - while (*p && *p != '\n' && *p != '"'); + while (*p && *p != '\n' && *p != '\r' && *p != '"'); if (*p == '\'') do p++; - while (*p && *p != '\n' && *p != '\''); + while (*p && *p != '\n' && *p != '\r' && *p != '\''); if (*p == '\n' || (strip_comments && *p == '#' && (p == s || *(p - 1) != '\\'))) { *p = '\0'; break; } + if (*p == '\r' && *(p + 1) == '\n') { + /* replace from DOS with blank */ + *p = ' '; + } } for (p--; p > s && isblank(*p); p--) -- cgit v1.2.3 aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2004-03-14[lcd4linux @ 2004-03-14 07:14:05 by reinelt]reinelt3-195/+1
old battery.[ch] files removed git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@402 3ae390bd-cb1e-0410-b409-cd5a39f66f1f
2004-03-14[lcd4linux @ 2004-03-14 07:11:42 by reinelt]reinelt7-42/+270
parameter count fixed for plugin_dvb() plugin_APM (battery status) ported git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@401 3ae390bd-cb1e-0410-b409-cd5a39f66f1f
2004-03-14[lcd4linux @ 2004-03-14 06:07:33 by reinelt]reinelt2-2/+2
Status update. Fixed bug in configure.in with X11 disabled (thanks to Kevin Liu) git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@400 3ae390bd-cb1e-0410-b409-cd5a39f66f1f
2004-03-13[lcd4linux @ 2004-03-13 19:06:01 by reinelt]reinelt3-5/+96
ChangeLog and Status update; small glitch in plugin_seti fixed. git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@399 3ae390bd-cb1e-0410-b409-cd5a39f66f1f
2004-03-13[lcd4linux @ 2004-03-13 14:58:15 by nicowallmeier]nicowallmeier1-4/+7
Added clean termination of imond-connection (now correctly) git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@398 3ae390bd-cb1e-0410-b409-cd5a39f66f1f
2004-03-13[lcd4linux @ 2004-03-13 14:55:14 by nicowallmeier]nicowallmeier1-3/+6
Added clean termination of imond-connection git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@397 3ae390bd-cb1e-0410-b409-cd5a39f66f1f
2004-03-13[lcd4linux @ 2004-03-13 06:55:29 by reinelt]reinelt1-58/+0
(unnecessary) imon.h removed git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@396 3ae390bd-cb1e-0410-b409-cd5a39f66f1f
2004-03-13[lcd4linux @ 2004-03-13 06:49:20 by reinelt]reinelt7-247/+179
seti@home plugin ported to NextGeneration git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@395 3ae390bd-cb1e-0410-b409-cd5a39f66f1f
2004-03-12[lcd4linux @ 2004-03-12 13:58:14 by reinelt]reinelt1-468/+0
removed imon.c (has been replaced by plugin_imon.c) git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@394 3ae390bd-cb1e-0410-b409-cd5a39f66f1f
2004-03-11[lcd4linux @ 2004-03-11 06:39:58 by reinelt]reinelt16-133/+350
big patch from Martin: - reuse filehandles - memory leaks fixed - earlier busy-flag checking with HD44780 - reuse memory for strings in RESULT and hash - netdev_fast to wavid time-consuming regex git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@393 3ae390bd-cb1e-0410-b409-cd5a39f66f1f
2004-03-10[lcd4linux @ 2004-03-10 07:16:15 by reinelt]reinelt7-149/+693
MySQL plugin from Javier added git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@392 3ae390bd-cb1e-0410-b409-cd5a39f66f1f
2004-03-08[lcd4linux @ 2004-03-08 18:46:21 by hejl]hejl1-3/+6
Fixed bug introduced with "caching" the loadavg values git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@391 3ae390bd-cb1e-0410-b409-cd5a39f66f1f
2004-03-08[lcd4linux @ 2004-03-08 18:45:52 by hejl]hejl1-4/+7
fixed segfault when using string concatenation git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@390 3ae390bd-cb1e-0410-b409-cd5a39f66f1f
2004-03-08[lcd4linux @ 2004-03-08 16:26:26 by reinelt]reinelt5-14/+46
re-introduced \nnn (octal) characters in strings text widgets can have a 'update' speed of 0 which means 'never' (may be used for static content) git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@389 3ae390bd-cb1e-0410-b409-cd5a39f66f1f
2004-03-08[lcd4linux @ 2004-03-08 04:33:08 by reinelt]reinelt1-21/+41
string concatenation fixed git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@388 3ae390bd-cb1e-0410-b409-cd5a39f66f1f
2004-03-06[lcd4linux @ 2004-03-06 20:31:16 by reinelt]reinelt12-640/+946
Complete rewrite of the evaluator to get rid of the code from mark Morley (because of license issues). The new Evaluator does a pre-compile of expressions, and stores them in trees. Therefore it should be reasonable faster... git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@387 3ae390bd-cb1e-0410-b409-cd5a39f66f1f
2004-03-03[lcd4linux @ 2004-03-03 08:40:07 by hejl]hejl1-1/+6
Fixed memory leak in hash_get_regex git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@386 3ae390bd-cb1e-0410-b409-cd5a39f66f1f
2004-03-03[lcd4linux @ 2004-03-03 04:44:16 by reinelt]reinelt13-63/+96
changes (cosmetics?) to the big patch from Martin hash patch un-applied git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@385 3ae390bd-cb1e-0410-b409-cd5a39f66f1f
2004-03-03[lcd4linux @ 2004-03-03 03:47:04 by reinelt]reinelt46-167/+770
big patch from Martin Hejl: - use qprintf() where appropriate - save CPU cycles on gettimeofday() - add quit() functions to free allocated memory - fixed lots of memory leaks git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@384 3ae390bd-cb1e-0410-b409-cd5a39f66f1f
2004-03-03[lcd4linux @ 2004-03-03 03:41:02 by reinelt]reinelt1-9/+11
Crystalfontz Contrast issue fixed git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@383 3ae390bd-cb1e-0410-b409-cd5a39f66f1f
2004-03-01[lcd4linux @ 2004-03-01 04:29:51 by reinelt]reinelt4-24/+55
cfg_number() returns -1 on error, 0 if value not found (but default val used), and 1 if value was used from the configuration. HD44780 driver adopted to new cfg_number() Crystalfontz 631 driver nearly finished git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@382 3ae390bd-cb1e-0410-b409-cd5a39f66f1f
2004-02-29[lcd4linux @ 2004-02-29 17:09:53 by reinelt]reinelt5-15/+226
ChangeLog updated Version number bumped to 0.10.0 git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@381 3ae390bd-cb1e-0410-b409-cd5a39f66f1f
2004-02-29[lcd4linux @ 2004-02-29 14:30:59 by reinelt]reinelt1-2/+10
icon visibility fix for generic graphics from Xavier git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@380 3ae390bd-cb1e-0410-b409-cd5a39f66f1f
2004-02-27[lcd4linux @ 2004-02-27 07:06:24 by reinelt]reinelt5-11/+200
new function 'qprintf()' (simple but quick snprintf() replacement) git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@379 3ae390bd-cb1e-0410-b409-cd5a39f66f1f
2004-02-27[lcd4linux @ 2004-02-27 06:07:55 by reinelt]reinelt2-21/+40
hash improvements from Martin git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@378 3ae390bd-cb1e-0410-b409-cd5a39f66f1f
2004-02-26[lcd4linux @ 2004-02-26 21:42:45 by reinelt]reinelt1-3/+12
memory leak fixes from Martin git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@377 3ae390bd-cb1e-0410-b409-cd5a39f66f1f