From owner-svn-src-head@freebsd.org Fri Nov 20 23:15:07 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 768BCA3347B; Fri, 20 Nov 2015 23:15:07 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2510718BE; Fri, 20 Nov 2015 23:15:07 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAKNF6U2060092; Fri, 20 Nov 2015 23:15:06 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAKNF6oF060090; Fri, 20 Nov 2015 23:15:06 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201511202315.tAKNF6oF060090@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Fri, 20 Nov 2015 23:15:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r291115 - in head/usr.bin: . colldef X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Nov 2015 23:15:07 -0000 Author: bapt Date: Fri Nov 20 23:15:05 2015 New Revision: 291115 URL: https://svnweb.freebsd.org/changeset/base/291115 Log: Reintegrate colldef(1) and mklocale(1) While those tools are not needed anymore they are necessary to build FreeBSD 9 and 10. it does not hurt to keep those tools around until both 9 and 10 branch become EOLed. Modify colldef(1) to build after the change in the collation header, and ensure it does produce the same collation definition it used to generate for 9 and 10 Reported by: Oliver Pinter Added: - copied from r290493, head/usr.bin/colldef/ - copied from r290493, head/usr.bin/mklocale/ Directory Properties: head/usr.bin/colldef/ (props changed) head/usr.bin/mklocale/ (props changed) Modified: head/usr.bin/Makefile head/usr.bin/colldef/parse.y Modified: head/usr.bin/Makefile ============================================================================== --- head/usr.bin/Makefile Fri Nov 20 22:36:41 2015 (r291114) +++ head/usr.bin/Makefile Fri Nov 20 23:15:05 2015 (r291115) @@ -25,6 +25,7 @@ SUBDIR= alias \ cksum \ cmp \ col \ + colldef \ colrm \ column \ comm \ @@ -96,6 +97,7 @@ SUBDIR= alias \ mkdep \ mkfifo \ mkimg \ + mklocale \ mktemp \ mkulzma \ mkuzip \ Modified: head/usr.bin/colldef/parse.y ============================================================================== --- head/usr.bin/colldef/parse.y Sat Nov 7 12:33:30 2015 (r290493) +++ head/usr.bin/colldef/parse.y Fri Nov 20 23:15:05 2015 (r291115) @@ -47,6 +47,24 @@ int yylex(void); static void usage(void); static void collate_print_tables(void); +#undef STR_LEN +#define STR_LEN 10 +#undef TABLE_SIZE +#define TABLE_SIZE 100 +#undef COLLATE_VERSION +#define COLLATE_VERSION "1.0\n" +#undef COLLATE_VERSION_2 +#define COLLATE_VERSION1_2 "1.2\n" + +struct __collate_st_char_pri { + int prim, sec; +}; + +struct __collate_st_chain_pri { + u_char str[STR_LEN]; + int prim, sec; +}; + char map_name[FILENAME_MAX] = "."; char curr_chain[STR_LEN];