[Feature][task-view-998]merge P56U10 version, ZXW code

Only Configure: No
Affected branch: master
Affected module: unknow
Is it affected on both ZXIC and MTK: only ZXIC
Self-test: No
Doc Update: No

Change-Id: I466f2ab935c5ede0be1803c75518b2cc4f939c15
diff --git a/ap/app/zte_comm/nvserver/nvserver.c b/ap/app/zte_comm/nvserver/nvserver.c
index 101a499..fe5ba99 100755
--- a/ap/app/zte_comm/nvserver/nvserver.c
+++ b/ap/app/zte_comm/nvserver/nvserver.c
@@ -1,4 +1,19 @@
+/*******************************************************************************
+* °æÈ¨ËùÓÐ (C)2016, ÖÐÐËͨѶ¹É·ÝÓÐÏÞ¹«Ë¾¡£
+* 
+* ÎļþÃû³Æ:     nvserver.c
+* Îļþ±êʶ:     nvserver.c
+* ÄÚÈÝÕªÒª:     nvºǫ́ӦÓÃʵÏÖÎļþ
+* 
+* ÐÞ¸ÄÈÕÆÚ        °æ±¾ºÅ      Ð޸ıê¼Ç        ÐÞ¸ÄÈË          ÐÞ¸ÄÄÚÈÝ
+* ------------------------------------------------------------------------------
+* 2016/06/13      V1.0        Create          ÁõÑÇÄÏ          ´´½¨
+* 
+*******************************************************************************/
 
+/*******************************************************************************
+*                                   Í·Îļþ                                     *
+*******************************************************************************/
 #include <unistd.h>
 #include <errno.h>
 #include <stdio.h>
@@ -10,281 +25,1242 @@
 #include <sys/stat.h>
 #include <sys/ipc.h>
 #include <sys/msg.h>
+
 #include "nvserver.h"
 #include "nv_typedef.h"
 #include <message.h>
+
 #ifdef FOTA_AB
 #include "pub_flags.h"
 #include "flags_api.h"
 #endif
+
 #ifdef __cplusplus
-extern"C"{
+extern "C" {
 #endif
-static void nvConfig();static void nvInit();static int nvDirInit();static void 
-analyMsg(T_NV_MSG_INFO*msgrecv,T_NV_MSG_RESULT*msgsnd);static bool checkNvFs(
-char*file);static bool isCfgConfiged(char*configFile);static bool isNvConfiged(
-char*configFile);static uint getSum(const char*s,int len);static int 
-loadFactroyParam(T_NV_NODE*list);static int restoreNvFs(char*dstFile,char*
-srcFile);static int loadNvFs(char*file);static int addConfigFile(char*nvFile,
-char*configFile);static int saveNvFs(char*nvName,char*nvFile);static int nvset(
-char*file,const char*key,const char*value,int saveFlag);static int nvget(char*
-file,char*key,char*value);static int nvunset(char*file,char*key);static int 
-nvclear(char*file);static int nvreset(char*file);static int nvcommit(char*file);
-T_NV_NODE*nv_list;int nvserver_main(int argc,char*argv[]){int msgId=
-(0xe7a+2066-0x168c);T_NV_MSG_INFO rcvBuf;T_NV_MSG_RESULT sndBuf;struct msqid_ds 
-msgInfo;prctl(PR_SET_NAME,"\x6e\x76\x73\x65\x72\x76\x65\x72",(0x721+7163-0x231c)
-,(0x77a+1071-0xba9),(0x22b+6826-0x1cd5));memset(&rcvBuf,(0x12dd+715-0x15a8),
-sizeof(rcvBuf));memset(&sndBuf,(0xa8a+3067-0x1685),sizeof(sndBuf));memset(&
-msgInfo,(0xdcf+2206-0x166d),sizeof(msgInfo));msgId=msgget(MODULE_ID_NV,IPC_CREAT
-|(0xae7+5318-0x1e2d));if(-(0x1755+3387-0x248f)==msgId){printf(
-"\x6e\x76\x73\x65\x72\x76\x65\x72\x20\x65\x72\x72\x6f\x72\x3a\x20\x6d\x73\x67\x67\x65\x74\x20\x6d\x73\x67\x49\x64\x20\x66\x61\x69\x6c\x2c\x20\x65\x72\x72\x6e\x6f\x20\x3d\x20\x25\x64" "\n"
-,errno);return-(0x151f+3866-0x2438);}if(-(0x694+8073-0x261c)!=msgctl(msgId,
-IPC_STAT,&msgInfo)){msgInfo.msg_qbytes=262144;if(-(0x6e0+5543-0x1c86)==msgctl(
-msgId,IPC_SET,&msgInfo))printf(
-"\x6e\x76\x73\x65\x72\x76\x65\x72\x20\x65\x72\x72\x6f\x72\x3a\x20\x6d\x73\x67\x63\x74\x6c\x20\x6d\x73\x67\x49\x64\x20\x66\x61\x69\x6c\x2c\x20\x65\x72\x72\x6e\x6f\x20\x3d\x20\x25\x64" "\n"
-,errno);}if(nvDirInit()!=(0x1916+2322-0x2228)){printf(
-"\x6e\x76\x44\x69\x72\x49\x6e\x69\x74\x20\x66\x61\x69\x6c\x65\x21" "\n");return-
-(0x6d7+7153-0x22c7);}nvConfig();nvInit();while((0x45f+958-0x81c)){if(-
-(0x301+3995-0x129b)==msgrcv(msgId,&rcvBuf,sizeof(T_NV_MSG_INFO)-sizeof(long),
-MSG_TYPE_NV,(0xc26+3801-0x1aff))){printf(
-"\x6e\x76\x73\x65\x72\x76\x65\x72\x20\x65\x72\x72\x6f\x72\x3a\x20\x6e\x76\x73\x65\x72\x76\x65\x72\x20\x6d\x73\x67\x72\x63\x76\x20\x66\x61\x69\x6c\x2c\x20\x65\x72\x72\x6e\x6f\x20\x3d\x20\x25\x64\x21" "\n"
-,errno);continue;}analyMsg(&rcvBuf,&sndBuf);if(-(0x6c0+5642-0x1cc9)==msgsnd(
-msgId,&sndBuf,sizeof(T_NV_MSG_RESULT)-sizeof(long),(0x57f+3769-0x1438))){printf(
-"\x6e\x76\x73\x65\x72\x76\x65\x72\x20\x65\x72\x72\x6f\x72\x3a\x20\x6e\x76\x73\x65\x72\x76\x65\x72\x20\x6d\x73\x67\x73\x6e\x64\x20\x66\x61\x69\x6c\x2c\x20\x65\x72\x72\x6e\x6f\x20\x3d\x20\x25\x64\x21" "\n"
-,errno);continue;}}return((0x10c9+920-0x1461));}static void configdir(char*dir){
-DIR*dp;int ret;struct dirent*entry;struct stat statbuf;if((dp=opendir(dir))==
-NULL){fprintf(stderr,
-"\x63\x61\x6e\x6e\x6f\x74\x20\x6f\x70\x65\x6e\x20\x64\x69\x72\x65\x63\x74\x6f\x72\x79\x3a\x20\x25\x73" "\n"
-,dir);return;}chdir(dir);while((entry=readdir(dp))!=NULL){ret=lstat(entry->
-d_name,&statbuf);if(ret<(0x93f+3551-0x171e)){fprintf(stderr,
-"\x6c\x73\x74\x61\x74\x20\x65\x72\x72\x6f\x72\x3a\x20\x25\x73" "\n",strerror(
-errno));chdir("\x2e\x2e");closedir(dp);return;}if(!S_ISDIR(statbuf.st_mode)){if(
-strcmp("\x2e",entry->d_name)==(0x82d+7150-0x241b)||strcmp("\x2e\x2e",entry->
-d_name)==(0xae0+824-0xe18))continue;if(!isNvConfiged(entry->d_name)){if(
-addConfigFile(entry->d_name,NULL)!=RESULT_SUCCESS)printf(
-"\x6e\x76\x73\x65\x72\x76\x65\x72\x20\x65\x72\x72\x6f\x72\x3a\x63\x6f\x6e\x66\x69\x67\x20\x25\x73\x20\x65\x72\x72\x6f\x72\x21" "\n"
-,entry->d_name);}}}chdir("\x2e\x2e");closedir(dp);}static void nvConfig(){char*
-val=NULL;FILE*fp=NULL;char buf[NV_MAX_CONFIG_LEN]={(0x510+4322-0x15f2)};fp=fopen
-(NV_CONFIG_FILE,"\x72\x6f");if(!fp){printf(
-"\x6e\x76\x73\x65\x72\x76\x65\x72\x20\x65\x72\x72\x6f\x72\x3a\x6f\x70\x65\x6e\x20\x25\x73\x20\x66\x69\x6c\x65\x20\x66\x61\x69\x6c\x20\x65\x72\x72\x6e\x6f\x20\x3d\x20\x25\x64\x21" "\n"
-,NV_CONFIG_FILE,errno);return;}while(fgets(buf,NV_MAX_CONFIG_LEN,fp)){if(buf[
-(0x84f+7727-0x267e)]=='\n'||buf[(0xf2a+4513-0x20cb)]==
-((char)(0x601+4850-0x18d0)))continue;val=strchr(buf,((char)(0xf85+3266-0x1c0a)))
-;if(!val){printf(
-"\x6e\x76\x73\x65\x72\x76\x65\x72\x20\x65\x72\x72\x6f\x72\x3a\x25\x73\x20\x66\x69\x6c\x65\x20\x66\x6f\x72\x6d\x61\x74\x20\x65\x72\x72\x6f\x72\x3a\x20\x73\x74\x72\x20\x3d\x20\x25\x73\x21" "\n"
-,NV_CONFIG_FILE,buf);continue;}buf[strlen(buf)-(0xb39+4270-0x1be6)]='\0';*val++=
-'\0';if(!isCfgConfiged(buf)){if(addConfigFile(val,buf)!=RESULT_SUCCESS)printf(
-"\x6e\x76\x73\x65\x72\x76\x65\x72\x20\x65\x72\x72\x6f\x72\x3a\x63\x6f\x6e\x66\x69\x67\x20\x25\x73\x20\x65\x72\x72\x6f\x72\x21" "\n"
-,buf);}}fclose(fp);configdir(NV_FS_MAIN_PATH);}static int nvDirInit(){if(access(
-NV_FS_PATH,F_OK)!=(0x1ca9+1419-0x2234)){if(mkdir(NV_FS_PATH,(0x29d+142-0x13e))!=
-(0x1e29+652-0x20b5)){printf(
-"\x6e\x65\x72\x76\x65\x72\x20\x6d\x6b\x64\x69\x72\x20\x25\x73\x20\x66\x61\x6c\x69\x2c\x65\x72\x72\x6e\x6f\x3d\x25\x64" "\n"
-,NV_FS_PATH,errno);return-(0x194d+264-0x1a54);}if(mkdir(NV_FS_MAIN_PATH,
-(0x249a+1070-0x26db))!=(0x14f+2741-0xc04)){printf(
-"\x6e\x65\x72\x76\x65\x72\x20\x6d\x6b\x64\x69\x72\x20\x25\x73\x20\x66\x61\x6c\x69\x2c\x65\x72\x72\x6e\x6f\x3d\x25\x64" "\n"
-,NV_FS_MAIN_PATH,errno);return-(0xd8f+5331-0x2261);}if(mkdir(NV_FS_BACKUP_PATH,
-(0x1c92+1041-0x1eb6))!=(0x122c+168-0x12d4)){printf(
-"\x6e\x65\x72\x76\x65\x72\x20\x6d\x6b\x64\x69\x72\x20\x25\x73\x20\x66\x61\x6c\x69\x2c\x65\x72\x72\x6e\x6f\x3d\x25\x64" "\n"
-,NV_FS_BACKUP_PATH,errno);return-(0xa12+30-0xa2f);}}else{if(access(
-NV_FS_MAIN_PATH,F_OK)!=(0x14e8+1394-0x1a5a)){if(mkdir(NV_FS_MAIN_PATH,
-(0x1ff7+2203-0x26a5))!=(0x23eb+788-0x26ff)){printf(
-"\x6e\x65\x72\x76\x65\x72\x20\x6d\x6b\x64\x69\x72\x20\x25\x73\x20\x66\x61\x6c\x69\x2c\x65\x72\x72\x6e\x6f\x3d\x25\x64" "\n"
-,NV_FS_MAIN_PATH,errno);return-(0xc98+1801-0x13a0);}}if(access(NV_FS_BACKUP_PATH
-,F_OK)!=(0x3b7+6332-0x1c73)){if(mkdir(NV_FS_BACKUP_PATH,(0xd77+6373-0x246f))!=
-(0x1557+2974-0x20f5)){printf(
-"\x6e\x65\x72\x76\x65\x72\x20\x6d\x6b\x64\x69\x72\x20\x25\x73\x20\x66\x61\x6c\x69\x2c\x65\x72\x72\x6e\x6f\x3d\x25\x64" "\n"
-,NV_FS_BACKUP_PATH,errno);return-(0x73b+7107-0x22fd);}}}return
-(0x10c+5360-0x15fc);}static void nvInit(){T_NV_NODE*list=NULL;char nvMainFile[
-NV_PATH_LEN]={(0x471+321-0x5b2)};char nvBackupFile[NV_PATH_LEN]={
-(0xdbb+722-0x108d)};
+
+/*******************************************************************************
+*                                  ³£Á¿¶¨Òå                                    *
+*******************************************************************************/
+
+/*******************************************************************************
+*                                   ºê¶¨Òå                                     *
+*******************************************************************************/
+
+/*******************************************************************************
+*                                Êý¾ÝÀàÐͶ¨Òå                                  *
+*******************************************************************************/
+
+/*******************************************************************************
+*                                ¾Ö²¿º¯ÊýÉùÃ÷                                  *
+*******************************************************************************/
+static void nvConfig();
+static void nvInit();
+static int nvDirInit();
+static void analyMsg(T_NV_MSG_INFO *msgrecv, T_NV_MSG_RESULT *msgsnd);
+static bool checkNvFs(char *file);
+static bool isCfgConfiged(char *configFile);
+static bool isNvConfiged(char *configFile);
+static uint getSum(const char *s, int len);
+static int loadFactroyParam(T_NV_NODE *list);
+static int restoreNvFs(char *dstFile, char *srcFile);
+static int loadNvFs(char *file);
+static int addConfigFile(char *nvFile, char *configFile);
+static int saveNvFs(char *nvName, char *nvFile);
+static int nvset(char *file, const char *key, const char *value, int saveFlag);
+static int nvget(char *file, char *key, char *value);
+static int nvunset(char *file, char *key);
+static int nvclear(char *file);
+static int nvreset(char *file);
+static int nvcommit(char *file);
+
+/*******************************************************************************
+*                              ¾Ö²¿¾²Ì¬±äÁ¿¶¨Òå                                *
+*******************************************************************************/
+
+/*******************************************************************************
+*                                È«¾Ö±äÁ¿¶¨Òå                                  *
+*******************************************************************************/
+T_NV_NODE *nv_list;
+
+/*******************************************************************************
+*                                ¾Ö²¿º¯ÊýʵÏÖ                                  *
+*******************************************************************************/
+
+/*******************************************************************************
+*                                È«¾Öº¯ÊýʵÏÖ                                  *
+*******************************************************************************/
+
+/*******************************************************************************
+* ¹¦ÄÜÃèÊö:     main
+* ²ÎÊý˵Ã÷:     
+*   (´«Èë²ÎÊý)  void
+*   (´«³ö²ÎÊý)  void
+* ·µ »Ø Öµ:     void
+* ÆäËü˵Ã÷:     void
+*******************************************************************************/
+int nvserver_main(int argc, char *argv[])
+{
+    int msgId = 0;
+    T_NV_MSG_INFO   rcvBuf;
+    T_NV_MSG_RESULT sndBuf;
+    struct msqid_ds msgInfo;
+
+    prctl(PR_SET_NAME, "nvserver", 0, 0, 0);
+
+    memset( &rcvBuf, 0, sizeof(rcvBuf));
+    memset( &sndBuf, 0, sizeof(sndBuf));
+    memset( &msgInfo, 0, sizeof(msgInfo));
+
+    msgId = msgget(MODULE_ID_NV, IPC_CREAT | 0600);    
+    if(-1 == msgId)
+    {
+        printf("nvserver error: msgget msgId fail, errno = %d\n", errno);
+        return -1;
+    }
+
+    if(-1 != msgctl(msgId, IPC_STAT, &msgInfo))
+    {         
+        msgInfo.msg_qbytes = 262144; // 256k
+        if(-1 == msgctl(msgId, IPC_SET, &msgInfo))
+            printf("nvserver error: msgctl msgId fail, errno = %d\n", errno);
+    }
+
+	if(nvDirInit() != 0)
+	{
+		printf("nvDirInit faile!\n");
+		return -1;
+	}
+		
+    nvConfig();
+    
+    nvInit();
+
+    // ÏûÏ¢½»»¥
+    while(1)
+    {
+        if(-1 == msgrcv(msgId, &rcvBuf, sizeof(T_NV_MSG_INFO) - sizeof(long), MSG_TYPE_NV, 0))
+        {
+            printf("nvserver error: nvserver msgrcv fail, errno = %d!\n", errno);
+            continue;   
+        }
+        
+        analyMsg(&rcvBuf, &sndBuf);
+        
+        if(-1 == msgsnd(msgId, &sndBuf, sizeof(T_NV_MSG_RESULT) - sizeof(long), 0))
+        {
+            printf("nvserver error: nvserver msgsnd fail, errno = %d!\n", errno);
+            continue;   
+        }   
+    }
+    
+    return (0);
+}
+
+/*******************************************************************************
+* ¹¦ÄÜÃèÊö:     configdir
+* ²ÎÊý˵Ã÷:     
+*   (´«Èë²ÎÊý)  dir
+*   (´«³ö²ÎÊý)  void
+* ·µ »Ø Öµ:     void
+* ÆäËü˵Ã÷:     void
+*******************************************************************************/
+static void configdir(char *dir)
+{
+    DIR *dp;
+    int ret;
+    
+    struct dirent *entry;
+    struct stat statbuf;
+    if((dp = opendir(dir)) == NULL) 
+    {
+        fprintf(stderr,"cannot open directory: %s\n", dir);
+        return;
+    }
+    
+    chdir(dir);
+    while((entry = readdir(dp)) != NULL) 
+    {
+        ret = lstat(entry->d_name,&statbuf);
+        if (ret < 0)
+        {
+            fprintf(stderr,"lstat error: %s\n", strerror(errno));
+            chdir("..");
+            closedir(dp);
+            return;
+        }
+        if(!S_ISDIR(statbuf.st_mode)) 
+        {
+           
+            if(strcmp(".",entry->d_name) == 0 ||strcmp("..",entry->d_name) == 0)
+                continue;
+            
+            if(!isNvConfiged(entry->d_name))
+            {
+                if(addConfigFile(entry->d_name, NULL) != RESULT_SUCCESS)
+                     printf("nvserver error:config %s error!\n", entry->d_name);
+            } 
+        }
+    }
+    chdir("..");
+    closedir(dp);
+}
+
+/*******************************************************************************
+* ¹¦ÄÜÃèÊö:     nvConfig
+* ²ÎÊý˵Ã÷:     
+*   (´«Èë²ÎÊý)  void
+*   (´«³ö²ÎÊý)  void
+* ·µ »Ø Öµ:     void
+* ÆäËü˵Ã÷:     void
+*******************************************************************************/
+static void nvConfig()
+{
+    char *val   = NULL;
+    FILE *fp    = NULL;
+    char buf[NV_MAX_CONFIG_LEN] = {0};
+
+    fp = fopen(NV_CONFIG_FILE, "ro");
+    if(!fp)
+    {
+        printf("nvserver error:open %s file fail errno = %d!\n", NV_CONFIG_FILE, errno);
+        return;
+    }        
+
+    while (fgets(buf, NV_MAX_CONFIG_LEN, fp)) 
+    {
+        if (buf[0] == '\n' || buf[0] == '#')
+            continue;
+        
+        val = strchr(buf, '=');
+        if (!val) 
+        {
+            printf("nvserver error:%s file format error: str = %s!\n", NV_CONFIG_FILE, buf);
+            continue;
+        }
+
+        // buf=nvconfig val=nvfile
+        buf[strlen(buf) - 1] = '\0';
+        *val++ = '\0';
+
+        if(!isCfgConfiged(buf))
+        {
+            if(addConfigFile(val, buf) != RESULT_SUCCESS)
+                 printf("nvserver error:config %s error!\n", buf);
+        }  
+    }
+
+    fclose(fp);
+
+    configdir(NV_FS_MAIN_PATH);
+}
+
+/*******************************************************************************
+* ¹¦ÄÜÃèÊö:     nvDirInit
+* ²ÎÊý˵Ã÷:     
+*   (´«Èë²ÎÊý)  void
+*   (´«³ö²ÎÊý)  void
+* ·µ »Ø Öµ:     void
+* ÆäËü˵Ã÷:     void
+*******************************************************************************/
+static int nvDirInit()
+{
+	if(access(NV_FS_PATH, F_OK) != 0)
+	{
+		if(mkdir(NV_FS_PATH, 0755) != 0)
+		{
+			printf("nerver mkdir %s fali,errno=%d\n", NV_FS_PATH, errno);
+			return -1;
+		}
+
+		if(mkdir(NV_FS_MAIN_PATH, 0755) != 0)
+		{
+			printf("nerver mkdir %s fali,errno=%d\n", NV_FS_MAIN_PATH, errno);
+			return -1;
+		}
+
+		if(mkdir(NV_FS_BACKUP_PATH, 0755) != 0)
+		{
+			printf("nerver mkdir %s fali,errno=%d\n", NV_FS_BACKUP_PATH, errno);
+			return -1;
+		}
+	}
+	else
+	{
+		if(access(NV_FS_MAIN_PATH, F_OK) != 0)
+		{
+			if(mkdir(NV_FS_MAIN_PATH, 0755) != 0)
+			{
+				printf("nerver mkdir %s fali,errno=%d\n", NV_FS_MAIN_PATH, errno);
+				return -1;
+			}
+		}
+
+		if(access(NV_FS_BACKUP_PATH, F_OK) != 0)
+		{
+			if(mkdir(NV_FS_BACKUP_PATH, 0755) != 0)
+			{
+				printf("nerver mkdir %s fali,errno=%d\n", NV_FS_BACKUP_PATH, errno);
+				return -1;
+			}
+		}
+	}
+
+	return 0;
+}
+
+
+/*******************************************************************************
+* ¹¦ÄÜÃèÊö:     nvInit
+* ²ÎÊý˵Ã÷:     
+*   (´«Èë²ÎÊý)  void
+*   (´«³ö²ÎÊý)  void
+* ·µ »Ø Öµ:     void
+* ÆäËü˵Ã÷:     void
+*******************************************************************************/
+static void nvInit()
+{
+    T_NV_NODE   *list                       = NULL;
+    char        nvMainFile[NV_PATH_LEN]     = {0};
+    char        nvBackupFile[NV_PATH_LEN]   = {0};
 #ifdef FOTA_AB
-T_FLAGS_INFO flags_info={(0xc88+3690-0x1af2)};int ret=(0x2+587-0x24d);
+	T_FLAGS_INFO flags_info = {0};
+	int ret = 0;
 #endif
-for(list=nv_list;list;list=list->next){snprintf(nvMainFile,NV_PATH_LEN,
-"\x25\x73\x2f\x25\x73",NV_FS_MAIN_PATH,list->nvFile);snprintf(nvBackupFile,
-NV_PATH_LEN,"\x25\x73\x2f\x25\x73",NV_FS_BACKUP_PATH,list->nvFile);if(checkNvFs(
-nvMainFile)){if(!checkNvFs(nvBackupFile))restoreNvFs(nvBackupFile,nvMainFile);}
-else if(checkNvFs(nvBackupFile)){restoreNvFs(nvMainFile,nvBackupFile);}else{
-loadFactroyParam(list);nvcommit(list->nvFile);continue;}loadNvFs(list->nvFile);
-if(!strcmp(list->nvFile,NV_CFG)&&get_update_status()==(0x89+9653-0x263c)){
-reloadFactroyParam(list);delete_not_needed(list);nvcommit(list->nvFile);
+	
+    for(list = nv_list; list; list = list->next)
+    {
+        snprintf(nvMainFile, NV_PATH_LEN, "%s/%s", NV_FS_MAIN_PATH, list->nvFile);
+        snprintf(nvBackupFile, NV_PATH_LEN, "%s/%s", NV_FS_BACKUP_PATH, list->nvFile);
+
+        if(checkNvFs(nvMainFile)) 
+        {
+            if(!checkNvFs(nvBackupFile))
+                restoreNvFs(nvBackupFile, nvMainFile);
+        }
+        else if(checkNvFs(nvBackupFile))
+        {
+            restoreNvFs(nvMainFile, nvBackupFile);
+        }
+        else
+        {
+            loadFactroyParam(list);
+			nvcommit(list->nvFile);
+            continue;
+        }
+
+        loadNvFs(list->nvFile);
+	if(!strcmp(list->nvFile, NV_CFG) && get_update_status() == 2  ){
+		reloadFactroyParam(list);
+		delete_not_needed(list);
+		nvcommit(list->nvFile);
 #ifdef FOTA_AB
-ret=flags_get(&flags_info);flags_info.boot_fota_flag.fota_status=
-(0xfc6+4638-0x21e4);ret=flags_set(&flags_info);
+		ret = flags_get(&flags_info);
+		flags_info.boot_fota_flag.fota_status = 0;
+		ret = flags_set(&flags_info);
 #endif
-}}}uint hash(const char*s){uint hash=(0x537+6036-0x1ccb);while(*s){hash=
-NV_HASH_MUL*hash+*s++;}return hash;}static int loadFactroyParam(T_NV_NODE*list){
-char*val=NULL;FILE*fp=NULL;T_NV_CONFIG*config=NULL;char buf[NV_MAX_ITEM_LEN]={
-(0x1d8+9324-0x2644)};for(config=list->fileList;config;config=config->next){fp=
-fopen(config->configFile,"\x72\x6f");if(!fp){printf(
-"\x6e\x76\x73\x65\x72\x76\x65\x72\x20\x65\x72\x72\x6f\x72\x3a\x6f\x70\x65\x6e\x20\x25\x73\x20\x66\x69\x6c\x65\x20\x66\x61\x69\x6c\x20\x65\x72\x72\x6e\x6f\x20\x3d\x20\x25\x64\x21" "\n"
-,config->configFile,errno);return RESULT_FILE_OPEN_FAIL;}while(fgets(buf,
-NV_MAX_ITEM_LEN,fp)){if(buf[(0x1277+4187-0x22d2)]=='\n'||buf[(0x6ff+8141-0x26cc)
-]==((char)(0xd0a+3970-0x1c69)))continue;val=strchr(buf,
-((char)(0x1486+1381-0x19ae)));if(!val){printf(
-"\x6e\x76\x73\x65\x72\x76\x65\x72\x20\x65\x72\x72\x6f\x72\x3a\x25\x73\x20\x66\x69\x6c\x65\x20\x66\x6f\x72\x6d\x61\x74\x20\x65\x72\x72\x6f\x72\x3a\x73\x74\x72\x69\x6e\x67\x20\x3d\x20\x25\x73" "\n"
-,config->configFile,buf);continue;}if(buf[strlen(buf)-(0x75c+239-0x84a)]=='\n')
-buf[strlen(buf)-(0x104+6728-0x1b4b)]='\0';*val++='\0';nvset(list->nvFile,buf,val
-,(0x134a+1615-0x1998));}printf(
-"\x6e\x76\x73\x65\x72\x76\x65\x72\x20\x6c\x6f\x61\x64\x46\x61\x63\x74\x72\x6f\x79\x50\x61\x72\x61\x6d\x20\x25\x73\x21" "\n"
-,config->configFile);fclose(fp);}return RESULT_SUCCESS;}static bool checkNvFs(
-char*file){int len=(0xb72+5012-0x1f06);int cnt=(0x354+6751-0x1db3);FILE*fp=NULL;
-char*buf=NULL;struct stat statbuff={(0xdb8+3546-0x1b92)};if(stat(file,&statbuff)
-<(0x244+1296-0x754))return false;len=statbuff.st_size;if(len<NV_CHECK_SIZE)
-return false;fp=fopen(file,"\x72\x6f");if(!fp)return false;buf=(char*)malloc(len
-);if(!buf){fclose(fp);return false;}cnt=(0x2075+1098-0x24bf);while(cnt<len){cnt=
-cnt+fread(buf+cnt,(0xc34+187-0xcee),len-cnt,fp);if(ferror(fp)){clearerr(fp);free
-(buf);fclose(fp);return false;}}if(len!=cnt){free(buf);fclose(fp);return false;}
-if(getSum(buf,len-NV_CHECK_SIZE)+NV_FILE_FLAG!=*(uint*)(buf+len-NV_CHECK_SIZE)){
-free(buf);fclose(fp);return false;}free(buf);fclose(fp);return true;}static int 
-copyfile(const char*from,const char*to){int fd_to;int fd_from;char buf[
-(0x12b8+6770-0x1d2a)];ssize_t nread;int ret=-(0x480+3392-0x11bf);fd_from=open(
-from,O_RDONLY);if(fd_from<(0x70+5260-0x14fc))return-(0x15ec+4222-0x2668);fd_to=
-open(to,O_RDWR|O_CREAT|O_TRUNC|O_SYNC,(0xb21+4555-0x1b4c));if(fd_to<
-(0x795+6002-0x1f07)){ret=-(0x1562+3795-0x2432);goto out_error;}while(
-(0x434+8843-0x26be)){char*out_ptr;ssize_t nwritten;nread=read(fd_from,buf,sizeof
-(buf));if(nread==(0x6d5+8193-0x26d6)){break;}else{if(nread<(0x7bb+3192-0x1433)){
-if(errno==EINTR||errno==EAGAIN){continue;}else{ret=-(0x1588+717-0x1851);goto 
-out_error;}}}out_ptr=buf;do{nwritten=write(fd_to,out_ptr,nread);if(nwritten>
-(0x9aa+1698-0x104c)){nread-=nwritten;out_ptr+=nwritten;}else{if(nwritten<
-(0xe7d+77-0xeca)){if(errno==EINTR||errno==EAGAIN){continue;}else{ret=-
-(0xc34+1310-0x114d);goto out_error;}}}}while(nread>(0x726+5923-0x1e49));}ret=
-fsync(fd_to);if(ret<(0x48f+5872-0x1b7f)){printf(
-"\x53\x79\x6e\x63\x20\x46\x61\x69\x6c\x65\x64\x3a\x25\x73\x2c\x20\x66\x69\x6c\x65\x20\x70\x61\x74\x68\x3a\x25\x73"
-,strerror(errno),to);goto out_error;}if(close(fd_to)<(0x1306+2532-0x1cea)){fd_to
-=-(0x10e4+4316-0x21bf);ret=-(0x2df+1211-0x794);goto out_error;}close(fd_from);
-return(0x1cd4+1409-0x2255);out_error:printf(
-"\x63\x6f\x70\x79\x66\x69\x6c\x65\x20\x25\x73\x20\x74\x6f\x20\x25\x73\x20\x65\x72\x72\x6f\x72\x3a\x25\x64" "\n"
-,from,to,ret);close(fd_from);if(fd_to>=(0xc25+185-0xcde))close(fd_to);return ret
-;}static int restoreNvFs(char*dstFile,char*srcFile){if(copyfile(srcFile,dstFile)
-!=(0xf14+2971-0x1aaf))return RESULT_FAIL;return RESULT_SUCCESS;}static int 
-loadNvFs(char*file){int len=(0x2dc+4597-0x14d1);int cnt=(0x2d4+9022-0x2612);FILE
-*fp=NULL;char*buf=NULL;char*name=NULL;char*value=NULL;char*eq=NULL;struct stat 
-statbuff={(0xbf6+3098-0x1810)};char nvFile[NV_PATH_LEN]={(0x1971+3000-0x2529)};
-sprintf(nvFile,"\x25\x73\x2f\x25\x73",NV_FS_MAIN_PATH,file);if(stat(nvFile,&
-statbuff)<(0x762+4454-0x18c8))return RESULT_FAIL;len=statbuff.st_size;if(
-NV_CHECK_SIZE>len)return RESULT_FAIL;fp=fopen(nvFile,"\x72\x6f");if(!fp)return 
-RESULT_FILE_OPEN_FAIL;len=len-NV_CHECK_SIZE;buf=(char*)malloc(len+
-(0x1ba2+1756-0x227d));if(!buf){fclose(fp);return RESULT_MALLOC_FAIL;}memset(buf,
-(0xc11+5775-0x22a0),len+(0xf89+3474-0x1d1a));cnt=(0xa33+4352-0x1b33);while(cnt<
-len){cnt=cnt+fread(buf+cnt,(0x1477+4008-0x241e),len-cnt,fp);if(ferror(fp)){
-clearerr(fp);fclose(fp);free(buf);return RESULT_FILE_READ_FAIL;}}if(cnt!=len){
-fclose(fp);free(buf);return RESULT_FILE_READ_FAIL;}buf[len]='\0';name=buf;while(
-*name){if(!(eq=strchr(name,((char)(0x2277+449-0x23fb))))){break;}*eq='\0';value=
-eq+(0x1898+637-0x1b14);nvset(file,name,value,(0x14cc+904-0x1853));*eq=
-((char)(0x323+4632-0x14fe));name=value+strlen(value)+(0x383+4424-0x14ca);}free(
-buf);fclose(fp);return RESULT_SUCCESS;}static void analyMsg(T_NV_MSG_INFO*
-msgrecv,T_NV_MSG_RESULT*msgsnd){switch(msgrecv->nvType){case MSG_GET:msgsnd->
-result=nvget(msgrecv->file,msgrecv->key,msgsnd->value);break;case MSG_SET:msgsnd
-->result=nvset(msgrecv->file,msgrecv->key,msgrecv->value,msgrecv->saveflag);
-break;case MSG_UNSET:msgsnd->result=nvunset(msgrecv->file,msgrecv->key);break;
-case MSG_CLEAR:msgsnd->result=nvclear(msgrecv->file);break;case MSG_RESET:msgsnd
-->result=nvreset(msgrecv->file);break;case MSG_SHOW:msgsnd->result=saveNvFs(
-msgrecv->file,NV_FS_SHOW);;break;case MSG_COMMIT:msgsnd->result=nvcommit(msgrecv
-->file);break;default:break;}msgsnd->msgType=msgrecv->pid;msgsnd->msgIndex=
-msgrecv->msgIndex;}static int addConfigFile(char*nvFile,char*configFile){
-T_NV_NODE*list=NULL;T_NV_NODE*newList=NULL;T_NV_CONFIG*newConfig=NULL;if(!nvFile
-){printf(
-"\x6e\x76\x73\x65\x72\x76\x65\x72\x20\x65\x72\x72\x6f\x72\x3a\x20\x70\x61\x72\x61\x6d\x20\x69\x6c\x6c\x65\x67\x61\x6c\x21" "\n"
-);return RESULT_INVAL;}if(configFile){newConfig=(T_NV_CONFIG*)malloc(sizeof(
-T_NV_CONFIG));if(!newConfig)return RESULT_MALLOC_FAIL;strncpy(newConfig->
-configFile,configFile,NV_PATH_LEN-(0x3d9+364-0x544));newConfig->configFile[
-NV_PATH_LEN-(0x17d1+2559-0x21cf)]='\0';newConfig->next=NULL;}for(list=nv_list;
-list;list=list->next){if(strcmp(list->nvFile,nvFile)==(0x1e00+1484-0x23cc))break
-;}if(!list){newList=(T_NV_NODE*)malloc(sizeof(T_NV_NODE));if(!newList){if(
-newConfig)free(newConfig);return RESULT_MALLOC_FAIL;}newList->next=NULL;strncpy(
-newList->nvFile,nvFile,NV_PATH_LEN-(0x324+1980-0xadf));newList->nvFile[
-NV_PATH_LEN-(0x955+3249-0x1605)]='\0';memset(newList->nvTable,
-(0xc52+4853-0x1f47),NV_HASH_LEN*(0x73a+6839-0x21ed));newList->fileList=newConfig
-;if(!nv_list)nv_list=newList;else{newList->next=nv_list->next;nv_list->next=
-newList;}}else if(!list->fileList)list->fileList=newConfig;else{if(newConfig==
-NULL)return RESULT_FAIL;newConfig->next=list->fileList->next;list->fileList->
-next=newConfig;}return RESULT_SUCCESS;}static bool isCfgConfiged(char*configFile
-){T_NV_NODE*list=NULL;T_NV_CONFIG*config=NULL;for(list=nv_list;list;list=list->
-next){for(config=list->fileList;config;config=config->next){if(!strcmp(config->
-configFile,configFile))return true;}}return false;}static bool isNvConfiged(char
-*nvFile){T_NV_NODE*list=NULL;for(list=nv_list;list;list=list->next){if(!strcmp(
-list->nvFile,nvFile))return true;}return false;}static uint getSum(const char*s,
-int len){uint sum=(0x1ddf+172-0x1e8b);char*data=(char*)s;while(len-- >
-(0x549+1618-0xb9b)){sum+=(*data++);}return sum;}static int saveNvFs(char*nvName,
-char*nvFile){int i=(0x826+6755-0x2289);int sum=(0x752+3072-0x1352);int bufSize=
-(0x153+1357-0x6a0);int itemSize=(0x1b65+2062-0x2373);int ret=(0x93d+3433-0x16a6)
-;int fp=(0x454+794-0x76e);char*buf=NULL;T_NV_NODE*list=NULL;T_NV_ITEM*item=NULL;
-for(list=nv_list;list;list=list->next){if(strcmp(list->nvFile,nvName))continue;
-fp=open(nvFile,O_SYNC|O_RDWR|O_CREAT|O_TRUNC,(0x43c+8005-0x21e1));if(fp==-
-(0xa35+228-0xb18)){printf(
-"\x6f\x70\x65\x6e\x20\x25\x73\x20\x66\x61\x69\x6c\x2c\x65\x72\x72\x6e\x6f\x20\x3d\x20\x25\x64" "\n"
-,nvFile,errno);return RESULT_FILE_OPEN_FAIL;}buf=(char*)malloc(NV_BLOCK_SIZE);if
-(!buf){close(fp);return RESULT_MALLOC_FAIL;}for(i=(0xf16+2821-0x1a1b);i<
-NV_HASH_LEN;i++){for(item=list->nvTable[i];item;item=item->next){if(strcmp(
-nvFile,NV_FS_SHOW)&&!item->saveFlag)continue;itemSize=strlen(item->key)+strlen(
-item->value)+(0x13b4+2864-0x1ee2);if(bufSize+itemSize>NV_BLOCK_SIZE){if(write(fp
-,buf,bufSize)<(0x284+1627-0x8df)){printf(
-"\x65\x72\x72\x6f\x72\x20\x25\x73\x20\x25\x64\x3a\x20\x77\x72\x69\x74\x65\x20\x66\x61\x69\x6c\x20\x65\x72\x72\x6e\x6f\x20\x3d\x20\x25\x64" "\n"
-,__FILE__,__LINE__,errno);close(fp);free(buf);return RESULT_FILE_WRITE_FAIL;}sum
-+=getSum(buf,bufSize);bufSize=(0x17b2+3190-0x2428);}sprintf(buf+bufSize,
-"\x25\x73\x3d\x25\x73",item->key,item->value);bufSize+=itemSize;}}if(bufSize!=
-(0x983+5619-0x1f76)){if(write(fp,buf,bufSize)<(0x3c2+4379-0x14dd)){printf(
-"\x6e\x76\x73\x65\x72\x76\x65\x72\x20\x65\x72\x72\x6f\x72\x3a\x20\x77\x72\x69\x74\x65\x20\x66\x61\x69\x6c\x20\x65\x72\x72\x6e\x6f\x20\x3d\x20\x25\x64" "\n"
-,errno);close(fp);free(buf);return RESULT_FILE_WRITE_FAIL;}sum+=getSum(buf,
-bufSize);}sum+=NV_FILE_FLAG;if(write(fp,&sum,NV_CHECK_SIZE)<(0x181b+3703-0x2692)
-){printf(
-"\x6e\x76\x73\x65\x72\x76\x65\x72\x20\x65\x72\x72\x6f\x72\x3a\x20\x77\x72\x69\x74\x65\x20\x66\x61\x69\x6c\x20\x65\x72\x72\x6e\x6f\x20\x3d\x20\x25\x64" "\n"
-,errno);close(fp);free(buf);return RESULT_FILE_WRITE_FAIL;}ret=fsync(fp);free(
-buf);close(fp);if(ret<(0x1837+246-0x192d)){printf(
-"\x53\x79\x6e\x63\x20\x46\x61\x69\x6c\x65\x64\x3a\x25\x73\x2c\x20\x66\x69\x6c\x65\x20\x70\x61\x74\x68\x3a\x25\x73"
-,strerror(errno),nvFile);return ret;}return RESULT_SUCCESS;}return 
-RESULT_NO_FILE;}static int nvget(char*file,char*key,char*value){int index=
-(0x1d3+4764-0x146f);T_NV_NODE*list=NULL;T_NV_ITEM*item=NULL;for(list=nv_list;
-list;list=list->next){if(strcmp(list->nvFile,file))continue;index=hash(key)%
-NV_HASH_LEN;for(item=list->nvTable[index];item;item=item->next){if(strcmp(item->
-key,key))continue;strncpy(value,item->value,NV_MAX_VAL_LEN-(0xd5a+4074-0x1d43));
-value[NV_MAX_VAL_LEN-(0x9b3+2600-0x13da)]='\0';return RESULT_SUCCESS;}}return 
-RESULT_NO_ITEM;}static int nvset(char*file,const char*key,const char*value,int 
-saveFlag){int index=(0xd0c+552-0xf34);int ret=(0x8a5+3844-0x17a9);int 
-key_buf_len=(0x10ea+785-0x13fb);int value_buf_len=(0x465+6781-0x1ee2);T_NV_NODE*
-list=NULL;T_NV_ITEM*item=NULL;T_NV_ITEM*newItem=NULL;if(NULL==key||NULL==value)
-return RESULT_FAIL;key_buf_len=strlen(key)+(0x4c8+3774-0x1385);value_buf_len=
-strlen(value)+(0xd44+3765-0x1bf8);for(list=nv_list;list;list=list->next){if(
-strcmp(list->nvFile,file))continue;index=hash(key)%NV_HASH_LEN;for(item=list->
-nvTable[index];item;item=item->next){if(strcmp(item->key,key))continue;if(
-saveFlag)item->saveFlag=saveFlag;if(!strcmp(item->value,value))return 
-RESULT_SUCCESS;free(item->value);item->value=(char*)malloc(value_buf_len);if(!
-item->value)return RESULT_MALLOC_FAIL;strncpy(item->value,value,value_buf_len-
-(0x293+6898-0x1d84));item->value[value_buf_len-(0xdfb+2094-0x1628)]='\0';return 
-RESULT_SUCCESS;}newItem=(T_NV_ITEM*)malloc(sizeof(T_NV_ITEM));if(!newItem)return
- RESULT_MALLOC_FAIL;newItem->key=(char*)malloc(key_buf_len);if(!newItem->key){
-free(newItem);return RESULT_MALLOC_FAIL;}newItem->value=(char*)malloc(
-value_buf_len);if(!newItem->value){free(newItem->key);free(newItem);return 
-RESULT_MALLOC_FAIL;}strncpy(newItem->key,key,key_buf_len-(0x68f+1599-0xccd));
-newItem->key[key_buf_len-(0x237+1412-0x7ba)]='\0';strncpy(newItem->value,value,
-value_buf_len-(0x10b8+4596-0x22ab));newItem->value[value_buf_len-
-(0x13a4+4644-0x25c7)]='\0';newItem->next=NULL;newItem->saveFlag=saveFlag;newItem
-->update_flag=(0xca1+6650-0x269b);if(!list->nvTable[index])list->nvTable[index]=
-newItem;else{newItem->next=list->nvTable[index]->next;list->nvTable[index]->next
-=newItem;}return RESULT_SUCCESS;}ret=addConfigFile(file,NULL);if(ret==
-RESULT_SUCCESS)return nvset(file,key,value,saveFlag);else return ret;}static int
- nvunset(char*file,char*key){int index=(0x16f7+1158-0x1b7d);T_NV_NODE*list=NULL;
-T_NV_ITEM*item=NULL;T_NV_ITEM*prev=NULL;for(list=nv_list;list;list=list->next){
-if(strcmp(list->nvFile,file))continue;index=hash(key)%NV_HASH_LEN;for(item=list
-->nvTable[index];item;prev=item,item=item->next){if(strcmp(item->key,key))
-continue;if(!prev)list->nvTable[index]=item->next;else prev->next=item->next;
-free(item->key);free(item->value);free(item);return RESULT_SUCCESS;}}return 
-RESULT_NO_ITEM;}static int nvreset(char*file){int ret=(0x7c0+7258-0x241a);
-T_NV_NODE*list=NULL;for(list=nv_list;list;list=list->next){if(strcmp(list->
-nvFile,file))continue;ret=nvclear(file);if(ret!=RESULT_SUCCESS)return ret;if(
-loadFactroyParam(list)!=RESULT_SUCCESS)return RESULT_FAIL;return nvcommit(file);
-}return RESULT_NO_FILE;}static int nvclear(char*file){int i=(0xdd0+17-0xde1);
-T_NV_NODE*list=NULL;T_NV_ITEM*cur=NULL;T_NV_ITEM*item=NULL;for(list=nv_list;list
-;list=list->next){if(strcmp(list->nvFile,file))continue;for(i=(0x104+605-0x361);
-i<NV_HASH_LEN;i++){for(item=list->nvTable[i];item;){cur=item;item=item->next;
-free(cur->key);free(cur->value);free(cur);}list->nvTable[i]=NULL;}return 
-RESULT_SUCCESS;}return RESULT_NO_FILE;}static int nvcommit(char*file){int ret=
-(0x115c+3316-0x1e50);char nvMainFile[NV_PATH_LEN]={(0x21f+8420-0x2303)};char 
-nvBackupFile[NV_PATH_LEN]={(0xdf0+4084-0x1de4)};sprintf(nvMainFile,
-"\x25\x73\x2f\x25\x73",NV_FS_MAIN_PATH,file);sprintf(nvBackupFile,
-"\x25\x73\x2f\x25\x73",NV_FS_BACKUP_PATH,file);ret=saveNvFs(file,nvMainFile);if(
-ret!=RESULT_SUCCESS)return ret;return restoreNvFs(nvBackupFile,nvMainFile);}
+		}
+    }
+}
+
+/*******************************************************************************
+* ¹¦ÄÜÃèÊö:     hash
+* ²ÎÊý˵Ã÷:     
+*   (´«Èë²ÎÊý)  void
+*   (´«³ö²ÎÊý)  void
+* ·µ »Ø Öµ:     hash value
+* ÆäËü˵Ã÷:     void
+*******************************************************************************/
+uint hash(const char *s)
+{
+    uint hash = 0;
+
+    while (*s)
+    {
+        hash = NV_HASH_MUL * hash + *s++;
+    }
+
+    return hash;
+}
+
+/*******************************************************************************
+* ¹¦ÄÜÃèÊö:     loadFactroyParam
+* ²ÎÊý˵Ã÷:     
+*   (´«Èë²ÎÊý)  list
+*   (´«³ö²ÎÊý)  void
+* ·µ »Ø Öµ:     0±íʾ³É¹¦ -1±íʾʧ°Ü
+* ÆäËü˵Ã÷:     void
+*******************************************************************************/
+static int loadFactroyParam(T_NV_NODE *list)
+{
+    char *val   = NULL;
+    FILE *fp    = NULL;
+    T_NV_CONFIG *config = NULL;
+    char buf[NV_MAX_ITEM_LEN] = {0};
+   
+    for(config = list->fileList; config; config = config->next)
+    {
+        fp = fopen(config->configFile, "ro");
+        if(!fp)
+        {
+            printf("nvserver error:open %s file fail errno = %d!\n", config->configFile, errno);
+            return RESULT_FILE_OPEN_FAIL;
+        }
+
+        while (fgets(buf, NV_MAX_ITEM_LEN, fp)) 
+        {
+            if (buf[0] == '\n' || buf[0] == '#')
+                continue;
+            
+            val = strchr(buf, '=');
+            if (!val) 
+            {
+                printf("nvserver error:%s file format error:string = %s\n", config->configFile, buf);
+                continue;
+            }
+            
+            /*strip line break,the last line may not have a line break*/
+            if (buf[strlen(buf) - 1] == '\n')
+                buf[strlen(buf) - 1] = '\0';
+
+            *val++ = '\0';
+            
+            nvset(list->nvFile, buf, val, 1);
+        }
+        printf("nvserver loadFactroyParam %s!\n", config->configFile);
+        fclose(fp);
+    }
+    
+    return RESULT_SUCCESS;
+}
+
+/*******************************************************************************
+* ¹¦ÄÜÃèÊö:     checkNvFs
+* ²ÎÊý˵Ã÷:     
+*   (´«Èë²ÎÊý)  void
+*   (´«³ö²ÎÊý)  void
+* ·µ »Ø Öµ:     bool
+* ÆäËü˵Ã÷:     void
+*******************************************************************************/
+static bool checkNvFs(char *file)
+{
+    int len     = 0;
+    int cnt     = 0;
+    FILE * fp   = NULL;
+    char * buf  = NULL;
+    struct stat statbuff = {0};
+
+    if(stat(file, &statbuff) < 0)
+        return false;
+
+    len = statbuff.st_size;
+    if(len < NV_CHECK_SIZE)
+        return false;
+
+    fp = fopen(file, "ro");
+    if (!fp) 
+        return false;
+    
+    buf = (char *)malloc(len);
+    if(!buf)
+    {
+        fclose(fp);
+        return false;
+    }
+
+    cnt = 0;
+    while (cnt < len)
+    {
+        cnt = cnt + fread(buf + cnt, 1, len - cnt, fp);
+        if (ferror(fp))
+        {
+            clearerr(fp);
+            free(buf);
+            fclose(fp);
+            return false;
+        }
+    }
+    if (len != cnt)
+    {
+        free(buf);
+        fclose(fp);
+        return false;
+    }
+
+    if(getSum(buf, len - NV_CHECK_SIZE) + NV_FILE_FLAG != *(uint *)(buf + len - NV_CHECK_SIZE))
+    {
+        free(buf);
+        fclose(fp);
+        return false;  
+    }
+    
+    free(buf);
+    fclose(fp);
+
+    return true;   
+}
+
+/*******************************************************************************
+* ¹¦ÄÜÃèÊö:     copyfile
+* ²ÎÊý˵Ã÷:     
+*   (´«Èë²ÎÊý)  to:Ä¿±êÎļþ
+*   (´«Èë²ÎÊý)  from:Ô´Îļþ
+* ·µ »Ø Öµ:     0±íʾ³É¹¦,¸ºÖµÊ§°Ü
+* ÆäËü˵Ã÷:     
+*******************************************************************************/
+static int copyfile(const char *from, const char *to)
+{
+    int fd_to;
+    int fd_from;
+    char buf[4096];
+    ssize_t nread;
+    int ret = -1;
+
+    fd_from = open(from, O_RDONLY);
+    if (fd_from < 0)
+        return -2;
+
+    fd_to = open(to, O_RDWR | O_CREAT | O_TRUNC | O_SYNC, 0640);
+    if (fd_to < 0) {
+        ret = -3;
+        goto out_error;
+    }
+
+    while (1)
+    {
+        char *out_ptr;
+        ssize_t nwritten;
+
+        nread = read(fd_from, buf, sizeof(buf));
+        if (nread == 0)
+        {
+            break; /* read file done*/
+        }
+        else
+        {
+            if (nread < 0 )
+            {
+                if (errno == EINTR || errno == EAGAIN)
+                {
+                    continue;
+                }
+                else
+                {
+                    ret = -4;
+                    goto out_error;
+                }
+            }
+        }
+
+        out_ptr = buf;
+        do
+        {
+            nwritten = write(fd_to, out_ptr, nread);
+            if (nwritten > 0)
+            {
+                nread -= nwritten;
+                out_ptr += nwritten;
+            }
+            else
+            {
+                if (nwritten < 0)
+                {
+                    if (errno == EINTR || errno == EAGAIN)
+                    {
+                        continue;
+                    }
+                    else
+                    {
+                        ret = -5;
+                        goto out_error;
+                    }
+                }
+            }
+        } while (nread > 0);
+    }
+
+    ret = fsync(fd_to);
+	if (ret < 0) {
+		printf("Sync Failed:%s, file path:%s", strerror(errno), to);
+		goto out_error;
+	}
+	
+    if (close(fd_to) < 0)
+    {
+        fd_to = -1;
+        ret = -6;
+        goto out_error;
+    }
+    close(fd_from);
+
+    /* Success! */
+    return 0;
+
+out_error:
+    printf("copyfile %s to %s error:%d\n", from, to, ret);
+    close(fd_from);
+    if (fd_to >= 0)
+        close(fd_to);
+
+    return ret;
+}
+
+/*******************************************************************************
+* ¹¦ÄÜÃèÊö:     restoreNvFs
+* ²ÎÊý˵Ã÷:     
+*   (´«Èë²ÎÊý)  dstFile:Ä¿±êÎļþ
+*   (´«Èë²ÎÊý)  srcFile:Ô´Îļþ
+* ·µ »Ø Öµ:     0±íʾ³É¹¦
+* ÆäËü˵Ã÷:     void
+*******************************************************************************/
+static int restoreNvFs(char *dstFile, char *srcFile)
+{
+    if (copyfile(srcFile, dstFile) != 0)
+        return RESULT_FAIL;
+    
+    return RESULT_SUCCESS;
+}
+
+/*******************************************************************************
+* ¹¦ÄÜÃèÊö:     loadNvFs
+* ²ÎÊý˵Ã÷:     
+*   (´«Èë²ÎÊý)  file:nvÎļþ
+*   (´«³ö²ÎÊý)  void
+* ·µ »Ø Öµ:     0±íʾ³É¹¦
+* ÆäËü˵Ã÷:     void
+*******************************************************************************/
+static int loadNvFs(char *file)
+{
+    int     len    = 0;
+    int     cnt    = 0;
+    FILE    *fp    = NULL;
+    char    *buf   = NULL;
+    char    *name  = NULL;
+    char    *value = NULL;
+    char    *eq    = NULL;
+    
+    struct stat statbuff            = {0};
+    char        nvFile[NV_PATH_LEN] = {0};
+
+    sprintf(nvFile, "%s/%s", NV_FS_MAIN_PATH, file);
+
+    if(stat(nvFile, &statbuff) < 0)
+        return RESULT_FAIL;
+
+    len = statbuff.st_size;
+    if(NV_CHECK_SIZE > len)
+        return RESULT_FAIL;
+    
+    fp = fopen(nvFile, "ro");
+    if (!fp) 
+        return RESULT_FILE_OPEN_FAIL;
+
+    len = len - NV_CHECK_SIZE;
+    buf = (char *)malloc(len + 1);
+    if(!buf)
+    {
+        fclose(fp);
+        return RESULT_MALLOC_FAIL;
+    }
+    memset(buf, 0, len + 1);
+
+    cnt = 0;
+    while (cnt < len)
+    {
+        cnt = cnt + fread(buf + cnt, 1, len - cnt, fp);
+        if (ferror(fp))
+        {
+            clearerr(fp);
+            fclose(fp);
+            free(buf);
+            return RESULT_FILE_READ_FAIL;
+        }
+    }
+    if (cnt != len)
+    {
+        fclose(fp);
+        free(buf);
+        return RESULT_FILE_READ_FAIL;
+    }
+
+    buf[len] = '\0'; /* fix warning for coverity */
+    name = buf;
+    while(*name)
+    {
+        if (!(eq = strchr(name, '=')))
+        {
+            break;
+        }
+        *eq = '\0';
+        value = eq + 1;
+
+        nvset(file, name, value, 1);
+
+        *eq = '=';
+        name = value + strlen(value) + 1;
+    }
+
+    free(buf);
+    fclose(fp);
+
+    return RESULT_SUCCESS;
+}
+
+/*******************************************************************************
+* ¹¦ÄÜÃèÊö:     analyMsg
+* ²ÎÊý˵Ã÷:     
+*   (´«Èë²ÎÊý)  msgrecv:½ÓÊÕÏûÏ¢
+*   (´«³ö²ÎÊý)  msgsnd:·¢ËÍÏûÏ¢
+* ·µ »Ø Öµ:     0±íʾ³É¹¦
+* ÆäËü˵Ã÷:     void
+*******************************************************************************/
+static void analyMsg(T_NV_MSG_INFO *msgrecv, T_NV_MSG_RESULT *msgsnd)
+{    
+    switch(msgrecv->nvType)
+    {
+    case MSG_GET:
+        msgsnd->result = nvget(msgrecv->file, msgrecv->key, msgsnd->value);
+        break;
+    case MSG_SET:   
+        msgsnd->result = nvset(msgrecv->file, msgrecv->key, msgrecv->value, msgrecv->saveflag);
+        break;
+    case MSG_UNSET:
+        msgsnd->result = nvunset(msgrecv->file, msgrecv->key);
+        break;
+    case MSG_CLEAR:
+        msgsnd->result = nvclear(msgrecv->file);
+        break;
+    case MSG_RESET:
+        msgsnd->result = nvreset(msgrecv->file);
+        break;
+    case MSG_SHOW:
+        msgsnd->result = saveNvFs(msgrecv->file, NV_FS_SHOW);;
+        break;
+    case MSG_COMMIT:
+        msgsnd->result = nvcommit(msgrecv->file);
+        break;
+    default:
+        break;
+    }
+
+    msgsnd->msgType = msgrecv->pid;
+	msgsnd->msgIndex = msgrecv->msgIndex;
+}
+
+/*******************************************************************************
+* ¹¦ÄÜÃèÊö:     addConfigFile
+* ²ÎÊý˵Ã÷:     
+*   (´«Èë²ÎÊý)  nvFile:nvÎļþ
+*   (´«Èë²ÎÊý)  configFile:ÅäÖÃÎļþ
+* ·µ »Ø Öµ:     0±íʾ³É¹¦
+* ÆäËü˵Ã÷:     void
+*******************************************************************************/
+static int addConfigFile(char *nvFile, char *configFile)
+{
+    T_NV_NODE   *list      = NULL;
+    T_NV_NODE   *newList   = NULL;
+    T_NV_CONFIG *newConfig = NULL;
+        
+    if(!nvFile)
+    {
+        printf("nvserver error: param illegal!\n");
+        return RESULT_INVAL;
+    }
+
+    if(configFile)// nv has no config file
+    {
+        newConfig = (T_NV_CONFIG * )malloc(sizeof(T_NV_CONFIG));
+        if(!newConfig)
+            return RESULT_MALLOC_FAIL;
+
+        strncpy(newConfig->configFile, configFile, NV_PATH_LEN - 1);
+        newConfig->configFile[NV_PATH_LEN - 1] = '\0';
+        newConfig->next = NULL;
+    }
+
+    for(list = nv_list; list; list =list->next)
+    {
+        if(strcmp(list->nvFile, nvFile) == 0)
+            break;
+    }
+
+    if(!list) //can't fine the nv
+    {
+        newList = (T_NV_NODE *)malloc(sizeof(T_NV_NODE));
+        if(!newList)
+        {
+            if(newConfig)
+                free(newConfig);
+            return RESULT_MALLOC_FAIL;
+        }
+
+        newList->next = NULL;
+        strncpy(newList->nvFile, nvFile, NV_PATH_LEN - 1);
+        newList->nvFile[NV_PATH_LEN - 1] = '\0';
+        memset(newList->nvTable, 0, NV_HASH_LEN * 4); 
+        
+        newList->fileList = newConfig;
+
+        if(!nv_list)
+            nv_list = newList;
+        else
+        {
+            newList->next = nv_list->next;
+            nv_list->next = newList;
+        }
+    }
+    else if(!list->fileList) //can't fine the filelist
+        list->fileList = newConfig;
+    else                    //can't fine the file
+    {
+        if(newConfig == NULL)
+            return RESULT_FAIL;
+        newConfig->next = list->fileList->next;
+        list->fileList->next = newConfig;
+    }
+
+    return RESULT_SUCCESS;
+}
+
+/*******************************************************************************
+* ¹¦ÄÜÃèÊö:     isConfiged
+* ²ÎÊý˵Ã÷:     
+*   (´«Èë²ÎÊý)  configFile:ÅäÖÃÎļþÃû
+* ·µ »Ø Öµ:     void
+* ÆäËü˵Ã÷:     void
+*******************************************************************************/
+static bool isCfgConfiged(char *configFile)
+{
+    T_NV_NODE   *list      = NULL;
+    T_NV_CONFIG *config    = NULL;
+
+    for(list = nv_list; list; list = list->next)
+    {
+        for(config = list->fileList; config; config = config->next)
+        {
+            if(!strcmp(config->configFile, configFile))
+                return true;
+        }
+    }
+    return false;
+}
+
+/*******************************************************************************
+* ¹¦ÄÜÃèÊö:     isNvConfiged
+* ²ÎÊý˵Ã÷:     
+*   (´«Èë²ÎÊý)  configFile:ÅäÖÃÎļþÃû
+* ·µ »Ø Öµ:     void
+* ÆäËü˵Ã÷:     void
+*******************************************************************************/
+static bool isNvConfiged(char *nvFile)
+{
+    T_NV_NODE   *list      = NULL;
+
+    for(list = nv_list; list; list = list->next)
+    {
+        if(!strcmp(list->nvFile, nvFile))
+            return true;
+    }
+    return false;
+}
+
+/*******************************************************************************
+* ¹¦ÄÜÃèÊö:     getSum
+* ²ÎÊý˵Ã÷:     
+*   (´«Èë²ÎÊý)  s:×Ö·û´®»º³å
+* ·µ »Ø Öµ:     sumÊýÖµ
+* ÆäËü˵Ã÷:     void
+*******************************************************************************/
+static uint getSum(const char *s, int len)
+{
+    uint sum = 0;
+    char *data = (char*)s;
+    
+    while (len-- > 0)
+    {
+        sum += (*data++);
+    }
+    
+    return sum;
+}
+
+/*******************************************************************************
+* ¹¦ÄÜÃèÊö:     saveNvFs
+* ²ÎÊý˵Ã÷:     
+*   (´«Èë²ÎÊý)  nvName:nvÎļþÃû
+*   (´«Èë²ÎÊý)  nvFile:nv±£´æÎļþ
+* ·µ »Ø Öµ:         0±íʾ³É¹¦
+* ÆäËü˵Ã÷:     void
+*******************************************************************************/
+static int saveNvFs(char *nvName, char *nvFile)
+{
+    int i           = 0;
+    int sum         = 0;
+    int bufSize     = 0;
+    int itemSize    = 0;
+    int ret         = 0;
+    int fp = 0;
+    char *buf = NULL;
+    T_NV_NODE * list = NULL;
+    T_NV_ITEM * item = NULL;
+
+    for(list = nv_list; list; list = list->next)
+    {
+        if(strcmp(list->nvFile, nvName))
+            continue;
+
+        fp= open(nvFile, O_SYNC | O_RDWR | O_CREAT | O_TRUNC, 0640);
+        if(fp == -1) 
+        {
+            printf("open %s fail,errno = %d\n", nvFile, errno);
+            return RESULT_FILE_OPEN_FAIL;
+        }
+
+        buf = (char *)malloc(NV_BLOCK_SIZE);
+        if(!buf)
+        {
+            close(fp);
+            return RESULT_MALLOC_FAIL;
+        }
+        
+        for(i = 0; i < NV_HASH_LEN; i ++)
+        {
+            for(item = list->nvTable[i]; item; item = item->next)
+            {
+                if(strcmp(nvFile, NV_FS_SHOW) && !item->saveFlag)
+                    continue;
+                
+                itemSize = strlen(item->key) + strlen(item->value) + 2;
+                if(bufSize + itemSize > NV_BLOCK_SIZE)
+                {
+                    if(write(fp, buf, bufSize) < 0)
+                    {
+                        printf("error %s %d: write fail errno = %d\n", __FILE__,  __LINE__, errno);
+                        close(fp);
+                        free(buf);
+                        return RESULT_FILE_WRITE_FAIL;
+                    }
+                    sum += getSum(buf, bufSize);
+                    bufSize = 0;
+                }
+                
+                sprintf(buf + bufSize, "%s=%s", item->key, item->value);
+                bufSize += itemSize;             
+            }
+        }
+
+        // last block
+        if(bufSize != 0)
+        {
+            if(write(fp, buf, bufSize) < 0)
+            {
+                printf("nvserver error: write fail errno = %d\n", errno);
+                close(fp);
+                free(buf);
+                return RESULT_FILE_WRITE_FAIL;
+            }
+            sum += getSum(buf, bufSize);
+        }
+        sum += NV_FILE_FLAG;
+
+        // write sum
+        if(write(fp, &sum, NV_CHECK_SIZE) < 0)
+        {
+            printf("nvserver error: write fail errno = %d\n", errno);
+            close(fp);
+            free(buf);
+            return RESULT_FILE_WRITE_FAIL;
+        }
+        
+        ret = fsync(fp);
+		
+        free(buf);
+        close(fp);
+		
+        if (ret < 0) {
+            printf("Sync Failed:%s, file path:%s", strerror(errno), nvFile);
+            return ret;
+        }
+      
+        return RESULT_SUCCESS;
+    }
+
+    return RESULT_NO_FILE;
+}
+
+
+/*******************************************************************************
+* ¹¦ÄÜÃèÊö:     nvget
+* ²ÎÊý˵Ã÷:     
+*   (´«Èë²ÎÊý)  file:nvÎļþ
+*   (´«Èë²ÎÊý)  key:nvÏîÃû
+*   (´«³ö²ÎÊý)  value:nvÖµ
+* ·µ »Ø Öµ:      0±íʾ³É¹¦
+* ÆäËü˵Ã÷:     void
+*******************************************************************************/
+static int nvget(char *file, char *key, char *value)
+{
+    int index = 0;
+    T_NV_NODE *list = NULL;
+    T_NV_ITEM *item = NULL;
+
+    for(list = nv_list; list; list = list->next)
+    {
+        if(strcmp(list->nvFile, file))
+            continue;
+        
+        index = hash(key) % NV_HASH_LEN;
+        for(item = list->nvTable[index]; item; item = item->next)
+        {
+            if(strcmp(item->key, key))
+                continue;
+            
+            strncpy(value, item->value, NV_MAX_VAL_LEN - 1);
+            value[NV_MAX_VAL_LEN - 1] = '\0';
+            return RESULT_SUCCESS;
+        }
+    }
+
+    return RESULT_NO_ITEM;
+}
+
+/*******************************************************************************
+* ¹¦ÄÜÃèÊö:     nvset
+* ²ÎÊý˵Ã÷:     
+*   (´«Èë²ÎÊý)  file:nvÎļþ
+*   (´«Èë²ÎÊý)  key:nvÏîÃû
+*   (´«Èë²ÎÊý)  value:nvÖµ
+*   (´«Èë²ÎÊý)  saveFlag:±£´æ±êÖ¾
+* ·µ »Ø Öµ:        0±íʾ³É¹¦
+* ÆäËü˵Ã÷:     void
+*******************************************************************************/
+static int nvset(char *file, const char *key, const char *value, int saveFlag)
+{
+    int index           = 0;
+    int ret             = 0;
+    int key_buf_len     = 0;
+    int value_buf_len   = 0;
+    T_NV_NODE *list     = NULL;
+    T_NV_ITEM *item     = NULL;
+    T_NV_ITEM *newItem  = NULL;
+
+    if (NULL == key || NULL == value)
+        return RESULT_FAIL;
+
+    key_buf_len    = strlen(key) + 1;
+    value_buf_len  = strlen(value) + 1;
+
+    for(list = nv_list; list; list = list->next)
+    {
+        if(strcmp(list->nvFile, file))
+            continue;
+        
+        index = hash(key) % NV_HASH_LEN;
+        for(item = list->nvTable[index]; item; item = item->next)
+        {
+            // change item
+            if(strcmp(item->key, key))
+                continue;
+ 
+            if(saveFlag)
+                item->saveFlag = saveFlag;
+				
+            if(!strcmp(item->value, value))
+                return RESULT_SUCCESS;
+            
+            free(item->value);
+            item->value = (char *)malloc(value_buf_len);
+            if(!item->value)
+                return RESULT_MALLOC_FAIL;
+            
+            strncpy(item->value, value, value_buf_len - 1);
+            item->value[value_buf_len - 1] = '\0';
+
+            return RESULT_SUCCESS;
+        }
+
+        // add item
+        newItem = (T_NV_ITEM *)malloc(sizeof(T_NV_ITEM ));
+        if(!newItem)
+            return RESULT_MALLOC_FAIL;
+
+        newItem->key = (char *)malloc(key_buf_len);
+        if(!newItem->key)
+        {
+            free(newItem);
+            return RESULT_MALLOC_FAIL;
+        }
+        
+        newItem->value = (char *)malloc(value_buf_len);
+        if(!newItem->value)
+        {
+            free(newItem->key);
+            free(newItem);
+            return RESULT_MALLOC_FAIL;
+        }
+
+        strncpy(newItem->key, key, key_buf_len - 1);
+        newItem->key[key_buf_len - 1] = '\0';
+        strncpy(newItem->value, value, value_buf_len - 1);
+        newItem->value[value_buf_len - 1] = '\0';
+
+        newItem->next = NULL;
+        newItem->saveFlag = saveFlag;
+        newItem->update_flag=0;// 0: not update , 1: updated
+        
+        if(!list->nvTable[index])
+            list->nvTable[index] = newItem;
+        else
+        {
+            newItem->next = list->nvTable[index]->next;
+            list->nvTable[index]->next = newItem;
+        }
+            
+        return RESULT_SUCCESS;
+    }
+
+    // add nv
+    ret = addConfigFile(file, NULL);
+    if(ret == RESULT_SUCCESS)
+        return nvset(file, key, value, saveFlag);
+    else
+        return ret;
+}
+
+/*******************************************************************************
+* ¹¦ÄÜÃèÊö:     nvunset
+* ²ÎÊý˵Ã÷:     
+*   (´«Èë²ÎÊý)  file:nvÎļþ
+*   (´«Èë²ÎÊý)  key:nvÏîÃû
+* ·µ »Ø Öµ:        0±íʾ³É¹¦
+* ÆäËü˵Ã÷:     void
+*******************************************************************************/
+static int nvunset(char * file, char *key)
+{
+    int index = 0;
+    T_NV_NODE *list = NULL;
+    T_NV_ITEM *item = NULL;
+    T_NV_ITEM *prev = NULL;
+
+    for(list = nv_list; list; list = list->next)
+    {
+        if(strcmp(list->nvFile, file))
+            continue;
+        
+        index = hash(key) % NV_HASH_LEN;
+        for(item = list->nvTable[index]; item; prev = item, item = item->next)
+        {
+            if(strcmp(item->key, key))
+                continue;
+
+            if(!prev)
+				list->nvTable[index] = item->next;
+            else
+                prev->next = item->next;
+            
+            free(item->key);
+            free(item->value);
+            free(item);
+            
+            return RESULT_SUCCESS;
+        }
+    }
+
+    return RESULT_NO_ITEM;
+}
+
+/*******************************************************************************
+* ¹¦ÄÜÃèÊö:     nvreset
+* ²ÎÊý˵Ã÷:     
+*   (´«Èë²ÎÊý)  file:nvÎļþ
+* ·µ »Ø Öµ:         0±íʾ³É¹¦
+* ÆäËü˵Ã÷:     ɾ³ýnvÎļþ
+*******************************************************************************/
+static int nvreset(char *file)
+{ 
+    int ret = 0;
+    T_NV_NODE *list = NULL;
+
+    for(list = nv_list; list; list = list->next)
+    {
+        if(strcmp(list->nvFile, file))
+            continue;
+
+        ret = nvclear(file);
+        if(ret != RESULT_SUCCESS)
+            return ret;
+
+        if(loadFactroyParam(list) != RESULT_SUCCESS)
+            return RESULT_FAIL;
+
+        return nvcommit(file);
+     }
+
+    return RESULT_NO_FILE;
+}
+
+/*******************************************************************************
+* ¹¦ÄÜÃèÊö:     nvclear
+* ²ÎÊý˵Ã÷:     
+*   (´«Èë²ÎÊý)  file:nvÎļþ
+* ·µ »Ø Öµ:         0±íʾ³É¹¦
+* ÆäËü˵Ã÷:     ²Á³ýÄÚ´ænv
+*******************************************************************************/
+static int nvclear(char *file)
+{
+    int i = 0;
+    T_NV_NODE *list    = NULL;
+    T_NV_ITEM *cur     = NULL;
+    T_NV_ITEM *item    = NULL;
+    
+    for(list = nv_list; list; list = list->next)
+    {
+        if(strcmp(list->nvFile, file))
+            continue;
+
+        for(i = 0; i < NV_HASH_LEN; i ++)
+        {
+            for(item = list->nvTable[i]; item; )
+            {
+                cur = item;
+                item = item->next;
+
+                free(cur->key);
+                free(cur->value);
+                free(cur);
+            }
+            list->nvTable[i] = NULL;
+        }
+        
+        return RESULT_SUCCESS;
+    }
+    
+    return RESULT_NO_FILE;
+}
+
+/*******************************************************************************
+* ¹¦ÄÜÃèÊö:     nvcommit
+* ²ÎÊý˵Ã÷:     
+*   (´«Èë²ÎÊý)  file:nvÎļþ
+* ·µ »Ø Öµ:     RESULT_SUCCESS±íʾ³É¹¦
+* ÆäËü˵Ã÷:     void
+*******************************************************************************/
+static int nvcommit(char *file)
+{
+    int ret = 0;
+    char nvMainFile[NV_PATH_LEN]    = {0};
+    char nvBackupFile[NV_PATH_LEN]  = {0};
+
+    sprintf(nvMainFile, "%s/%s", NV_FS_MAIN_PATH, file);
+    sprintf(nvBackupFile, "%s/%s", NV_FS_BACKUP_PATH, file);
+
+    ret = saveNvFs(file, nvMainFile);
+    if(ret != RESULT_SUCCESS)
+        return ret;
+    
+    return restoreNvFs(nvBackupFile, nvMainFile);
+}
+
 #ifdef __cplusplus
 }
 #endif