From owner-freebsd-bugs@FreeBSD.ORG Wed Jul 13 05:20:26 2005 Return-Path: X-Original-To: freebsd-bugs@hub.freebsd.org Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A210A16A41C for ; Wed, 13 Jul 2005 05:20:26 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 09E8743D55 for ; Wed, 13 Jul 2005 05:20:26 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j6D5KPD7049785 for ; Wed, 13 Jul 2005 05:20:25 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j6D5KP9J049781; Wed, 13 Jul 2005 05:20:25 GMT (envelope-from gnats) Resent-Date: Wed, 13 Jul 2005 05:20:25 GMT Resent-Message-Id: <200507130520.j6D5KP9J049781@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Stanislav Sedov Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0491416A41C for ; Wed, 13 Jul 2005 05:19:28 +0000 (GMT) (envelope-from stas@dracon.310.ru) Received: from dracon.310.ru (dracon.310.ru [83.97.105.66]) by mx1.FreeBSD.org (Postfix) with ESMTP id 65D4543D46 for ; Wed, 13 Jul 2005 05:19:27 +0000 (GMT) (envelope-from stas@dracon.310.ru) Received: from dracon.310.ru (localhost.310.ru [127.0.0.1]) by dracon.310.ru (8.13.3/8.13.1) with ESMTP id j6D5JPHs090412 for ; Wed, 13 Jul 2005 09:19:25 +0400 (MSD) (envelope-from stas@dracon.310.ru) Received: (from stas@localhost) by dracon.310.ru (8.13.3/8.13.1/Submit) id j6D5JJU6090411; Wed, 13 Jul 2005 09:19:19 +0400 (MSD) (envelope-from stas) Message-Id: <200507130519.j6D5JJU6090411@dracon.310.ru> Date: Wed, 13 Jul 2005 09:19:19 +0400 (MSD) From: Stanislav Sedov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: bin/83366: bsdtar executes bsdtar_warnc() before setting required data X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Stanislav Sedov List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jul 2005 05:20:26 -0000 >Number: 83366 >Category: bin >Synopsis: bsdtar executes bsdtar_warnc() before setting required data >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Wed Jul 13 05:20:24 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Stanislav Sedov >Release: FreeBSD 6.0-CURRENT i386 >Organization: 310.ru [Tridesyatoe] >Environment: System: FreeBSD stalingrad.realnet 6.0-CURRENT FreeBSD 6.0-CURRENT #4: Mon Jul 11 10:56:37 MSD 2005 root@stalingrad.realnet:/work/src/fbsd-cur/src/sys/i386/compile/DESKTOP i386 >Description: bsdtar calls setlocale(3) before setting the bsdtar->progname variable, so if this operation fails, the function called, bsdtar_warnc, cannot print error message properly, as it uses this variable. >How-To-Repeat: Force setlocale(3) error. >Fix: --- bsdtar.c.diff begins here --- --- bsdtar.c.orig Sat Jul 9 07:27:26 2005 +++ bsdtar.c Sat Jul 9 07:28:35 2005 @@ -206,11 +206,6 @@ bsdtar->fd = -1; /* Mark as "unused" */ option_o = 0; - if (setlocale(LC_ALL, "") == NULL) - bsdtar_warnc(bsdtar, 0, "Failed to set default locale"); -#if defined(HAVE_NL_LANGINFO) && defined(HAVE_D_MD_ORDER) - bsdtar->day_first = (*nl_langinfo(D_MD_ORDER) == 'd'); -#endif possible_help_request = 0; /* Look up uid of current user for future reference */ @@ -236,6 +231,12 @@ else bsdtar->progname = *argv; } + + if (setlocale(LC_ALL, "") == NULL) + bsdtar_warnc(bsdtar, 0, "Failed to set default locale"); +#if defined(HAVE_NL_LANGINFO) && defined(HAVE_D_MD_ORDER) + bsdtar->day_first = (*nl_langinfo(D_MD_ORDER) == 'd'); +#endif /* Rewrite traditional-style tar arguments, if used. */ argv = rewrite_argv(bsdtar, &argc, argv, tar_opts); --- bsdtar.c.diff ends here --- --- report-bsdtar.c ends here --- >Release-Note: >Audit-Trail: >Unformatted: