From 06b334d4e096c88467c79911f097ce0ba086df11 Mon Sep 17 00:00:00 2001
From: JasenChao <JasenChao@gmail.com>
Date: Sun, 17 Sep 2023 09:28:02 +0800
Subject: [PATCH] 2023_open_source_contest_preliminary_1st_issue3

---
 .../Applications/app_test/test_ftpclient/README.md  |  2 +-
 .../app_test/test_ftpclient/ftp_client/ftp_client.c | 13 ++++++++++---
 .../app_test/test_ftpclient/test_ftpclient.c        |  3 ++-
 Ubiquitous/XiZi_IIoT/lib/newlib/time_syscalls.c     |  4 +++-
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/APP_Framework/Applications/app_test/test_ftpclient/README.md b/APP_Framework/Applications/app_test/test_ftpclient/README.md
index 6701feb78..5e5fc0545 100644
--- a/APP_Framework/Applications/app_test/test_ftpclient/README.md
+++ b/APP_Framework/Applications/app_test/test_ftpclient/README.md
@@ -46,7 +46,7 @@ typedef struct ftp_client_struct
 
 4. 切换目录到 `test`，需要根据实际情况修改。
 
-5. 根据 10 个文件的文件名进行文件下载，文件内容通过终端打印输出。
+5. 根据 10 个文件的文件名进行文件下载，根据需求修改 `ftp_downloadfile` 函数对文件的处理为下载保存还是打印输出，为了测试方便此处将文件内容通过终端打印输出。
 
 6. 关闭 FTP client。
 
diff --git a/APP_Framework/Applications/app_test/test_ftpclient/ftp_client/ftp_client.c b/APP_Framework/Applications/app_test/test_ftpclient/ftp_client/ftp_client.c
index 130f67207..2863c2c08 100644
--- a/APP_Framework/Applications/app_test/test_ftpclient/ftp_client/ftp_client.c
+++ b/APP_Framework/Applications/app_test/test_ftpclient/ftp_client/ftp_client.c
@@ -512,11 +512,18 @@ int ftp_downloadfile(ftp_client *ftp, char *file_name)
         ret = 0;
     }
 
+    char name[64];
+    sprintf(name, "/%s", file_name);
+    int f = PrivOpen(name, O_RDWR|O_CREAT);
     /* Read the file */
     while(file_size > file_pos) {
-        if (ftp_downloaddata(ftp->data_socket, 10000, filebuf, 128, &getlen) == 0) {
+        if (ftp_downloaddata(ftp->data_socket, 10000, filebuf, 16, &getlen) == 0) {
             if (getlen) {
-                printf("%s\n", filebuf);    // Temporarily process the document as a printout
+                ret = PrivWrite(f, filebuf, strlen(filebuf));
+                if (ret < 0) {
+                    printf("write failed,error:%d\n", ret);
+                    return ret;
+                }
             } else {
                 ret = -1;
                 goto __exit;
@@ -528,7 +535,7 @@ int ftp_downloadfile(ftp_client *ftp, char *file_name)
         file_pos = file_pos + getlen;
     }
     printf("Total length: %d\n", file_pos); // Compare the size of the file previously returned by the server
-
+    PrivClose(f);
 __exit:
     if(ftp->data_socket >= 0)
     {
diff --git a/APP_Framework/Applications/app_test/test_ftpclient/test_ftpclient.c b/APP_Framework/Applications/app_test/test_ftpclient/test_ftpclient.c
index 0a80c2378..cf07d0f6f 100644
--- a/APP_Framework/Applications/app_test/test_ftpclient/test_ftpclient.c
+++ b/APP_Framework/Applications/app_test/test_ftpclient/test_ftpclient.c
@@ -9,7 +9,8 @@ void TestFtpClient() {
     lwip_config_tcp(0, self_ipaddr, self_netmask, self_gwaddr);
 
     /* Use the appropriate username and password as login parameters */
-    ftp_client *f = ftp_login("192.168.130.78", "why", "7355");
+    ftp_client *f = ftp_login("192.168.130.78", "anonymous", "anonymous");
+    if (f == NULL) return;
 
     /* Choosing the right path */
     ftp_changedir(f, "test");
diff --git a/Ubiquitous/XiZi_IIoT/lib/newlib/time_syscalls.c b/Ubiquitous/XiZi_IIoT/lib/newlib/time_syscalls.c
index 10f1efcb6..885bd8a1e 100644
--- a/Ubiquitous/XiZi_IIoT/lib/newlib/time_syscalls.c
+++ b/Ubiquitous/XiZi_IIoT/lib/newlib/time_syscalls.c
@@ -16,7 +16,9 @@
 
 time_t time(time_t *t)
 {
-    NULL_PARAM_CHECK(t);
+    if (NULL == t) {
+        return 0;
+    }
     time_t current = 0;
 
 #ifdef RESOURCES_RTC