upgrade-apply-deltafs: Redirect logs to stdout

Change-Id: I3df168efd1d8a645bfd7f9c391e9b7d0987cf23e

diff --git a/src/upgrade-apply-deltafs/engine/fota_log.h b/src/upgrade-apply-deltafs/engine/fota_log.h
index 7e460c66a540f4146f0fc57c56fe9ef15ebf4b72..38282416dfe4970b35aab0b7bc7288111eded156 100755 (executable)
--- a/src/upgrade-apply-deltafs/engine/fota_log.h
+++ b/src/upgrade-apply-deltafs/engine/fota_log.h
@@ -39,8 +39,8 @@ extern void set_max_logfile_size(void);
 #define LOG_FLASH      (1<<2)
 #define LOG_SSENGINE   LOG_ENGINE
 
-//#define DEBUG_STDOUT
-#define DEBUG_FILE
+#define DEBUG_STDOUT
+//#define DEBUG_FILE
 
 #ifdef DEBUG_STDOUT
 #define LOGE(s, args...) printf("UA/ERROR(%s)  " s, __func__, ##args)   // Error log

diff --git a/src/upgrade-apply-deltafs/ua.c b/src/upgrade-apply-deltafs/ua.c
index 55af7e3ea200dde7d81aaaafa345da4752eb0e62..678214b32d7f4adcc6803400b85dd486f0593283 100755 (executable)
--- a/src/upgrade-apply-deltafs/ua.c
+++ b/src/upgrade-apply-deltafs/ua.c
@@ -446,7 +446,6 @@ int update_all()
  ----------------------------------------------------------------------------*/
 void log_init(void)
 {
-       memset(log_path, 0x00, sizeof(log_path));
        snprintf(log_path, sizeof(log_path), "%s", LOG_FILE_PATH);
 
        __log_out_file__ = fopen(log_path, "w");
@@ -454,6 +453,7 @@ void log_init(void)
                perror("file open error\n");
                return;
        }
+
        get_time_stamp();
        LOG("===== log start [%s] =====\n", ts);
 }
@@ -765,19 +765,12 @@ int main(int argc, char **argv)
        SS_set_feature_support_capability(1);
 #endif
 
-       memset(delta_folder, 0x00, sizeof(delta_folder));
        snprintf(delta_folder, sizeof(delta_folder)-1, "%s", my_opt.archive);
        snprintf(delta_path, sizeof(delta_path)-1, "%s/%s", delta_folder, DEFAULT_DELTA_NAME);
        s_update_data.ua_delta_folder = strdup(delta_folder);
 
-       memset(temp_folder, 0x00, sizeof(temp_folder));
        snprintf(temp_folder, sizeof(temp_folder)-1, "%s", TEMP_FOLDER);
-
-       memset(log_folder, 0x00, sizeof(log_folder));
        snprintf(log_folder, sizeof(log_folder)-1, "%s", SYSTEM_LOG_DIR);
-
-       memcpy(result_folder, temp_folder, sizeof(result_folder));
-
        snprintf(fota_result, sizeof(fota_result), "%s/%s", result_folder, "result");
 
        fota_cfg_str_load();