Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into xidatong-arm32

Ubiquitous/XiZi_IIoT/tool/shell/letter-shell/file_ext/msh_file.c

@@ -116,7 +116,7 @@ static int CopyRecursive(const char *from, const char *to, char *buf,
 
     DIR *dirp;
     struct dirent *dirent;
-    char *sub_from, *sub_to;
+    char *sub_from = NULL, *sub_to = NULL;
 
     ret = mkdir(to, 0777);
     if (ret < 0) {

Ubiquitous/XiZi_IIoT/tool/shell/letter-shell/file_ext/tar.c

@@ -31,7 +31,7 @@ static void PrintOctal(char *str, int len, uint64_t value)
     char *cp;
     int written_len;
 
-    written_len = sprintf(buf, "%0*llo", len, value);
+    written_len = sprintf(buf, "%0*lo", len, value);
     cp = buf + written_len - len;
 
     if (*cp == '0')