From patchwork Tue May 25 07:38:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Selva Nair X-Patchwork-Id: 1838 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director9.mail.ord1d.rsapps.net ([172.31.255.6]) by backend30.mail.ord1d.rsapps.net with LMTP id QGvlMmk2rWB5EgAAIUCqbw (envelope-from ) for ; Tue, 25 May 2021 13:39:53 -0400 Received: from proxy2.mail.iad3b.rsapps.net ([172.31.255.6]) by director9.mail.ord1d.rsapps.net with LMTP id 6G5OMmk2rWDAbAAAalYnBA (envelope-from ) for ; Tue, 25 May 2021 13:39:53 -0400 Received: from smtp36.gate.iad3b ([172.31.255.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy2.mail.iad3b.rsapps.net with LMTPS id yI65K2k2rWAFfQAAvAZTew (envelope-from ) for ; Tue, 25 May 2021 13:39:53 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.105.38.7] Authentication-Results: smtp36.gate.iad3b.rsapps.net; iprev=pass policy.iprev="216.105.38.7"; spf=pass smtp.mailfrom="openvpn-devel-bounces@lists.sourceforge.net" smtp.helo="lists.sourceforge.net"; dkim=fail (signature verification failed) header.d=sourceforge.net; dkim=fail (signature verification failed) header.d=sf.net; dkim=fail (signature verification failed) header.d=gmail.com; dmarc=fail (p=none; dis=none) header.from=gmail.com X-Suspicious-Flag: YES X-Classification-ID: 3609d5ec-bd80-11eb-9fbc-5254003a7283-1-1 Received: from [216.105.38.7] ([216.105.38.7:52430] helo=lists.sourceforge.net) by smtp36.gate.iad3b.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id FF/B6-29889-9663DA06; Tue, 25 May 2021 13:39:53 -0400 Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1llb1E-0001uJ-UK; Tue, 25 May 2021 17:39:04 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llb1D-0001uC-1D for openvpn-devel@lists.sourceforge.net; Tue, 25 May 2021 17:39:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=gDSGjCjvc593eiqTRfCvQVojJcv1Bj1SiXIgidyT1XY=; b=NdQ87Rj+K5Fgj9T5dscFHpi2Ow PO6u5ABwWJ4ZWaCBTHYpPLgUAVc3c/FMh0+/0ofO6cQxm+FKAYifF00ZeVqsEYJZ+co90KE5PeGSS hx8YHtauQnXkXflLqPXzKtW3mAJeN/qKecqLmN30KHyO0Q9PMN1Gz0ZcO9msYX7zQWFU=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=gDSGjCjvc593eiqTRfCvQVojJcv1Bj1SiXIgidyT1XY=; b=Hqm2AnzVo1jIFCNPbGflRIj+po MiTfsQUyaFeNua6ZimHPMRcX9tPzvJeV70lABb3B8mtqVdH/PIGFlhZ1J1GGzPvsoDlsB9qoZgs+6 ZtcAU0nfzEyFGKhHrjZj0cO9JsFSUQXkUkivvFziRDamsAsGOoMpzeH16c/PWwsQzgok=; Received: from mail-qt1-f182.google.com ([209.85.160.182]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92.2) id 1llb16-005c1n-RP for openvpn-devel@lists.sourceforge.net; Tue, 25 May 2021 17:39:05 +0000 Received: by mail-qt1-f182.google.com with SMTP id i12so4154488qtr.7 for ; Tue, 25 May 2021 10:38:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gDSGjCjvc593eiqTRfCvQVojJcv1Bj1SiXIgidyT1XY=; b=meCfJoaa+qGpfY26favLg4SurpgpXR0l38GnINWNZOnFVEg4ouoV+W1wO4LlUKkKHg xL9+RuiJISzym7rofIhVi/mXdWn1EPDJ57I10PcY/xzO87ZF6iwpA584cQi0dGQ6sy1x zpsJ1MB2JrOPySk1twEz5pAyByR10zojc0Nz0zPPDU43dfvG/7zV4BM+CiErskk+D4np kEPMpzr9u3LomCDOeSn6vOQ9bC1+INwnazgTudCKwGiKOB6WOG5HptvwDPFmJzzkBwP+ EVTihFtiulOPje19JysRO0vad8Rw3YDpRvBhLoTqqEfryzq8HEHQnSMF4iMGQE29V6dE C6Mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gDSGjCjvc593eiqTRfCvQVojJcv1Bj1SiXIgidyT1XY=; b=cAxCwEPiuGblxSuyux0kRhYqqTAmci3ob5r9/9sp87/yCOjbYNlw3L/wKfQIqM7CxB qJx43LTKPm6V1ccNTF6QXrNTviSwrXRsEN9YoL3xBrNXl6wHZmAbxwgdgbCCDs0Pi6H8 k0LEVNUctL+Ux16l2Ge+7tMqQrN1rPRzThMIm+x0aAd3iEFNWSU5Sy+OKIICitpfV0LT m3f63p/Ms+a+kG6spHT1uKWKo+wBzUAxc6gfj1RxolJe/1YD5SD2MGvD/VS8R3lvxwwo KFsIx0RcGhazbySa/xI6K6NiI0ST7Npwt6z1hKxQSQwVUjr9BiGlogqJ3B5WKQASt6me b20Q== X-Gm-Message-State: AOAM530TFs21ueo7C+ddvXQmnDYPGFbm7DA7wno6EzpPrY7lfhJaY2sK VecuKGIpfDY2QGqZU7fNI4D/G3/eeaMzZET8 X-Google-Smtp-Source: ABdhPJwfHmvtxAxtJhj6dB12nFWt8qfxOXZvwPe4r3f7fn2MvyP63EpiMPD+vvV6oT83ZCfBPD9NLA== X-Received: by 2002:a05:622a:1347:: with SMTP id w7mr33818655qtk.261.1621964329893; Tue, 25 May 2021 10:38:49 -0700 (PDT) Received: from uranus.home.sansel.ca (bras-vprn-tnhlon4053w-lp130-01-70-51-222-236.dsl.bell.ca. [70.51.222.236]) by smtp.gmail.com with ESMTPSA id p17sm12904622qkg.67.2021.05.25.10.38.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 May 2021 10:38:49 -0700 (PDT) From: selva.nair@gmail.com To: openvpn-devel@lists.sourceforge.net Date: Tue, 25 May 2021 13:38:38 -0400 Message-Id: <20210525173838.3969-1-selva.nair@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210522033232.20548-3-selva.nair@gmail.com> References: <20210522033232.20548-3-selva.nair@gmail.com> MIME-Version: 1.0 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (selva.nair[at]gmail.com) 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.160.182 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.160.182 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-Headers-End: 1llb16-005c1n-RP Subject: [Openvpn-devel] [PATCH 3/3 v2] Print format spec changes for tapctl and openvpnmscia X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox From: Selva Nair The tapctl and openvpnmscia codebase is written with an intent of supporting both unicode and ansi builds. This patch does not attempt to change that although non-unicode support looks untested and buggy. The main change is to replace %s by PRIsLPTSR that is defined as %ls or %s depending on _UNICODE is defined ot not. v2: add missing ')' and fix whitespace Signed-off-by: Selva Nair Acked-by: Lev Stipakov --- src/openvpnmsica/openvpnmsica.c | 6 +++-- src/tapctl/main.c | 39 +++++++++++++++++++++------------ src/tapctl/tap.c | 3 ++- 3 files changed, 31 insertions(+), 17 deletions(-) diff --git a/src/openvpnmsica/openvpnmsica.c b/src/openvpnmsica/openvpnmsica.c index 96652117..5eb2f3c8 100644 --- a/src/openvpnmsica/openvpnmsica.c +++ b/src/openvpnmsica/openvpnmsica.c @@ -108,7 +108,8 @@ _debug_popup(_In_z_ LPCTSTR szFunctionName) /* Compose pop-up title. The dialog title will contain function name to ease the process * locating. Mind that Visual Studio displays window titles on the process list. */ - _stprintf_s(szTitle, _countof(szTitle), TEXT("%s v%s"), szFunctionName, TEXT(PACKAGE_VERSION)); + _stprintf_s(szTitle, _countof(szTitle), TEXT("%") TEXT(PRIsLPTSTR) TEXT("v%") TEXT(PRIsLPTSTR), + szFunctionName, TEXT(PACKAGE_VERSION)); /* Get process name. */ GetModuleFileName(NULL, szProcessPath, _countof(szProcessPath)); @@ -118,7 +119,8 @@ _debug_popup(_In_z_ LPCTSTR szFunctionName) /* Compose the pop-up message. */ _stprintf_s( szMessage, _countof(szMessage), - TEXT("The %s process (PID: %u) has started to execute the %s custom action.\r\n") + TEXT("The %") TEXT(PRIsLPTSTR) TEXT(" process (PID: %u) has started to execute the %") + TEXT(PRIsLPTSTR) TEXT(" custom action.\r\n") TEXT("\r\n") TEXT("If you would like to debug the custom action, attach a debugger to this process and set breakpoints before dismissing this dialog.\r\n") TEXT("\r\n") diff --git a/src/tapctl/main.c b/src/tapctl/main.c index 3350bf1f..81addaef 100644 --- a/src/tapctl/main.c +++ b/src/tapctl/main.c @@ -49,7 +49,7 @@ const TCHAR title_string[] = ; static const TCHAR usage_message[] = - TEXT("%s\n") + TEXT("%") TEXT(PRIsLPTSTR) TEXT("\n") TEXT("\n") TEXT("Usage:\n") TEXT("\n") @@ -66,7 +66,7 @@ static const TCHAR usage_message[] = ; static const TCHAR usage_message_create[] = - TEXT("%s\n") + TEXT("%") TEXT(PRIsLPTSTR) TEXT("\n") TEXT("\n") TEXT("Creates a new TUN/TAP adapter\n") TEXT("\n") @@ -91,7 +91,7 @@ static const TCHAR usage_message_create[] = ; static const TCHAR usage_message_list[] = - TEXT("%s\n") + TEXT("%") TEXT(PRIsLPTSTR) TEXT("\n") TEXT("\n") TEXT("Lists TUN/TAP adapters\n") TEXT("\n") @@ -110,7 +110,7 @@ static const TCHAR usage_message_list[] = ; static const TCHAR usage_message_delete[] = - TEXT("%s\n") + TEXT("%") TEXT(PRIsLPTSTR) TEXT("\n") TEXT("\n") TEXT("Deletes the specified network adapter\n") TEXT("\n") @@ -170,7 +170,8 @@ _tmain(int argc, LPCTSTR argv[]) } else { - _ftprintf(stderr, TEXT("Unknown command \"%s\". Please, use \"tapctl help\" to list supported commands.\n"), argv[2]); + _ftprintf(stderr, TEXT("Unknown command \"%") TEXT(PRIsLPTSTR) + TEXT("\". Please, use \"tapctl help\" to list supported commands.\n"), argv[2]); } return 1; @@ -194,7 +195,9 @@ _tmain(int argc, LPCTSTR argv[]) } else { - _ftprintf(stderr, TEXT("Unknown option \"%s\". Please, use \"tapctl help create\" to list supported options. Ignored.\n"), argv[i]); + _ftprintf(stderr, TEXT("Unknown option \"%") TEXT(PRIsLPTSTR) + TEXT("\". Please, use \"tapctl help create\" to list supported options. Ignored.\n"), + argv[i]); } } @@ -230,7 +233,8 @@ _tmain(int argc, LPCTSTR argv[]) if (_tcsicmp(szName, pAdapter->szName) == 0) { StringFromIID((REFIID)&pAdapter->guid, &szAdapterId); - _ftprintf(stderr, TEXT("Adapter \"%s\" already exists (GUID %") TEXT(PRIsLPOLESTR) TEXT(").\n"), pAdapter->szName, szAdapterId); + _ftprintf(stderr, TEXT("Adapter \"%") TEXT(PRIsLPTSTR) TEXT("\" already exists (GUID %") + TEXT(PRIsLPOLESTR) TEXT(").\n"), pAdapter->szName, szAdapterId); CoTaskMemFree(szAdapterId); iResult = 1; goto create_cleanup_pAdapterList; } @@ -241,7 +245,9 @@ _tmain(int argc, LPCTSTR argv[]) if (dwResult != ERROR_SUCCESS) { StringFromIID((REFIID)&guidAdapter, &szAdapterId); - _ftprintf(stderr, TEXT("Renaming TUN/TAP adapter %") TEXT(PRIsLPOLESTR) TEXT(" to \"%s\" failed (error 0x%x).\n"), szAdapterId, szName, dwResult); + _ftprintf(stderr, TEXT("Renaming TUN/TAP adapter %") TEXT(PRIsLPOLESTR) + TEXT(" to \"%") TEXT(PRIsLPTSTR) TEXT("\" failed (error 0x%x).\n"), + szAdapterId, szName, dwResult); CoTaskMemFree(szAdapterId); iResult = 1; goto quit; } @@ -289,7 +295,9 @@ create_delete_adapter: } else { - _ftprintf(stderr, TEXT("Unknown option \"%s\". Please, use \"tapctl help list\" to list supported options. Ignored.\n"), argv[i]); + _ftprintf(stderr, TEXT("Unknown option \"%") TEXT(PRIsLPTSTR) + TEXT("\". Please, use \"tapctl help list\" to list supported options. Ignored.\n"), + argv[i]); } } @@ -306,7 +314,8 @@ create_delete_adapter: { LPOLESTR szAdapterId = NULL; StringFromIID((REFIID)&pAdapter->guid, &szAdapterId); - _ftprintf(stdout, TEXT("%") TEXT(PRIsLPOLESTR) TEXT("\t%") TEXT(PRIsLPTSTR) TEXT("\n"), szAdapterId, pAdapter->szName); + _ftprintf(stdout, TEXT("%") TEXT(PRIsLPOLESTR) TEXT("\t%") + TEXT(PRIsLPTSTR) TEXT("\n"), szAdapterId, pAdapter->szName); CoTaskMemFree(szAdapterId); } @@ -337,7 +346,7 @@ create_delete_adapter: { if (pAdapter == NULL) { - _ftprintf(stderr, TEXT("\"%s\" adapter not found.\n"), argv[2]); + _ftprintf(stderr, TEXT("\"%") TEXT(PRIsLPTSTR) TEXT("\" adapter not found.\n"), argv[2]); iResult = 1; goto delete_cleanup_pAdapterList; } else if (_tcsicmp(argv[2], pAdapter->szName) == 0) @@ -364,7 +373,8 @@ delete_cleanup_pAdapterList: &bRebootRequired); if (dwResult != ERROR_SUCCESS) { - _ftprintf(stderr, TEXT("Deleting adapter \"%s\" failed (error 0x%x).\n"), argv[2], dwResult); + _ftprintf(stderr, TEXT("Deleting adapter \"%") TEXT(PRIsLPTSTR) + TEXT("\" failed (error 0x%x).\n"), argv[2], dwResult); iResult = 1; goto quit; } @@ -372,7 +382,8 @@ delete_cleanup_pAdapterList: } else { - _ftprintf(stderr, TEXT("Unknown command \"%s\". Please, use \"tapctl help\" to list supported commands.\n"), argv[1]); + _ftprintf(stderr, TEXT("Unknown command \"%") TEXT(PRIsLPTSTR) + TEXT("\". Please, use \"tapctl help\" to list supported commands.\n"), argv[1]); return 1; } @@ -434,7 +445,7 @@ x_msg_va(const unsigned int flags, const char *format, va_list arglist) } /* Output error message. */ - _ftprintf(stderr, TEXT("Error 0x%x: %s\n"), dwResult, szErrMessage); + _ftprintf(stderr, TEXT("Error 0x%x: %") TEXT(PRIsLPTSTR) TEXT("\n"), dwResult, szErrMessage); LocalFree(szErrMessage); } diff --git a/src/tapctl/tap.c b/src/tapctl/tap.c index 563c07f6..b8d63b0f 100644 --- a/src/tapctl/tap.c +++ b/src/tapctl/tap.c @@ -1117,7 +1117,8 @@ tap_set_adapter_name( } /* rename adapter via netsh call */ - const TCHAR* szFmt = _T("netsh interface set interface name=\"%s\" newname=\"%s\""); + const TCHAR* szFmt = TEXT("netsh interface set interface name=\"%") + TEXT(PRIsLPTSTR) TEXT("\" newname=\"%") TEXT(PRIsLPTSTR) TEXT("\""); size_t ncmdline = _tcslen(szFmt) + _tcslen(szOldName) + _tcslen(szName) + 1; WCHAR* szCmdLine = malloc(ncmdline * sizeof(TCHAR)); _stprintf_s(szCmdLine, ncmdline, szFmt, szOldName, szName);