From owner-svn-src-all@FreeBSD.ORG  Fri May  6 14:21:47 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 83CDD1065670;
	Fri,  6 May 2011 14:21:46 +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 741268FC17;
	Fri,  6 May 2011 14:21:46 +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 p46ELkqg051957;
	Fri, 6 May 2011 14:21:46 GMT (envelope-from ru@svn.freebsd.org)
Received: (from ru@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p46ELk7F051954;
	Fri, 6 May 2011 14:21:46 GMT (envelope-from ru@svn.freebsd.org)
Message-Id: <201105061421.p46ELk7F051954@svn.freebsd.org>
From: Ruslan Ermilov <ru@FreeBSD.org>
Date: Fri, 6 May 2011 14:21:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r221533 - head/contrib/one-true-awk
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 06 May 2011 14:21:47 -0000

Author: ru
Date: Fri May  6 14:21:46 2011
New Revision: 221533
URL: http://svn.freebsd.org/changeset/base/221533

Log:
  Update to a 6-May-2011 release (upstreamed some of our changes).

Deleted:
  head/contrib/one-true-awk/proctab.c
Modified:
  head/contrib/one-true-awk/FIXES
  head/contrib/one-true-awk/main.c
Directory Properties:
  head/contrib/one-true-awk/   (props changed)

Modified: head/contrib/one-true-awk/FIXES
==============================================================================
--- head/contrib/one-true-awk/FIXES	Fri May  6 14:11:20 2011	(r221532)
+++ head/contrib/one-true-awk/FIXES	Fri May  6 14:21:46 2011	(r221533)
@@ -25,6 +25,11 @@ THIS SOFTWARE.
 This file lists all bug fixes, changes, etc., made since the AWK book
 was sent to the printers in August, 1987.
 
+May 6, 2011:
+	added #ifdef for isblank.
+	now allows -ffoo as well as -f foo arguments.
+	(thanks, ruslan)
+
 May 1, 2011:
 	after advice from todd miller, kevin lo, ruslan ermilov,
 	and arnold robbins, changed srand() to return the previous

Modified: head/contrib/one-true-awk/main.c
==============================================================================
--- head/contrib/one-true-awk/main.c	Fri May  6 14:11:20 2011	(r221532)
+++ head/contrib/one-true-awk/main.c	Fri May  6 14:21:46 2011	(r221533)
@@ -25,7 +25,7 @@ THIS SOFTWARE.
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-const char	*version = "version 20110501 (FreeBSD)";
+const char	*version = "version 20110506 (FreeBSD)";
 
 #define DEBUG
 #include <stdio.h>
@@ -95,7 +95,7 @@ int main(int argc, char *argv[])
 				safe = 1;
 			break;
 		case 'f':	/* next argument is program filename */
-			if (argv[1][2] != 0) {	/* arg is -fsomething */
+			if (argv[1][2] != 0) {  /* arg is -fsomething */
 				if (npfile >= MAX_PFILE - 1)
 					FATAL("too many -f options"); 
 				pfile[npfile++] = &argv[1][2];