From 29a2affb74266415e5cfe6d3608b047a12c14ba2 Mon Sep 17 00:00:00 2001 From: LRN Date: Thu, 22 Aug 2013 11:01:17 +0000 Subject: Fix the use of s/S field types with ANSI-compliant wprintfs --- contrib/timeout_watchdog_w32.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'contrib') diff --git a/contrib/timeout_watchdog_w32.c b/contrib/timeout_watchdog_w32.c index e136c03a8..d5117d71f 100644 --- a/contrib/timeout_watchdog_w32.c +++ b/contrib/timeout_watchdog_w32.c @@ -100,7 +100,7 @@ main (int argc, char *argv[]) if (cmdlen < 5 || wcscmp (&wargv[2][cmdlen - 4], L".exe") != 0) { non_const_filename = malloc (sizeof (wchar_t) * (cmdlen + 5)); - _snwprintf (non_const_filename, cmdlen + 5, L"%s.exe", wargv[2]); + swprintf (non_const_filename, cmdlen + 5, L"%S.exe", wargv[2]); } else { @@ -109,7 +109,7 @@ main (int argc, char *argv[]) /* Check that this is the full path. If it isn't, search. */ if (non_const_filename[1] == L':') - _snwprintf (wpath, sizeof (wpath) / sizeof (wchar_t), L"%s", non_const_filename); + swprintf (wpath, sizeof (wpath) / sizeof (wchar_t), L"%S", non_const_filename); else if (!SearchPathW (pathbuf, non_const_filename, NULL, sizeof (wpath) / sizeof (wchar_t), wpath, NULL)) @@ -134,16 +134,16 @@ main (int argc, char *argv[]) wchar_t arg_lastchar = arg[wcslen (arg) - 1]; if (wrote == 0) { - wrote += _snwprintf (&wcmd[wrote], cmdlen + 1 - wrote, L"\"%s%s\" ", wpath, + wrote += swprintf (&wcmd[wrote], cmdlen + 1 - wrote, L"\"%S%S\" ", wpath, arg_lastchar == L'\\' ? L"\\" : L""); } else { if (wcschr (arg, L' ') != NULL) - wrote += swprintf (&wcmd[wrote], cmdlen + 1 - wrote, L"\"%s%s\"%s", arg, + wrote += swprintf (&wcmd[wrote], cmdlen + 1 - wrote, L"\"%S%S\"%S", arg, arg_lastchar == L'\\' ? L"\\" : L"", i == wargc ? L"" : L" "); else - wrote += swprintf (&wcmd[wrote], cmdlen + 1 - wrote, L"%s%s%s", arg, + wrote += swprintf (&wcmd[wrote], cmdlen + 1 - wrote, L"%S%S%S", arg, arg_lastchar == L'\\' ? L"\\" : L"", i == wargc ? L"" : L" "); } } @@ -156,7 +156,7 @@ main (int argc, char *argv[]) if (!CreateProcessW (wpath, wcmd, NULL, NULL, TRUE, CREATE_SUSPENDED, NULL, NULL, &start, &proc)) { - wprintf (L"Failed to get spawn process `%s' with arguments `%s': %lu\n", wpath, wcmd, GetLastError ()); + wprintf (L"Failed to get spawn process `%S' with arguments `%S': %lu\n", wpath, wcmd, GetLastError ()); exit (6); } -- cgit v1.2.3