[Midnightbsd-cvs] src [11572] U trunk/usr.bin/colldef/scan.l: sync with freebsd.

[laffer1 at midnightbsd.org]

Revision: 11572
          http://svnweb.midnightbsd.org/src/?rev=11572
Author:   laffer1
Date:     2018-07-07 19:19:23 -0400 (Sat, 07 Jul 2018)
Log Message:
-----------
sync with freebsd.

Modified Paths:
--------------
    trunk/usr.bin/colldef/Makefile
    trunk/usr.bin/colldef/colldef.1
    trunk/usr.bin/colldef/common.h
    trunk/usr.bin/colldef/parse.y
    trunk/usr.bin/colldef/scan.l

Property Changed:
----------------
    trunk/usr.bin/colldef/colldef.1
    trunk/usr.bin/colldef/parse.y
    trunk/usr.bin/colldef/scan.l

Modified: trunk/usr.bin/colldef/Makefile
===================================================================
--- trunk/usr.bin/colldef/Makefile	2018-07-07 23:18:59 UTC (rev 11571)
+++ trunk/usr.bin/colldef/Makefile	2018-07-07 23:19:23 UTC (rev 11572)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/usr.bin/colldef/Makefile 215676 2010-11-22 14:16:22Z brucec $
 
 PROG=	colldef
 SRCS=	parse.y scan.l y.tab.h

Modified: trunk/usr.bin/colldef/colldef.1
===================================================================
--- trunk/usr.bin/colldef/colldef.1	2018-07-07 23:18:59 UTC (rev 11571)
+++ trunk/usr.bin/colldef/colldef.1	2018-07-07 23:19:23 UTC (rev 11572)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
 .\" Copyright (c) 1995 Alex Tatmanjants <alex at elvisti.kiev.ua>
 .\"		at Electronni Visti IA, Kiev, Ukraine.
 .\"			All rights reserved.
@@ -23,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $MidnightBSD$
+.\" $FreeBSD: stable/10/usr.bin/colldef/colldef.1 213573 2010-10-08 12:40:16Z uqs $
 .\"
 .Dd January 27, 1995
 .Dt COLLDEF 1


Property changes on: trunk/usr.bin/colldef/colldef.1
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.bin/colldef/common.h
===================================================================
--- trunk/usr.bin/colldef/common.h	2018-07-07 23:18:59 UTC (rev 11571)
+++ trunk/usr.bin/colldef/common.h	2018-07-07 23:19:23 UTC (rev 11572)
@@ -1,5 +1,6 @@
+/* $MidnightBSD$ */
 /*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.bin/colldef/common.h 87052 2001-11-28 09:50:24Z ache $
  */
 
 #define CHARMAP_SYMBOL_LEN 64

Modified: trunk/usr.bin/colldef/parse.y
===================================================================
--- trunk/usr.bin/colldef/parse.y	2018-07-07 23:18:59 UTC (rev 11571)
+++ trunk/usr.bin/colldef/parse.y	2018-07-07 23:19:23 UTC (rev 11572)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 %{
 /*-
  * Copyright (c) 1995 Alex Tatmanjants <alex at elvisti.kiev.ua>
@@ -27,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/usr.bin/colldef/parse.y 293290 2016-01-07 00:40:51Z bdrewery $");
 
 #include <sys/types.h>
 #include <arpa/inet.h>
@@ -134,17 +135,17 @@
 	strcpy(__collate_version, COLLATE_VERSION1_2);
 	if (fwrite(__collate_version, sizeof(__collate_version), 1, fp) != 1)
 		err(EX_IOERR,
-		"IO error writting collate version to destination file %s",
+		"I/O error writing collate version to destination file %s",
 		    out_file);
 	u32 = htonl(chain_index);
 	if (fwrite(&u32, sizeof(u32), 1, fp) != 1)
 		err(EX_IOERR,
-		"IO error writting chains number to destination file %s",
+		"I/O error writing chains number to destination file %s",
 		    out_file);
 	if (fwrite(__collate_substitute_table,
 		   sizeof(__collate_substitute_table), 1, fp) != 1)
 		err(EX_IOERR,
-		"IO error writting substitute table to destination file %s",
+		"I/O error writing substitution table to destination file %s",
 		    out_file);
 	for (ch = 0; ch < UCHAR_MAX + 1; ch++) {
 		__collate_char_pri_table[ch].prim =
@@ -155,7 +156,7 @@
 	if (fwrite(__collate_char_pri_table,
 		   sizeof(__collate_char_pri_table), 1, fp) != 1)
 		err(EX_IOERR,
-		"IO error writting char table to destination file %s",
+		"I/O error writing char table to destination file %s",
 		    out_file);
 	for (ch = 0; ch < chain_index; ch++) {
 		__collate_chain_pri_table[ch].prim =
@@ -167,10 +168,10 @@
 		   sizeof(*__collate_chain_pri_table), chain_index, fp) !=
 		   (size_t)chain_index)
 		err(EX_IOERR,
-		"IO error writting chain table to destination file %s",
+		"I/O error writing chain table to destination file %s",
 		    out_file);
 	if (fclose(fp) != 0)
-		err(EX_IOERR, "IO error closing destination file %s",
+		err(EX_IOERR, "I/O error closing destination file %s",
 		    out_file);
 	exit(EX_OK);
 }


Property changes on: trunk/usr.bin/colldef/parse.y
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.bin/colldef/scan.l
===================================================================
--- trunk/usr.bin/colldef/scan.l	2018-07-07 23:18:59 UTC (rev 11571)
+++ trunk/usr.bin/colldef/scan.l	2018-07-07 23:19:23 UTC (rev 11572)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 %x string name charmap defn nchar subs subs2
 %{
 /*-
@@ -28,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/usr.bin/colldef/scan.l 175038 2008-01-01 10:04:10Z imp $");
 
 #include <sys/types.h>
 #include <ctype.h>


Property changes on: trunk/usr.bin/colldef/scan.l
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property