[Midnightbsd-cvs] src [11541] trunk/usr.bin/gencat/gencat.c: sync with freebsd.

[laffer1 at midnightbsd.org]

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

Modified Paths:
--------------
    trunk/usr.bin/gencat/Makefile
    trunk/usr.bin/gencat/gencat.1
    trunk/usr.bin/gencat/gencat.c

Property Changed:
----------------
    trunk/usr.bin/gencat/gencat.1

Modified: trunk/usr.bin/gencat/Makefile
===================================================================
--- trunk/usr.bin/gencat/Makefile	2018-07-07 20:37:46 UTC (rev 11540)
+++ trunk/usr.bin/gencat/Makefile	2018-07-07 20:38:03 UTC (rev 11541)
@@ -1,4 +1,5 @@
-# $FreeBSD: src/usr.bin/gencat/Makefile,v 1.9 2005/06/30 11:56:31 johan Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/usr.bin/gencat/Makefile 201386 2010-01-02 10:27:05Z ed $
 
 PROG=	gencat
 

Modified: trunk/usr.bin/gencat/gencat.1
===================================================================
--- trunk/usr.bin/gencat/gencat.1	2018-07-07 20:37:46 UTC (rev 11540)
+++ trunk/usr.bin/gencat/gencat.1	2018-07-07 20:38:03 UTC (rev 11541)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
 .\"	$OpenBSD: gencat.1,v 1.3 1997/06/11 15:39:54 kstailey Exp $
 .\"
 .\" Copyright (c) 1997 Ken Stailey
@@ -24,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/usr.bin/gencat/gencat.1,v 1.12 2005/01/17 07:44:17 ru Exp $
+.\" $FreeBSD: stable/10/usr.bin/gencat/gencat.1 213573 2010-10-08 12:40:16Z uqs $
 .\"
 .Dd June 11, 1997
 .Dt GENCAT 1


Property changes on: trunk/usr.bin/gencat/gencat.1
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.bin/gencat/gencat.c
===================================================================
--- trunk/usr.bin/gencat/gencat.c	2018-07-07 20:37:46 UTC (rev 11540)
+++ trunk/usr.bin/gencat/gencat.c	2018-07-07 20:38:03 UTC (rev 11541)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /* ex:ts=4
  */
 
@@ -65,7 +66,7 @@
 ******************************************************************/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/gencat/gencat.c,v 1.12 2005/02/27 19:37:51 ru Exp $");
+__FBSDID("$FreeBSD: stable/10/usr.bin/gencat/gencat.c 241737 2012-10-19 14:49:42Z ed $");
 
 #define _NLS_PRIVATE
 
@@ -96,7 +97,7 @@
 	LIST_ENTRY(_setT) entries;
 };
 
-LIST_HEAD(sethead, _setT) sethead;
+static LIST_HEAD(sethead, _setT) sethead;
 static struct _setT *curSet;
 
 static char *curline = NULL;
@@ -462,89 +463,6 @@
 	}
 }
 
-void
-MCReadCat(int fd)
-{
-	fd = 0;
-#if 0
-	MCHeaderT mcHead;
-	MCMsgT  mcMsg;
-	MCSetT  mcSet;
-	msgT   *msg;
-	setT   *set;
-	int     i;
-	char   *data;
-
-	/* XXX init sethead? */
-
-	if (read(fd, &mcHead, sizeof(mcHead)) != sizeof(mcHead))
-		CORRUPT();
-	if (strncmp(mcHead.magic, MCMagic, MCMagicLen) != 0)
-		CORRUPT();
-	if (mcHead.majorVer != MCMajorVer)
-		error("unrecognized catalog version");
-	if ((mcHead.flags & MCGetByteOrder()) == 0)
-		error("wrong byte order");
-
-	if (lseek(fd, mcHead.firstSet, SEEK_SET) == -1)
-		CORRUPT();
-
-	for (;;) {
-		if (read(fd, &mcSet, sizeof(mcSet)) != sizeof(mcSet))
-			CORRUPT();
-		if (mcSet.invalid)
-			continue;
-
-		set = xmalloc(sizeof(setT));
-		memset(set, '\0', sizeof(*set));
-		if (cat->first) {
-			cat->last->next = set;
-			set->prev = cat->last;
-			cat->last = set;
-		} else
-			cat->first = cat->last = set;
-
-		set->setId = mcSet.setId;
-
-		/* Get the data */
-		if (mcSet.dataLen) {
-			data = xmalloc(mcSet.dataLen);
-			if (lseek(fd, mcSet.data.off, SEEK_SET) == -1)
-				CORRUPT();
-			if (read(fd, data, mcSet.dataLen) != mcSet.dataLen)
-				CORRUPT();
-			if (lseek(fd, mcSet.u.firstMsg, SEEK_SET) == -1)
-				CORRUPT();
-
-			for (i = 0; i < mcSet.numMsgs; ++i) {
-				if (read(fd, &mcMsg, sizeof(mcMsg)) != sizeof(mcMsg))
-					CORRUPT();
-				if (mcMsg.invalid) {
-					--i;
-					continue;
-				}
-				msg = xmalloc(sizeof(msgT));
-				memset(msg, '\0', sizeof(*msg));
-				if (set->first) {
-					set->last->next = msg;
-					msg->prev = set->last;
-					set->last = msg;
-				} else
-					set->first = set->last = msg;
-
-				msg->msgId = mcMsg.msgId;
-				msg->str = xstrdup((char *) (data + mcMsg.msg.off));
-			}
-			free(data);
-		}
-		if (!mcSet.nextSet)
-			break;
-		if (lseek(fd, mcSet.nextSet, SEEK_SET) == -1)
-			CORRUPT();
-	}
-#endif
-}
-
 /*
  * Write message catalog.
  *