From 66717f7c35ad0e07d2bfeb892218e5e7875aaeb2 Mon Sep 17 00:00:00 2001 From: Stefan `Sec` Zehl Date: Wed, 18 Apr 2012 01:23:01 +0200 Subject: [PATCH] make readTextFile() better. (ignore newlines at the end and fail better on non-existing file) --- firmware/filesystem/util.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/firmware/filesystem/util.c b/firmware/filesystem/util.c index c172c43..a5c01b5 100644 --- a/firmware/filesystem/util.c +++ b/firmware/filesystem/util.c @@ -105,9 +105,16 @@ int readFile(char * filename, char * data, int len){ int readTextFile(char * filename, char * data, int len){ int readbytes; + if(len<1) return -1; readbytes=readFile(filename,data,len-1); - if(len>=0) - data[readbytes]=0; + if(readbytes<0){ + data[0]=0; + return readbytes; + }; + data[readbytes]=0; + while(readbytes>0 && data[readbytes-1]<0x20){ + data[--readbytes]=0; + }; return readbytes; };