From patchwork Thu Jun 2 04:46:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 628958 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3rKvpG0wrYz9sxb for ; Thu, 2 Jun 2016 14:47:01 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751208AbcFBEq6 (ORCPT ); Thu, 2 Jun 2016 00:46:58 -0400 Received: from smtp.gentoo.org ([140.211.166.183]:57118 "EHLO smtp.gentoo.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750978AbcFBEq6 (ORCPT ); Thu, 2 Jun 2016 00:46:58 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 0815C340C50; Thu, 2 Jun 2016 04:46:56 +0000 (UTC) From: Mike Frysinger To: YOSHIFUJI Hideaki Cc: netdev@vger.kernel.org Subject: [PATCH iputils v2] ping: always accept . delimiter with -i number parsing Date: Thu, 2 Jun 2016 00:46:54 -0400 Message-Id: <1464842814-30690-1-git-send-email-vapier@gentoo.org> X-Mailer: git-send-email 2.8.2 In-Reply-To: <1464752905-10347-6-git-send-email-vapier@gentoo.org> References: <1464752905-10347-6-git-send-email-vapier@gentoo.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Always allow #.# format for the -i flag even when the current locale uses a different separator. Locale de_DE which uses #,# normally. Simple testcase: $ make USE_IDN=1 $ LANG=de_DE.UTF8 ./ping -i 0.5 localhost $ LANG=de_DE.UTF8 ./ping -i 0,5 localhost Reported-by: Sergey Fionov Signed-off-by: Mike Frysinger --- ping_common.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/ping_common.c b/ping_common.c index 62f53a6..6054a91 100644 --- a/ping_common.c +++ b/ping_common.c @@ -269,11 +269,28 @@ void common_options(int ch) double dbl; char *ep; +#ifdef USE_IDN + int try_c_loc = 0; + retry_c_loc: +#endif + errno = 0; dbl = strtod(optarg, &ep); +#ifdef USE_IDN + if (try_c_loc) + setlocale(LC_ALL, ""); +#endif + if (errno || *ep != '\0' || !finite(dbl) || dbl < 0.0 || dbl >= (double)INT_MAX / 1000 - 1.0) { +#ifdef USE_IDN + if (!try_c_loc) { + try_c_loc = 1; + setlocale(LC_ALL, "C"); + goto retry_c_loc; + } +#endif fprintf(stderr, "ping: bad timing interval\n"); exit(2); }