From c7bc969088ae0b8ad6444b11d81044fc7333490c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Paul=20B=C3=A9daride?= Date: Tue, 29 Jan 2013 22:18:20 +0100 Subject: [PATCH] Storage parsing skip empty line --- src/surf/storage.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/surf/storage.c b/src/surf/storage.c index ff827791b4..6c4e2ab446 100644 --- a/src/surf/storage.c +++ b/src/surf/storage.c @@ -594,20 +594,22 @@ static xbt_dict_t parse_storage_content(char *filename, unsigned long *used_size surf_stat_t content; while ((read = getline(&line, &len, file)) != -1) { + if (read){ content = xbt_new0(s_surf_stat_t,1); if(sscanf(line,"%s %d %s %s %ld %s %s %s",user_rights,&nb,user,group,&size,date,time,path)==8) { - content->stat.date = xbt_strdup(date); - content->stat.group = xbt_strdup(group); - content->stat.size = size; - content->stat.time = xbt_strdup(time); - content->stat.user = xbt_strdup(user); - content->stat.user_rights = xbt_strdup(user_rights); - *used_size += content->stat.size; - xbt_dict_set(parse_content,path,content,NULL); - } else { - xbt_die("Be sure of passing a good format for content file.\n"); - // You can generate this kind of file with command line: - // find /path/you/want -type f -exec ls -l {} \; 2>/dev/null > ./content.txt + content->stat.date = xbt_strdup(date); + content->stat.group = xbt_strdup(group); + content->stat.size = size; + content->stat.time = xbt_strdup(time); + content->stat.user = xbt_strdup(user); + content->stat.user_rights = xbt_strdup(user_rights); + *used_size += content->stat.size; + xbt_dict_set(parse_content,path,content,NULL); + } else { + xbt_die("Be sure of passing a good format for content file.\n"); + // You can generate this kind of file with command line: + // find /path/you/want -type f -exec ls -l {} \; 2>/dev/null > ./content.txt + } } } if (line) -- 2.20.1