From owner-svn-src-vendor@FreeBSD.ORG  Thu Aug 11 04:58:21 2011
Return-Path: <owner-svn-src-vendor@FreeBSD.ORG>
Delivered-To: svn-src-vendor@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 20F82106566B;
	Thu, 11 Aug 2011 04:58:21 +0000 (UTC) (envelope-from ru@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id EB1408FC08;
	Thu, 11 Aug 2011 04:58:20 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p7B4wKac076891;
	Thu, 11 Aug 2011 04:58:20 GMT (envelope-from ru@svn.freebsd.org)
Received: (from ru@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7B4wKaa076887;
	Thu, 11 Aug 2011 04:58:20 GMT (envelope-from ru@svn.freebsd.org)
Message-Id: <201108110458.p7B4wKaa076887@svn.freebsd.org>
From: Ruslan Ermilov <ru@FreeBSD.org>
Date: Thu, 11 Aug 2011 04:58:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-vendor@freebsd.org
X-SVN-Group: vendor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r224772 - vendor/one-true-awk/dist
X-BeenThere: svn-src-vendor@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the vendor work area tree
	<svn-src-vendor.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-vendor>, 
	<mailto:svn-src-vendor-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-vendor>
List-Post: <mailto:svn-src-vendor@freebsd.org>
List-Help: <mailto:svn-src-vendor-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-vendor>,
	<mailto:svn-src-vendor-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Aug 2011 04:58:21 -0000

Author: ru
Date: Thu Aug 11 04:58:20 2011
New Revision: 224772
URL: http://svn.freebsd.org/changeset/base/224772

Log:
  Vendor import of bwk's 10-Aug-2011 release.

Modified:
  vendor/one-true-awk/dist/FIXES
  vendor/one-true-awk/dist/lib.c
  vendor/one-true-awk/dist/main.c

Modified: vendor/one-true-awk/dist/FIXES
==============================================================================
--- vendor/one-true-awk/dist/FIXES	Thu Aug 11 02:50:18 2011	(r224771)
+++ vendor/one-true-awk/dist/FIXES	Thu Aug 11 04:58:20 2011	(r224772)
@@ -25,6 +25,10 @@ THIS SOFTWARE.
 This file lists all bug fixes, changes, etc., made since the AWK book
 was sent to the printers in August, 1987.
 
+Aug 10, 2011:
+	another fix to avoid core dump with -v; again, many thanks
+	to ruslan ermilov.
+
 Aug 7, 2011:
 	split(s, a, //) now behaves the same as split(s, a, "")
 

Modified: vendor/one-true-awk/dist/lib.c
==============================================================================
--- vendor/one-true-awk/dist/lib.c	Thu Aug 11 02:50:18 2011	(r224771)
+++ vendor/one-true-awk/dist/lib.c	Thu Aug 11 04:58:20 2011	(r224772)
@@ -89,8 +89,13 @@ void initgetrec(void)
 	char *p;
 
 	for (i = 1; i < *ARGC; i++) {
-		if (!isclvar(p = getargv(i))) {	/* find 1st real filename */
-			setsval(lookup("FILENAME", symtab), getargv(i));
+		p = getargv(i); /* find 1st real filename */
+		if (p == NULL || *p == '\0') {  /* deleted or zapped */
+			argno++;
+			continue;
+		}
+		if (!isclvar(p)) {
+			setsval(lookup("FILENAME", symtab), p);
 			return;
 		}
 		setclvar(p);	/* a commandline assignment before filename */

Modified: vendor/one-true-awk/dist/main.c
==============================================================================
--- vendor/one-true-awk/dist/main.c	Thu Aug 11 02:50:18 2011	(r224771)
+++ vendor/one-true-awk/dist/main.c	Thu Aug 11 04:58:20 2011	(r224772)
@@ -22,7 +22,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE
 THIS SOFTWARE.
 ****************************************************************/
 
-const char	*version = "version 20110807";
+const char	*version = "version 20110810";
 
 #define DEBUG
 #include <stdio.h>