diff options
| -rw-r--r-- | .editorconfig | 11 | ||||
| -rw-r--r-- | sharkd_daemon.c | 6 |
2 files changed, 15 insertions, 2 deletions
diff --git a/.editorconfig b/.editorconfig index 5553812b20..345d7cbe08 100644 --- a/.editorconfig +++ b/.editorconfig @@ -69,6 +69,17 @@ indent_size = 2 indent_style = tab indent_size = tab +[sharkd.c] +indent_size = 2 + +[sharkd_daemon.c] +indent_style = tab +indent_size = tab + +[sharkd_session.c] +indent_style = tab +indent_size = tab + [ws_version_info.[ch]] indent_style = tab indent_size = tab diff --git a/sharkd_daemon.c b/sharkd_daemon.c index b0d5810939..9d8f06d10f 100644 --- a/sharkd_daemon.c +++ b/sharkd_daemon.c @@ -239,6 +239,7 @@ sharkd_loop(void) PROCESS_INFORMATION pi; STARTUPINFO si; char *exename; + gunichar2 *commandline; #endif socket_handle_t fd; @@ -249,7 +250,7 @@ sharkd_loop(void) continue; } - /* wireshark is not ready for handling multiple capture files in single process, so fork(), and handle it in seperate process */ + /* wireshark is not ready for handling multiple capture files in single process, so fork(), and handle it in separate process */ #ifndef _WIN32 pid = fork(); if (pid == 0) @@ -278,8 +279,9 @@ sharkd_loop(void) si.hStdError = GetStdHandle(STD_ERROR_HANDLE); exename = g_strdup_printf("%s\\%s", get_progfile_dir(), "sharkd.exe"); + commandline = g_utf8_to_utf16("sharkd.exe -", -1, NULL, NULL, NULL); - if (!CreateProcess(utf_8to16(exename), utf_8to16("sharkd.exe -"), NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi)) + if (!CreateProcess(utf_8to16(exename), commandline, NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi)) { fprintf(stderr, "CreateProcess(%s) failed\n", exename); } |