Merge branch 'pangu_develop_serial_conflist' into 'pangu_develop_serial'

Pangu develop serial conflist

See merge request MESA_Platform/sapp!19

2 files changed, 20 insertions, 8 deletions

diff --git a/entry/sapp_main.c b/entry/sapp_main.c
index 5023edf..81dc9f2 100644
--- a/entry/sapp_main.c
+++ b/entry/sapp_main.c
@@ -83,8 +83,12 @@ static void signal_take_over(void)
 int main(int argc, char *argv[])
 {	
 	if((argc == 2) && (strncasecmp(argv[1], "-v", 2) == 0)){
+#ifdef GIT_VERSION		
         const char *sapp_version = GIT_VERSION;
 		printf("Platform version: %s\n", sapp_version);
+#else
+		printf("Can't get version, because not found git info!\n");
+#endif	
 		exit(0);
 	}
 
diff --git a/plugin/src/plugin.c b/plugin/src/plugin.c
index dd4ec04..257b8ec 100644
--- a/plugin/src/plugin.c
+++ b/plugin/src/plugin.c
@@ -56,12 +56,18 @@ char* g_plugin_entryname[PLUGIN_MAX_ENTRYNUM] =
 

 int g_plugin_version_VERSION_20170511;

 

- /* ɾ��ĩβ�Ļ��з�"\r\n" */

-static void plugin_del_tail_rn(char *data, int max_len)

+ /* ɾ����ͷ�Ŀո�,tab, �Լ�ĩβ�Ļ��з�, �ո�, tab�� "\r\n " */

+static void plugin_del_blank_rn(char *data, int max_len)

 {

-    int i;

+	int i;

+

+	while((' ' == *data) || ('\t' == *data)){

+		memmove(data, data+1, max_len);

+		max_len--;

+	}

+    

     for(i = 0; i < max_len; i++){

-        if(('\r' == data[i]) || ('\n' == data[i])){

+        if(('\r' == data[i]) || ('\n' == data[i]) || ('\t' == data[i]) || (' ' == data[i])){

             data[i] = '\0';

             return;

         }

@@ -71,6 +77,7 @@ static void plugin_del_tail_rn(char *data, int max_len)
 }

 

 

+

 /****************************************************************************

 ������:reset_cwd()

 ���ܣ��л���ǰ·��

@@ -340,7 +347,7 @@ int check_plug_conf(char* filename,int plugtype)
 			break;

 		}

 

-		plugin_del_tail_rn(config_buf, strlen(config_buf));

+		plugin_del_blank_rn(config_buf, sizeof(config_buf));

 

 		//��һ���ַ�����"[",��������

 		if(memcmp(config_buf,KEYWORD_SPECIAL1,strlen(KEYWORD_SPECIAL1)) != 0)

@@ -449,7 +456,7 @@ int process_conf_entryname()
 		len = strlen(buf_entryname);

 		buf_entryname[len-2] = '\0';

 #else

-		plugin_del_tail_rn(buf_entryname, strlen(buf_entryname));

+		plugin_del_blank_rn(buf_entryname, sizeof(buf_entryname));

 #endif

 		if('\0' == buf_entryname[0]){

 			continue;

@@ -1184,9 +1191,10 @@ int process_conflist(char* filename,int plug_type)
 		{

 			continue;

 		}

+		plugin_del_blank_rn(buf_confname, sizeof(buf_confname));

 

-		len = strlen(buf_confname);

-		buf_confname[len-1] = '\0';

+		///len = strlen(buf_confname);

+		/////buf_confname[len-1] = '\0';

 

 		if(plug_type == PLUGTYPE_PROTOCOL)

 		{