Changeset 37964

Timestamp:

07/19/10 17:15:51 (3 years ago)

Author:

saturday06

Message:

del...

Location:

lang/c/AutoUpdater/trunk

Files:

• AutoUpdater.c (modified) (1 diff)
• AutoUpdater.sln (modified) (1 diff)
• UpdaterProcess.c (modified) (11 diffs)

lang/c/AutoUpdater/trunk/AutoUpdater.c

@@ -965 +965 @@
             _T("%s\n")
             _T("%s\n")
-            , GetCurrentProcessId(), context->extracted_dir_path, target, myname, cd);
+            _T("%s\n")
+            , GetCurrentProcessId(), context->extracted_dir_path, target, myname, cd, context->temp_dir_path);
         fclose(f);
     }
+
 
     {

lang/c/AutoUpdater/trunk/AutoUpdater.sln

@@ -1 +1 @@
 
 Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
+# Visual C++ Express 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AutoUpdater", "AutoUpdater.vcproj", "{5BDD41D2-DE9F-41CD-B980-79A6EF0CFB67}"
 EndProject

lang/c/AutoUpdater/trunk/UpdaterProcess.c

@@ -117 +117 @@
     DWORD bytes_got = 0;
     TCHAR* data = NULL;
-    TCHAR* lines[5] = {NULL, NULL, NULL, NULL, NULL};
+    TCHAR* new_program = NULL;
+    TCHAR* new_program_cd = NULL;
+    TCHAR* update_from = NULL;
+    TCHAR* update_to = NULL;
+    TCHAR* clean_after = NULL;
+    TCHAR* pid_string = NULL;
     DWORD pid = 0;
     int complete = 0;
@@ -152 +157 @@
     }
 
-    { /* each lines to lines[5] */
+    {
+        TCHAR* lines[6];
         size_t i = 0;
         size_t data_count = (bytes / sizeof(data[0]));
         unsigned line = 0;
+        memset(lines, 0, sizeof(lines));
         for (i = 0; i < data_count; ++i) {
             if (data[i] == _T('\r')) {
@@ -171 +178 @@
             }
         }
-    }
-
-    AUI_Debug(_T("pid=%s, from=%s, to=%s\nnewproc=%s, cd=%s\n"), lines[0], lines[1], lines[2], lines[3], lines[4]);
+        pid_string     = lines[0];
+        update_from    = lines[1];
+        update_to      = lines[2];
+        new_program    = lines[3];
+        new_program_cd = lines[4];
+        clean_after    = lines[5];
+    }
+
+    AUI_Debug(_T("pid=%s, from=%s, to=%s\nnewproc=%s, cd=%s clean=%s\n"), 
+        pid_string, update_from, update_to, new_program, new_program_cd, clean_after);
     
-    {
-        TCHAR* pid_string;
+    if (pid_string) {
         int i = 0;
-        pid_string = lines[0];
         for (i = 0; pid_string[i]; ++i) {
             if (pid_string[i] < _T('0') || _T('9') < pid_string[i]) {
@@ -189 +201 @@
     }
 
-
-    {   
+    if (clean_after) {
         TCHAR comspec[MAX_PATH];
         TCHAR rd_command[] = _T("\"%s\" /c rd /s /q \"%s\"");
@@ -198 +209 @@
         }
 
-        clean_command_len = lstrlen(comspec) + lstrlen(rd_command) + lstrlen(lines[4]);
+        clean_command_len = lstrlen(comspec) + lstrlen(rd_command) + lstrlen(clean_after);
         clean_command = (TCHAR*)HeapAlloc(GetProcessHeap(), 
             HEAP_ZERO_MEMORY, clean_command_len * sizeof(TCHAR));
@@ -204 +215 @@
             goto clean_up;
         }
-        wsprintf(clean_command, rd_command, comspec, lines[4]); 
+        wsprintf(clean_command, rd_command, comspec, clean_after); 
     }
 
@@ -215 +226 @@
     AUI_Debug(L"start copy\n");
 
-    if (CopyDirectory(lines[1], lines[2])) {
+    if (CopyDirectory(update_from, update_to)) {
         complete = 1;
     }
 
 clean_up:
-    if (lines[3] && lines[4]) {
+    if (new_program && new_program_cd) {
         TCHAR* arg = NULL;
         TCHAR command_format[] = _T("\"%s\" %s");
@@ -233 +244 @@
         }
         command_len = lstrlen(command_format);
-        command_len += lstrlen(lines[3]);
+        command_len += lstrlen(new_program);
         command_len += lstrlen(arg);
 
         command = (TCHAR*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (unsigned)command_len * sizeof(TCHAR));
         if (command) {
-            wsprintf(command, command_format, lines[3], arg);
-        }
-    }
-
-    if (command && lines[4]) {
+            wsprintf(command, command_format, new_program, arg);
+        }
+    }
+
+    if (command && new_program_cd) {
         STARTUPINFO si;
         PROCESS_INFORMATION pi;
@@ -250 +261 @@
         memset(&pi, 0, sizeof(pi));
 
-        CreateProcess(NULL, command, NULL, NULL, FALSE, 0, NULL, lines[4], &si, &pi);
+        CreateProcess(NULL, command, NULL, NULL, FALSE, 0, NULL, new_program_cd, &si, &pi);
         e = GetLastError();
-        AUI_Debug(_T("CreateProcess(): command=%s, cd=%s, error=%d\n"), command, lines[4], e);
+        AUI_Debug(_T("CreateProcess(): command=%s, cd=%s, error=%d\n"), command, new_program_cd, e);
 
         CloseHandle(pi.hThread);
@@ -269 +280 @@
         si.wShowWindow = SW_HIDE; 
         memset(&pi, 0, sizeof(pi));
+        AUI_Debug(_T("CreateProcess(del): command=%s, cd=%s\n"), clean_command, temp_path);
         CreateProcess(NULL, clean_command, NULL, NULL, FALSE, 0, NULL, temp_path, &si, &pi);
         /*
@@ -276 +288 @@
     }
 
+
     /*
     if (data) {