修改动态获取路径接口

04-源码/03-核心板/smart_pdu/src/app.c

@@ -679,9 +679,7 @@ int snmp_thread(void *arg)
     netsnmp_ds_set_boolean(NETSNMP_DS_APPLICATION_ID, NETSNMP_DS_AGENT_ROLE, 1);
     
     /* initialize the agent library */
-    sys_get_run_dir(path);
-    strcat(path, "/");
-    strcat(path, SNMP_MIB_NAME);
+    sys_get_path(path, SNMP_MIB_NAME);
     init_agent(path);
     
     /* initialize your mib code here */
@@ -772,10 +770,7 @@ int _global_device_manage_init(GlobalDeviceManager* _globalDeviceManager)
     _globalDeviceManager->useSlaveCount = 0 ;
     
     //链接数据库获取配置信息
-    sys_get_run_dir(path);
-    strcat(path, "/");
-    strcat(path, DATABASE_NAME);
-    
+    sys_get_path(path, DATABASE_NAME);
     log_i("database: %s\n", path);
     ret = sqlite_init(&_globalDeviceManager->db, path);
     if(ret<0)

04-源码/03-核心板/smart_pdu/src/appweb_handle.c

@@ -2919,10 +2919,7 @@ int appweb_init(void)
     }
     mprStart();
     
-    sys_get_run_dir(path);
-    strcat(path, "/");
-    strcat(path, ME_CONFIG_FILE);
-    
+    sys_get_path(path, ME_CONFIG_FILE);
     if (maParseConfig(path) < 0) {
         mprError("Cannot parse the config file %s", ME_CONFIG_FILE);
         return -1;

04-源码/03-核心板/smart_pdu/src/common.h

@@ -27,7 +27,7 @@
 //是否在环境下运行
 #define OS_HANDWARE 1
 
-#define PARAS_FILE      "/root/run/pduParas"
+#define PARAS_FILE     "pduParas"
 
 #define DATABASE_NAME  "pdu_dat.db" 
 #define SNMP_MIB_NAME  "pduMIB"

04-源码/03-核心板/smart_pdu/src/paras.c

@@ -86,12 +86,15 @@ int paras_load(void)
 {
     int i,r=-1;
     int flen,rlen;
+    char path[PATH_MAX];
     NetworkInfo_t *p=&allParas.dev._network_info;
 
     allParas = DFLT_PARAS;
-    flen = file_length(PARAS_FILE);
+
+    sys_get_path(path, PARAS_FILE);
+    flen = file_length(path);
     if(flen==sizeof(allParas)) {
-        rlen = file_load(PARAS_FILE, &allParas, flen);
+        rlen = file_load(path, &allParas, flen);
         if(rlen==flen) {
             r = do_check(&allParas);
             if(r) {

04-源码/03-核心板/smart_pdu/sys/sys.c

@@ -115,7 +115,7 @@ int sys_set_factory(void)
 }
 
 
-int sys_get_run_dir(char *path)
+int sys_get_path(char *path, char *name)
 {
     char tmp[PATH_MAX];
 
@@ -125,8 +125,10 @@ int sys_get_run_dir(char *path)
     char *p = strrchr(path, '/');
     if(p && strlen(path)>1) {
         *p = 0;
+        strcat(path, "/");
+        strcat(path, name);
     }
-
+    
     return 0;
 }
 

04-源码/03-核心板/smart_pdu/sys/sys.h

@@ -16,7 +16,7 @@ enum {
 
 int sys_reboot(void);
 int sys_set_factory(void);
-int sys_get_run_dir(char *path);
+int sys_get_path(char *path, char *name);
 int sys_get_net(NetworkInfo_t *para, int ipVersion);
 int sys_set_net(NetworkInfo_t *para, int ipVersion);
 int sys_set_modbus(ModbusInfo_t *para);