dtdocbook: merge dtinfogen into dtdocbook.

cde/lib/DtSearch/lang.c

@@ -264,18 +264,22 @@ static int	search_wordtree (WORDTREE *wordtree, char *wordstring)
 
 static int euro_mbtowc (wchar_t *pwc, const char *p, const char *s)
 {
-    int len;
+    int len = -1;
 
-    mbtowc (NULL, NULL, 0);
+    if (p < s) goto done;
-    len = mbtowc (pwc, p, 1);
 
-    if (len < 0 && p > s) {
+    if (*p >= 0 && *p <= 0x7F) {
-	mbtowc (NULL, NULL, 0);
+	len = 1;
-	len = mbtowc (pwc, p - 1, 2);
+	*pwc = *p;
+	goto done;
     }
 
-    if (len < 0 || *pwc > 0xFF) *pwc = 0x100;
+    if (p == s) goto done;
 
+    mbtowc (NULL, NULL, 0); len = mbtowc (pwc, p - 1, 2);
+
+done:
+    if (len < 0 || *pwc > 0xFF) *pwc = 0x100;
     return len;
 }
 
@@ -294,25 +298,26 @@ static int euro_readchar (READCFP cofunction, void *cofunction_arg, char *outp,
 {
     int len = 1;
 
-    *pwc = 0;
+    *pwc = *outp = cofunction (cofunction_arg);
 
-    *outp = cofunction (cofunction_arg);
+    if (*pwc >= 0 && *pwc <= 0x7F) goto done;
 
-    if (!(*outp)) goto done;
+    *(outp + len) = cofunction (NULL);
 
-    mbtowc (NULL, NULL, 0);
+    mbtowc (NULL, NULL, 0); if (mbtowc (pwc, outp, ++len) >= 0) goto done;
 
-    if (mbtowc (pwc, outp, 1) >= 0) goto done;
+    *pwc = 0x100;
 
-    *(outp + 1) = cofunction (NULL);
+    for (;;) {
-    mbtowc (NULL, NULL, 0);
+	if (len >= MB_CUR_MAX) break;
-    len = mbtowc (pwc, outp, 2);
 
-    if (len < 0 || *pwc > 0xFF) *pwc = 0x100;
+	*(outp + len) = cofunction (NULL);
 
-    len = 2;
+	mblen (NULL, 0); if (mblen (outp, ++len) >= 0) break;
+    }
 
 done:
+    if (*pwc > 0xFF) *pwc = 0x100;
     return len;
 }
 
@@ -381,7 +386,7 @@ char	*teskey_parser (PARG *parg)
     static long		*offsetp, readcount, candidate_offset;
     static int		is_hiliting;
     static int		add_msgs;
-    static int		len;
+    static int		len, opt_len;
     static wchar_t	wc;
 
     /* If first call for current text block... */
@@ -470,12 +475,13 @@ READ_ANOTHER_WORD:
 	     * Otherwise discard just like non_concord.
 	     */
 	    outp += len;
-	    len = euro_readchar (cofunction, NULL, outp, &wc);
+	    opt_len = euro_readchar (cofunction, NULL, outp, &wc);
-	    readcount += len;
+
+	    if (wc) readcount += opt_len;
 
 	    if ((charmap[wc] & CONCORDABLE) != 0) {
-		outp = euro_wctomb (charmap[wc], outp, len);
+		outp = euro_wctomb (charmap[wc], outp, opt_len);
-		candidate_offset = readcount - len;
+		candidate_offset = readcount - opt_len;
 		tpstate = IN_WORD;
 		continue;
 	    }
@@ -524,12 +530,13 @@ READ_ANOTHER_WORD:
 	    }
 	    /* Must be opt_concord... */
 	    outp += len;
-	    len = euro_readchar (cofunction, NULL, outp, &wc);
+	    opt_len = euro_readchar (cofunction, NULL, outp, &wc);
-	    readcount += len;
+
+	    if (wc) readcount += opt_len;
 
 	    if ((charmap[wc] & CONCORDABLE) != 0) {
 		if (outp < endmaxword) {
-		    outp = euro_wctomb (charmap[wc], outp, len);
+		    outp = euro_wctomb (charmap[wc], outp, opt_len);
 		}
 		else {
 		    tpstate = TOO_LONG;

cde/lib/DtSearch/tiny.c

@@ -0,0 +1,952 @@
+/*
+ * CDE - Common Desktop Environment
+ *
+ * (c) Copyright 1993-2012 The Open Group
+ * (c) Copyright 2012-2022 CDE Project contributors, see
+ * CONTRIBUTORS for details
+ *
+ * These libraries and programs are free software; you can
+ * redistribute them and/or modify them under the terms of the GNU
+ * Lesser General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * These libraries and programs are distributed in the hope that
+ * they will be useful, but WITHOUT ANY WARRANTY; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with these libraries and programs; if not, write
+ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
+ * Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <stdio.h>
+#include "vista.h"
+#include "dbtype.h"
+#include "dbswab.h"
+
+#ifndef BASE_FILE_NAME
+#define BASE_FILE_NAME "tiny"
+#endif
+
+#define DBD_MAP_SIZE 8
+
+#define PAGE_SIZE		4096
+#define FILE_TABLE_SIZE		10
+#define RECORD_TABLE_SIZE	8
+#define FIELD_TABLE_SIZE	49
+#define SET_TABLE_SIZE		3
+#define MEMBER_TABLE_SIZE	3
+#define SORT_TABLE_SIZE		0
+#define KEY_TABLE_SIZE		0
+
+int main(void) {
+    fwrite(dbd_VERSION, DBD_COMPAT_LEN, 1, stdout);
+
+    INT dbd_map[DBD_MAP_SIZE] = {
+	PAGE_SIZE,
+	FILE_TABLE_SIZE,
+	RECORD_TABLE_SIZE,
+	FIELD_TABLE_SIZE,
+	SET_TABLE_SIZE,
+	MEMBER_TABLE_SIZE,
+	SORT_TABLE_SIZE,
+	KEY_TABLE_SIZE
+    };
+
+    for (int i = 0; i < DBD_MAP_SIZE; ++i) HTONS(dbd_map[i]);
+
+    fwrite(dbd_map, sizeof(INT), DBD_MAP_SIZE, stdout);
+
+    FILE_ENTRY file_entry[FILE_TABLE_SIZE] = {
+	{
+	    .ft_desc	= 0,
+	    .ft_status	= CLOSED,
+	    .ft_type	= DATA,
+	    .ft_slots	= 0x20,
+	    .ft_slsize	= 0x7E,
+	    .ft_pgsize	= 0x1000,
+	    .ft_flags	= 0
+	},
+	{
+	    .ft_desc	= 0,
+	    .ft_status	= CLOSED,
+	    .ft_type	= DATA,
+	    .ft_slots	= 0x8,
+	    .ft_slsize	= 0xFE,
+	    .ft_pgsize	= 0x800,
+	    .ft_flags	= 0
+	},
+	{
+	    .ft_desc	= 0,
+	    .ft_status	= CLOSED,
+	    .ft_type	= DATA,
+	    .ft_slots	= 0x3C,
+	    .ft_slsize	= 0x22,
+	    .ft_pgsize	= 0x800,
+	    .ft_flags	= 0
+	},
+	{
+	    .ft_desc	= 0,
+	    .ft_status	= CLOSED,
+	    .ft_type	= DATA,
+	    .ft_slots	= 0x23,
+	    .ft_slsize	= 0x3A,
+	    .ft_pgsize	= 0x800,
+	    .ft_flags	= 0
+	},
+	{
+	    .ft_desc	= 0,
+	    .ft_status	= CLOSED,
+	    .ft_type	= DATA,
+	    .ft_slots	= 0x6,
+	    .ft_slsize	= 0x9A,
+	    .ft_pgsize	= 0x400,
+	    .ft_flags	= 0
+	},
+	{
+	    .ft_desc	= 0,
+	    .ft_status	= CLOSED,
+	    .ft_type	= KEY,
+	    .ft_slots	= 0x30,
+	    .ft_slsize	= 0x2A,
+	    .ft_pgsize	= 0x800,
+	    .ft_flags	= 0
+	},
+	{
+	    .ft_desc	= 0,
+	    .ft_status	= CLOSED,
+	    .ft_type	= KEY,
+	    .ft_slots	= 0x11,
+	    .ft_slsize	= 0x74,
+	    .ft_pgsize	= 0x800,
+	    .ft_flags	= 0
+	},
+	{
+	    .ft_desc	= 0,
+	    .ft_status	= CLOSED,
+	    .ft_type	= KEY,
+	    .ft_slots	= 0x4E,
+	    .ft_slsize	= 0x1A,
+	    .ft_pgsize	= 0x800,
+	    .ft_flags	= 0
+	},
+	{
+	    .ft_desc	= 0,
+	    .ft_status	= CLOSED,
+	    .ft_type	= KEY,
+	    .ft_slots	= 0x28,
+	    .ft_slsize	= 0x32,
+	    .ft_pgsize	= 0x800,
+	    .ft_flags	= 0
+	},
+	{
+	    .ft_desc	= 0,
+	    .ft_status	= CLOSED,
+	    .ft_type	= KEY,
+	    .ft_slots	= 0x7,
+	    .ft_slsize	= 0x90,
+	    .ft_pgsize	= 0x400,
+	    .ft_flags	= 0
+	}
+    };
+
+    snprintf(file_entry[0].ft_name, FILENMLEN, "%s.d00", BASE_FILE_NAME);
+    snprintf(file_entry[1].ft_name, FILENMLEN, "%s.d01", BASE_FILE_NAME);
+    snprintf(file_entry[2].ft_name, FILENMLEN, "%s.d21", BASE_FILE_NAME);
+    snprintf(file_entry[3].ft_name, FILENMLEN, "%s.d22", BASE_FILE_NAME);
+    snprintf(file_entry[4].ft_name, FILENMLEN, "%s.d23", BASE_FILE_NAME);
+    snprintf(file_entry[5].ft_name, FILENMLEN, "%s.k00", BASE_FILE_NAME);
+    snprintf(file_entry[6].ft_name, FILENMLEN, "%s.k01", BASE_FILE_NAME);
+    snprintf(file_entry[7].ft_name, FILENMLEN, "%s.k21", BASE_FILE_NAME);
+    snprintf(file_entry[8].ft_name, FILENMLEN, "%s.k22", BASE_FILE_NAME);
+    snprintf(file_entry[9].ft_name, FILENMLEN, "%s.k23", BASE_FILE_NAME);
+
+    for (int i = 0; i < FILE_TABLE_SIZE; ++i) {
+	FILE_ENTRY *p = &file_entry[i];
+
+	HTONS(p->ft_desc);
+	HTONS(p->ft_slots);
+	HTONS(p->ft_slsize);
+	HTONS(p->ft_pgsize);
+	HTONS(p->ft_flags);
+    }
+
+    fwrite(file_entry, sizeof(FILE_ENTRY), FILE_TABLE_SIZE, stdout);
+
+    RECORD_ENTRY record_entry[RECORD_TABLE_SIZE] = {
+	{
+	    .rt_file	= 0,
+	    .rt_len	= 0x7E,
+	    .rt_data	= 0x12,
+	    .rt_fields	= 0,
+	    .rt_fdtot	= 0x13,
+	    .rt_flags	= 0
+	},
+	{
+	    .rt_file	= 0,
+	    .rt_len	= 0x7E,
+	    .rt_data	= 0x12,
+	    .rt_fields	= 0x13,
+	    .rt_fdtot	= 0x2,
+	    .rt_flags	= 0
+	},
+	{
+	    .rt_file	= 0,
+	    .rt_len	= 0x7E,
+	    .rt_data	= 0x1E,
+	    .rt_fields	= 0x15,
+	    .rt_fdtot	= 0xC,
+	    .rt_flags	= 0
+	},
+	{
+	    .rt_file	= 0,
+	    .rt_len	= 0x7E,
+	    .rt_data	= 0x13,
+	    .rt_fields	= 0x21,
+	    .rt_fdtot	= 0x2,
+	    .rt_flags	= 0
+	},
+	{
+	    .rt_file	= 0x1,
+	    .rt_len	= 0xFE,
+	    .rt_data	= 0x12,
+	    .rt_fields	= 0x23,
+	    .rt_fdtot	= 0x2,
+	    .rt_flags	= 0
+	},
+	{
+	    .rt_file	= 0x2,
+	    .rt_len	= 0x22,
+	    .rt_data	= 0x6,
+	    .rt_fields	= 0x25,
+	    .rt_fdtot	= 0x4,
+	    .rt_flags	= 0
+	},
+	{
+	    .rt_file	= 0x3,
+	    .rt_len	= 0x3A,
+	    .rt_data	= 0x6,
+	    .rt_fields	= 0x29,
+	    .rt_fdtot	= 0x4,
+	    .rt_flags	= 0
+	},
+	{
+	    .rt_file	= 0x4,
+	    .rt_len	= 0x9A,
+	    .rt_data	= 0x6,
+	    .rt_fields	= 0x2D,
+	    .rt_fdtot	= 0x4,
+	    .rt_flags	= 0
+	}
+    };
+
+    for (int i = 0; i < RECORD_TABLE_SIZE; ++i) {
+	RECORD_ENTRY *p = &record_entry[i];
+
+	HTONS(p->rt_file);
+	HTONS(p->rt_len);
+	HTONS(p->rt_data);
+	HTONS(p->rt_fields);
+	HTONS(p->rt_fdtot);
+	HTONS(p->rt_flags);
+    }
+
+    fwrite(record_entry, sizeof(RECORD_ENTRY), RECORD_TABLE_SIZE, stdout);
+
+    FIELD_ENTRY field_entry[FIELD_TABLE_SIZE] = {
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= LONGINT,
+	    .fd_len	= 0x4,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x12,
+	    .fd_rec	= 0,
+	    .fd_flags	= 0x4
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= LONGINT,
+	    .fd_len	= 0x4,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x16,
+	    .fd_rec	= 0,
+	    .fd_flags	= 0x4
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= LONGINT,
+	    .fd_len	= 0x4,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x1A,
+	    .fd_rec	= 0,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= LONGINT,
+	    .fd_len	= 0x4,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x1E,
+	    .fd_rec	= 0,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= LONGINT,
+	    .fd_len	= 0x4,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x22,
+	    .fd_rec	= 0,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= LONGINT,
+	    .fd_len	= 0x4,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x26,
+	    .fd_rec	= 0,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= LONGINT,
+	    .fd_len	= 0x4,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x2A,
+	    .fd_rec	= 0,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= LONGINT,
+	    .fd_len	= 0x4,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x2E,
+	    .fd_rec	= 0,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= CHARACTER,
+	    .fd_len	= 0x8,
+	    .fd_dim	= {0x8, 0, 0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x32,
+	    .fd_rec	= 0,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= CHARACTER,
+	    .fd_len	= 0x32,
+	    .fd_dim	= {0x32, 0, 0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x3A,
+	    .fd_rec	= 0,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= SHORTINT,
+	    .fd_len	= 0x2,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x6C,
+	    .fd_rec	= 0,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= SHORTINT,
+	    .fd_len	= 0x2,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x6E,
+	    .fd_rec	= 0,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= SHORTINT,
+	    .fd_len	= 0x2,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x70,
+	    .fd_rec	= 0,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= SHORTINT,
+	    .fd_len	= 0x2,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x72,
+	    .fd_rec	= 0,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= SHORTINT,
+	    .fd_len	= 0x2,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x74,
+	    .fd_rec	= 0,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= SHORTINT,
+	    .fd_len	= 0x2,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x76,
+	    .fd_rec	= 0,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= SHORTINT,
+	    .fd_len	= 0x2,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x78,
+	    .fd_rec	= 0,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= SHORTINT,
+	    .fd_len	= 0x2,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x7A,
+	    .fd_rec	= 0,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= SHORTINT,
+	    .fd_len	= 0x2,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x7C,
+	    .fd_rec	= 0,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= SHORTINT,
+	    .fd_len	= 0x2,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x12,
+	    .fd_rec	= 0x1,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= CHARACTER,
+	    .fd_len	= 0x6A,
+	    .fd_dim	= {0x1, 0x6A, 0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x14,
+	    .fd_rec	= 0x1,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= LONGINT,
+	    .fd_len	= 0x4,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x1E,
+	    .fd_rec	= 0x2,
+	    .fd_flags	= 0x4
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= LONGINT,
+	    .fd_len	= 0x4,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x22,
+	    .fd_rec	= 0x2,
+	    .fd_flags	= 0x4
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= LONGINT,
+	    .fd_len	= 0x4,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x26,
+	    .fd_rec	= 0x2,
+	    .fd_flags	= 0x0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= LONGINT,
+	    .fd_len	= 0x4,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x2A,
+	    .fd_rec	= 0x2,
+	    .fd_flags	= 0x0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= LONGINT,
+	    .fd_len	= 0x4,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x2E,
+	    .fd_rec	= 0x2,
+	    .fd_flags	= 0x0
+	},
+	{
+	    .fd_key	= UNIQUE,
+	    .fd_type	= CHARACTER,
+	    .fd_len	= 0x20,
+	    .fd_dim	= {0x20, 0, 0},
+	    .fd_keyfile	= 0x5,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x32,
+	    .fd_rec	= 0x2,
+	    .fd_flags	= 0x0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= CHARACTER,
+	    .fd_len	= 0x22,
+	    .fd_dim	= {0x22, 0, 0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x52,
+	    .fd_rec	= 0x2,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= SHORTINT,
+	    .fd_len	= 0x2,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x74,
+	    .fd_rec	= 0x2,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= SHORTINT,
+	    .fd_len	= 0x2,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x76,
+	    .fd_rec	= 0x2,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= SHORTINT,
+	    .fd_len	= 0x2,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x78,
+	    .fd_rec	= 0x2,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= SHORTINT,
+	    .fd_len	= 0x2,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x7A,
+	    .fd_rec	= 0x2,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= SHORTINT,
+	    .fd_len	= 0x2,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x7C,
+	    .fd_rec	= 0x2,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= SHORTINT,
+	    .fd_len	= 0x2,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x13,
+	    .fd_rec	= 0x3,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= DUPLICATES,
+	    .fd_type	= CHARACTER,
+	    .fd_len	= 0x69,
+	    .fd_dim	= {0x1, 0x69, 0},
+	    .fd_keyfile	= 0x6,
+	    .fd_keyno	= 0x1,
+	    .fd_ptr	= 0x15,
+	    .fd_rec	= 0x3,
+	    .fd_flags	= 0x400
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= SHORTINT,
+	    .fd_len	= 0x2,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x12,
+	    .fd_rec	= 0x4,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= CHARACTER,
+	    .fd_len	= 0xEA,
+	    .fd_dim	= {0xEA, 0x1, 0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x14,
+	    .fd_rec	= 0x4,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= UNIQUE,
+	    .fd_type	= CHARACTER,
+	    .fd_len	= 0x10,
+	    .fd_dim	= {0x10, 0, 0},
+	    .fd_keyfile	= 0x7,
+	    .fd_keyno	= 0x2,
+	    .fd_ptr	= 0x6,
+	    .fd_rec	= 0x5,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= LONGINT,
+	    .fd_len	= 0x4,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x16,
+	    .fd_rec	= 0x5,
+	    .fd_flags	= 0x0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= LONGINT,
+	    .fd_len	= 0x4,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x1A,
+	    .fd_rec	= 0x5,
+	    .fd_flags	= 0x0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= LONGINT,
+	    .fd_len	= 0x4,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x1E,
+	    .fd_rec	= 0x5,
+	    .fd_flags	= 0x0
+	},
+	{
+	    .fd_key	= UNIQUE,
+	    .fd_type	= CHARACTER,
+	    .fd_len	= 0x28,
+	    .fd_dim	= {0x28, 0, 0},
+	    .fd_keyfile	= 0x8,
+	    .fd_keyno	= 0x3,
+	    .fd_ptr	= 0x6,
+	    .fd_rec	= 0x6,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= LONGINT,
+	    .fd_len	= 0x4,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x2E,
+	    .fd_rec	= 0x6,
+	    .fd_flags	= 0x0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= LONGINT,
+	    .fd_len	= 0x4,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x32,
+	    .fd_rec	= 0x6,
+	    .fd_flags	= 0x0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= LONGINT,
+	    .fd_len	= 0x4,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x36,
+	    .fd_rec	= 0x6,
+	    .fd_flags	= 0x0
+	},
+	{
+	    .fd_key	= UNIQUE,
+	    .fd_type	= CHARACTER,
+	    .fd_len	= 0x86,
+	    .fd_dim	= {0x86, 0, 0},
+	    .fd_keyfile	= 0x9,
+	    .fd_keyno	= 0x4,
+	    .fd_ptr	= 0x6,
+	    .fd_rec	= 0x7,
+	    .fd_flags	= 0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= LONGINT,
+	    .fd_len	= 0x4,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x8E,
+	    .fd_rec	= 0x7,
+	    .fd_flags	= 0x0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= LONGINT,
+	    .fd_len	= 0x4,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x92,
+	    .fd_rec	= 0x7,
+	    .fd_flags	= 0x0
+	},
+	{
+	    .fd_key	= NOKEY,
+	    .fd_type	= LONGINT,
+	    .fd_len	= 0x4,
+	    .fd_dim	= {0},
+	    .fd_keyfile	= 0,
+	    .fd_keyno	= 0,
+	    .fd_ptr	= 0x96,
+	    .fd_rec	= 0x7,
+	    .fd_flags	= 0x0
+	}
+    };
+
+    for (int i = 0; i < FIELD_TABLE_SIZE; ++i) {
+	FIELD_ENTRY *p = &field_entry[i];
+
+	HTONS(p->fd_len);
+	HTONS(p->fd_keyfile);
+	HTONS(p->fd_keyno);
+	HTONS(p->fd_ptr);
+	HTONS(p->fd_rec);
+	HTONS(p->fd_flags);
+
+	for (int j = 0; j < MAXDIMS; ++j) HTONS(p->fd_dim[j]);
+    }
+
+    fwrite(field_entry, sizeof(FIELD_ENTRY), FIELD_TABLE_SIZE, stdout);
+
+    SET_ENTRY set_entry[SET_TABLE_SIZE] = {
+	{
+	    .st_order	= LAST,
+	    .st_own_rt	= 0,
+	    .st_own_ptr	= 0x6,
+	    .st_members	= 0,
+	    .st_memtot	= 0x1,
+	    .st_flags	= 0
+	},
+	{
+	    .st_order	= LAST,
+	    .st_own_rt	= 0x2,
+	    .st_own_ptr	= 0x6,
+	    .st_members	= 0x1,
+	    .st_memtot	= 0x1,
+	    .st_flags	= 0
+	},
+	{
+	    .st_order	= LAST,
+	    .st_own_rt	= 0x2,
+	    .st_own_ptr	= 0x12,
+	    .st_members	= 0x2,
+	    .st_memtot	= 0x1,
+	    .st_flags	= 0
+	}
+    };
+
+    for (int i = 0; i < SET_TABLE_SIZE; ++i) {
+	SET_ENTRY *p = &set_entry[i];
+
+	HTONS(p->st_order);
+	HTONS(p->st_own_rt);
+	HTONS(p->st_own_ptr);
+	HTONS(p->st_members);
+	HTONS(p->st_memtot);
+	HTONS(p->st_flags);
+    }
+
+    fwrite(set_entry, sizeof(SET_ENTRY), SET_TABLE_SIZE, stdout);
+
+    MEMBER_ENTRY member_entry[MEMBER_TABLE_SIZE] = {
+	{
+	    .mt_record		= 0x1,
+	    .mt_mem_ptr		= 0x6,
+	    .mt_sort_fld	= 0,
+	    .mt_totsf		= 0
+	},
+	{
+	    .mt_record		= 0x4,
+	    .mt_mem_ptr		= 0x6,
+	    .mt_sort_fld	= 0,
+	    .mt_totsf		= 0
+	},
+	{
+	    .mt_record		= 0x3,
+	    .mt_mem_ptr		= 0x7,
+	    .mt_sort_fld	= 0,
+	    .mt_totsf		= 0
+	}
+    };
+
+    for (int i = 0; i < MEMBER_TABLE_SIZE; ++i) {
+	MEMBER_ENTRY *p = &member_entry[i];
+
+	HTONS(p->mt_record);
+	HTONS(p->mt_mem_ptr);
+	HTONS(p->mt_sort_fld);
+	HTONS(p->mt_totsf);
+    }
+
+    fwrite(member_entry, sizeof(MEMBER_ENTRY), MEMBER_TABLE_SIZE, stdout);
+
+    fprintf(stdout,
+	"OR_DBREC\n"
+	"OR_DBMISCREC\n"
+	"OR_OBJREC\n"
+	"OR_MISCREC\n"
+	"OR_BLOBREC\n"
+	"OR_SWORDREC\n"
+	"OR_LWORDREC\n"
+	"OR_HWORDREC\n"
+	"OR_DBFLAGS\n"
+	"OR_DBUFLAGS\n"
+	"OR_RECCOUNT\n"
+	"OR_MAXDBA\n"
+	"OR_AVAILD99\n"
+	"OR_UNAVAILD99\n"
+	"OR_HUFID\n"
+	"OR_DBSECMASK\n"
+	"OR_VERSION\n"
+	"OR_DBFILL\n"
+	"OR_DBOTYPE\n"
+	"OR_COMPFLAGS\n"
+	"OR_DBACCESS\n"
+	"OR_MINWORDSZ\n"
+	"OR_MAXWORDSZ\n"
+	"OR_RECSLOTS\n"
+	"OR_FZKEYSZ\n"
+	"OR_ABSTRSZ\n"
+	"OR_LANGUAGE\n"
+	"OR_DBMISCTYPE\n"
+	"OR_DBMISC\n"
+	"OR_OBJFLAGS\n"
+	"OR_OBJUFLAGS\n"
+	"OR_OBJSIZE\n"
+	"OR_OBJDATE\n"
+	"OR_OBJSECMASK\n"
+	"OR_OBJKEY\n"
+	"OR_OBJFILL\n"
+	"OR_OBJACCESS\n"
+	"OR_OBJTYPE\n"
+	"OR_OBJCOST\n"
+	"OR_OBJHDROFFSET\n"
+	"OR_OBJEUREKA\n"
+	"OR_MISCTYPE\n"
+	"OR_MISC\n"
+	"OR_BLOBLEN\n"
+	"OR_BLOB\n"
+	"OR_SWORDKEY\n"
+	"OR_SWOFFSET\n"
+	"OR_SWFREE\n"
+	"OR_SWADDRS\n"
+	"OR_LWORDKEY\n"
+	"OR_LWOFFSET\n"
+	"OR_LWFREE\n"
+	"OR_LWADDRS\n"
+	"OR_HWORDKEY\n"
+	"OR_HWOFFSET\n"
+	"OR_HWFREE\n"
+	"OR_HWADDRS\n"
+	"OR_DB_MISCS\n"
+	"OR_OBJ_BLOBS\n"
+	"OR_OBJ_MISCS\n");
+
+    return 0;
+}

cde/programs/dtdocbook/Makefile.am

@@ -1,7 +1,14 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-SUBDIRS = instant locales sgml tcl tpt
+SUBDIRS = doc_utils dtsr instant locales sgml spec tcl tpt
 
 include dtdocbook.am
 
 bin_SCRIPTS = dtdocbook2man dtdocbook2sdl
+bin_PROGRAMS = dtdocbook2infolib
+
+AM_LDFLAGS = $(XTOOLLIB) $(DTCLIENTLIBS)
+
+dtdocbook2infolib_CPPFLAGS = \
+			     -DDTDCBK_DATAROOTDIR=\"$(dtdcbk_datarootdir)\" \
+			     -DINFOLIB_LIBEXECDIR=\"$(PWD)\"

cde/programs/dtdocbook/doc_utils/Makefile.am

@@ -0,0 +1,71 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+include ../dtdocbook.am
+
+infolib = ../infolib
+
+SUBDIRS = $(infolib) ../dtsr
+
+noinst_PROGRAMS = \
+		  dtdocbook2infolib \
+		  MixedGen \
+		  NCFGen \
+		  NodeParser \
+		  StyleUpdate \
+		  dbdrv \
+		  valBase \
+		  validator
+
+noinst_SCRIPTS = dtdocbook2man dtdocbook2sdl
+
+AM_CXXFLAGS = -DCDE_NEXT -I$(top_builddir)/lib/DtMmdb
+AM_LDFLAGS = $(XTOOLLIB) $(LIBMMDB) $(DTCLIENTLIBS)
+
+dtdcbk_datarootdir = $(abs_top_srcdir)/programs/dtdocbook
+
+AM_CPPFLAGS = \
+	      -DDTDCBK_DATAROOTDIR=\"$(dtdcbk_datarootdir)\" \
+	      -DINFOLIB_LIBEXECDIR=\"$(PWD)\"
+
+validator_SOURCES = validator.C
+
+CLEANFILES = $(noinst_SCRIPTS) $(validator_SOURCES) dtdocbook2infolib.c
+
+dtdocbook2infolib.c: ../dtdocbook2infolib.c
+	$(RM) $@ && $(LN_S) $<
+
+validator.C: $(infolib)/validator.C
+	$(RM) $@ && $(LN_S) $<
+
+MixedGen$(EXEEXT): $(infolib)/MixedGen$(EXEEXT)
+	$(RM) $@ && $(LN_S) $<
+
+NCFGen$(EXEEXT): $(infolib)/NCFGen$(EXEEXT)
+	$(RM) $@ && $(LN_S) $<
+
+NodeParser$(EXEEXT): $(infolib)/NodeParser$(EXEEXT)
+	$(RM) $@ && $(LN_S) $<
+
+StyleUpdate$(EXEEXT): $(infolib)/StyleUpdate$(EXEEXT)
+	$(RM) $@ && $(LN_S) $<
+
+dbdrv$(EXEEXT): $(infolib)/dbdrv$(EXEEXT)
+	$(RM) $@ && $(LN_S) $<
+
+valBase$(EXEEXT): $(infolib)/valBase$(EXEEXT)
+	$(RM) $@ && $(LN_S) $<
+
+dtdocbook2man: ../dtdocbook2man
+	echo "#!/bin/sh" > $@ && chmod +x $@
+	echo "dtdcbk_libexecdir=$(dtdcbk_datarootdir) \
+		dtdcbk_datarootdir=$(dtdcbk_datarootdir) \
+		sh $(PWD)/$< \$$@" >> $@
+
+dtdocbook2sdl: ../dtdocbook2sdl
+	echo "#!$(KSH)" > $@ && chmod +x $@
+	echo "dtdcbk_libdir=$(dtdcbk_datarootdir) \
+		dtdcbk_libexecdir=$(dtdcbk_datarootdir) \
+		dtdcbk_datarootdir=$(dtdcbk_datarootdir) \
+		$(KSH) $(PWD)/$< \$$@" >> $@
+
+install:

cde/programs/dtdocbook/dtdocbook2infolib.c

@@ -78,28 +78,16 @@ typedef enum
 typedef struct _GlobalsStruct
 {
     char *pathEnv;
-    char *ldLibraryPathEnv;
-    char *libPathEnv;
-    char *shlibPathEnv;
-    char *dtInfoHomeEnv;
-    char *dtInfoBinEnv;
-    char *tmpDirEnv;
-    char *sgmlSearchPathEnv;
-    char *sgmlCatFilesEnv;
     char *sgmlCatFiles;
     int sgmlCatFilesLen;
     int sgmlCatFilesMaxLen;
-    char *mmdbPathEnv;
 
-    char *install;
+    int dtsridx;      /* dtsearch: index into langtbl */
-    char *arch;
-    int   dtsridx;      /* dtsearch: index into langtbl */
     char *sgml;
     char *decl;
     char *styleProlog;
     char *tmpDir;
     char *spec;
-    int dirMode;
     char *searchEngine;
     char *parser;
 
@@ -156,7 +144,7 @@ static char *emptyString = "";
 
 #define STR(s) ((s) ? (s) : emptyString)
 
-#define EXEC_NAME "dtinfogen"
+#define EXEC_NAME "dtdocbook2infolib"
 
 typedef struct
 {
@@ -950,11 +938,10 @@ buildPath(char *format, ...)
     return XtsNewString(pathBuf);
 }
 
-/* Assumes gStruct->install is set (may be NULL) */
 static char *
 buildSGML(void)
 {
-    char *sgmlPath = buildPath("%s/infolib/sgml", STR(gStruct->install));
+    char *sgmlPath = buildPath("%s/sgml", STR(DTDCBK_DATAROOTDIR));
 
 #ifdef SGML_DEBUG
     fprintf(stderr, "(DEBUG) buildSGML=\"%s\"\n", sgmlPath);
@@ -977,12 +964,10 @@ buildStyleProlog(void)
     return buildPath("%s/styprolog.sgml", STR(gStruct->sgml));
 }
 
-/* Assumes gStruct->install is set (may be NULL) */
 static char *
 buildSpec(void)
 {
-    return buildPath("%s/infolib/etc/mmdb.infolib.spec",
+    return buildPath("%s/spec/mmdb.infolib.spec", STR(DTDCBK_DATAROOTDIR));
-		     STR(gStruct->install));
 }
 
 static void
@@ -997,21 +982,10 @@ defaultGlobals(void)
 	putenv("ENV=");
 
     gStruct->pathEnv = makeAbsPathEnv("PATH");
-    gStruct->ldLibraryPathEnv = makeAbsPathEnv("LD_LIBRARY_PATH");
-    gStruct->libPathEnv = makeAbsPathEnv("LIBPATH");
-    gStruct->shlibPathEnv = makeAbsPathEnv("SHLIB_PATH");
-    gStruct->dtInfoHomeEnv = makeAbsPathEnv("DTINFO_HOME");
-    gStruct->dtInfoBinEnv = makeAbsPathEnv("DTINFO_BIN");
-    gStruct->tmpDirEnv = makeAbsPathEnv("TMPDIR");
-    gStruct->sgmlSearchPathEnv = makeAbsPathEnv("SGML_SEARCH_PATH");
-    gStruct->sgmlCatFilesEnv = makeAbsPathEnv("SGML_CATALOG_FILES");
     gStruct->sgmlCatFiles = NULL;
     gStruct->sgmlCatFilesLen = 0;
     gStruct->sgmlCatFilesMaxLen = 0;
 
-    gStruct->install = getenv("DTINFO_HOME");
-    gStruct->arch = getenv("ARCH");
-
     { /* resolve lang from env variable */
       char* lang;
       char *s = NULL;
@@ -1025,7 +999,7 @@ defaultGlobals(void)
 	  if ((lang = getenv("LANG")) == NULL)
 	    lang = LANG_COMMON;
 
-      lang = strdup(lang);
+      lang = XtsNewString(lang);
 
       s = strchr(lang, '.'); if (s) *s = 0;
 
@@ -1062,11 +1036,10 @@ defaultGlobals(void)
     gStruct->styleProlog = buildStyleProlog();
 
     if ((gStruct->tmpDir = getenv("TMPDIR")) == (char *)NULL)
-	gStruct->tmpDir = "/usr/tmp";
+	gStruct->tmpDir = "/tmp";
 
     gStruct->spec = buildSpec();
 
-    gStruct->dirMode = 0775;
     gStruct->searchEngine = "dtsearch";
     gStruct->parser = "onsgmls";
     gStruct->keepWorkDir = false;
@@ -1078,19 +1051,6 @@ defaultGlobals(void)
 static void
 checkGlobals(void)
 {
-    if ((!gStruct->install) || (!checkStat(gStruct->install, FSTAT_IS_DIR)))
-	die(-1, "%s: Cannot find DtInfo Toolkit installation directory.\n"
-		"\n"
-		"The DTINFO_HOME variable must be set to the directory "
-		"where the DtInfo\n"
-		"toolkit is installed.\n"
-		"\n"
-		"You probably invoked this script in an unsupported manner.\n",
-	    EXEC_NAME);
-
-    if (!gStruct->arch)
-	die(-1, "%s: ARCH not set\n", EXEC_NAME);
-
     if (!checkStat(gStruct->sgml, FSTAT_IS_DIR))
 	die(-1, "%s: Can't find DtInfo SGML directory (%s): %s\n",
 	    EXEC_NAME, STR(gStruct->sgml), strerror(errno));
@@ -1120,20 +1080,18 @@ checkGlobals(void)
 	checkExec("dtsrload");
 	checkExec("dtsrindex");
 
-	gStruct->dtsrlib = buildPath("%s/infolib/etc/%s/dtsr",
+	gStruct->dtsrlib = buildPath("%s/dtsr", STR(DTDCBK_DATAROOTDIR),
-				     gStruct->install,
 				     STR(langtbl[gStruct->dtsridx].name));
 
 	if (!checkStat(gStruct->dtsrlib, FSTAT_IS_DIR)) {
 	    free(gStruct->dtsrlib);
-	    gStruct->dtsrlib = buildPath("%s/infolib/etc/%s/dtsr",
+	    gStruct->dtsrlib = buildPath("%s/dtsr", STR(DTDCBK_DATAROOTDIR),
-					gStruct->install, LANG_COMMON);
+					LANG_COMMON);
 	}
 #ifdef DTSR_DEBUG
 	fprintf(stderr, "(DEBUG) gStruct->dtsrlib=\"%s\"\n", gStruct->dtsrlib);
 #endif
-	gStruct->dbdfile = buildPath("%s/infolib/etc/dtsr/%s.dbd",
+	gStruct->dbdfile = buildPath("%s/dtsr/%s.dbd", STR(DTDCBK_DATAROOTDIR),
-				     gStruct->install,
 				     gStruct->searchEngine);
 	gStruct->keytypes = "Default Head Graphics Example Index Table";
     }
@@ -1311,6 +1269,7 @@ parseDocument(int runCmd, ...)
     va_list ap;
     char *ptr;
     char *cmd = (char *)NULL;
+    char *sed = " | sed 's/\\&\\&/\\&/g' | sed 's/\\&</</g'";
     int cmdLen = 0;
     int maxLen = 0;
 
@@ -1318,11 +1277,7 @@ parseDocument(int runCmd, ...)
 	dieRWD(-1, "%s: faulty installation: %s\n",
 	       EXEC_NAME, strerror(errno));
 
-    addCatFile(buildPath("%s/infolib/sgml/catalog",
+    addCatFile(buildPath("%s/catalog", STR(gStruct->sgml)), true);
-			 STR(gStruct->install)), true);
-
-    if (!gStruct->sgmlSearchPathEnv)
-	gStruct->sgmlSearchPathEnv = addToEnv("SGML_SEARCH_PATH", ".", false);
 
     appendStr(&cmd, &cmdLen, &maxLen, gStruct->parser);
     appendStr(&cmd, &cmdLen, &maxLen, " ");
@@ -1340,6 +1295,8 @@ parseDocument(int runCmd, ...)
 	}
 	va_end(ap);
 
+	appendStr(&cmd, &cmdLen, &maxLen, sed);
+
 	runShellCmd(cmd);
 	free(cmd);
 	return (char *)NULL;
@@ -1356,6 +1313,8 @@ parseDocument(int runCmd, ...)
     }
     va_end(ap);
 
+    appendStr(&cmd, &cmdLen, &maxLen, sed);
+
     return cmd;
 }
 
@@ -1377,9 +1336,6 @@ buildBookcase(char *cmdSrc, char *dirName)
 
     tmpFile = storeBookCase(cmdSrc, "all", dataBase, dirName);
     newMmdbPathEnv = buildPath("MMDB_PATH=%s", STR(gStruct->library));
-    if (gStruct->mmdbPathEnv)
-	free(gStruct->mmdbPathEnv);
-    gStruct->mmdbPathEnv = newMmdbPathEnv;
     putenv(newMmdbPathEnv);
 
     if (gStruct->verbose)
@@ -2326,6 +2282,9 @@ main(int argc, char *argv[])
 {
     GlobalsStruct globalsStruct;
 
+    if (!addToEnv("PATH", STR(INFOLIB_LIBEXECDIR), true))
+	die(-1, "%s: could not set PATH\n", EXEC_NAME);
+
     gStruct = &globalsStruct;
 
     if (argc < 2)
@@ -2333,6 +2292,9 @@ main(int argc, char *argv[])
 
     defaultGlobals();
 
+    if (setenv("LC_CTYPE", STR(langtbl[gStruct->dtsridx].name), 1) == -1)
+	die(-1, "%s: LC_CTYPE: %s\n", EXEC_NAME, strerror(errno));
+
     if (setenv("SP_CHARSET_FIXED", "1", 1) == -1)
 	die(-1, "%s: SP_CHARSET_FIXED: %s\n", EXEC_NAME, strerror(errno));
 

cde/programs/dtdocbook/dtdocbook2man.in

@@ -40,7 +40,6 @@ exec_prefix="@exec_prefix@"
 
 dcbk_name="@PACKAGE_TARNAME@/dtdocbook"
 
-dtdcbk_libdir="${dtdcbk_libdir:-@libdir@/${dcbk_name}}"
 dtdcbk_libexecdir="${dtdcbk_libexecdir:-@libexecdir@/${dcbk_name}}"
 dtdcbk_datarootdir="${dtdcbk_datarootdir:-@datarootdir@/${dcbk_name}}"
 
@@ -68,7 +67,7 @@ if [ $# -eq 3 ]
 then	dclfile=$1
 	reffile=$2
 	manfile=$3
-else	echo "usage:  dbtoman [-c] dcl-file ref-src-file man-dst-file"
+else	echo "usage:  dtdocbook2man [-c] dcl-file ref-src-file man-dst-file"
 	exit 1
 fi
 

cde/programs/dtdocbook/dtdocbook2sdl.in

@@ -321,8 +321,12 @@ if [[ -a $basename.$$.esis ]] then
     fi
 fi
 if (( $verbose )); then
-    echo "${sgmls} -deglru$catfiles ${sgml_dir}/docbook.dcl $iname > $basename.$$.esis"
+    echo "${sgmls} -deglru$catfiles ${sgml_dir}/docbook.dcl $iname | \
-    ${sgmls} -deglru$catfiles ${sgml_dir}/docbook.dcl $iname > $basename.$$.esis
+	    sed 's/\&\&/\\|\[amp   \]\\|/g' | sed 's/\&</\\|\[lt    \]\\|/g' \
+	    > $basename.$$.esis"
+    ${sgmls} -deglru$catfiles ${sgml_dir}/docbook.dcl $iname | \
+	    sed 's/\&\&/\\|\[amp   \]\\|/g' | sed 's/\&</\\|\[lt    \]\\|/g' \
+	    > $basename.$$.esis
     if (( $? )); then
 	if (( !$debug )); then
 	    echo "rm -f $basename.$$.esis"
@@ -331,8 +335,9 @@ if (( $verbose )); then
 	fatalError "Error processing $iname by $parser"
     fi
 else
-    ${sgmls} -deglru$catfiles ${sgml_dir}/docbook.dcl $iname \
+    ${sgmls} -deglru$catfiles ${sgml_dir}/docbook.dcl $iname | \
-				      > $basename.$$.esis 2> $basename.$$.log
+	    sed 's/\&\&/\\|\[amp   \]\\|/g' | sed 's/\&</\\|\[lt    \]\\|/g' \
+	    > $basename.$$.esis 2> $basename.$$.log
     if (( $? )); then
 	if (( !$debug )); then
 	    rm -f $basename.$$.esis

cde/programs/dtdocbook/dtsr/Makefile.am

@@ -0,0 +1,34 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+include ../dtdocbook.am
+
+dtsrdir = $(dtdocbookdatadir)/dtsr
+
+dtsr_DATA = \
+	    dtsearch.dbd \
+	    deu.sfx \
+	    deu.stp \
+	    eng.sfx \
+	    eng.stp \
+	    esp.sfx \
+	    esp.stp \
+	    fra.sfx \
+	    fra.stp \
+	    ita.sfx \
+	    ita.stp \
+	    jpn.knj
+
+noinst_PROGRAMS = mkdbd
+
+dtsearch = ../../../lib/DtSearch
+
+mkdbd_CPPFLAGS = -DBASE_FILE_NAME=\"dtsearch\"
+mkdbd_CFLAGS = $(DT_INCDIR) -I$(dtsearch)/raima
+
+CLEANFILES = dtsearch.dbd mkdbd.c
+
+mkdbd.c: $(dtsearch)/tiny.c
+	$(RM) $@ && $(LN_S) $< $@
+
+dtsearch.dbd: mkdbd
+	./$< > $@

cde/programs/dtdocbook/dtsr/jpn.knj

@@ -0,0 +1,550 @@
+#
+#   COMPONENT_NAME: austext
+#
+#   FUNCTIONS: none
+#
+#   ORIGINS: 27
+#
+#
+#   (C) COPYRIGHT International Business Machines Corp. 1995
+#   All Rights Reserved
+#   Licensed Materials - Property of IBM
+#   US Government Users Restricted Rights - Use, duplication or
+#   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+#
+#**************** JPN.KNJ *******************
+# $XConsortium: jpn.knj /main/2 1996/07/18 15:31:58 drk $
+# September 1995.
+# Most frequent contiguous strings of 2 or more kanji characters
+# from 32456 USENET (fj group) articles).  The comment is the number
+# of times that particular kanji compound occurred in the corpus.
+# Derived from an original list by Tim Buress from a study
+# for TWICS Co. Ltd. and International Education Center, Tokyo.
+#
+# $Log$
+# Revision 2.2  1995/10/25  22:54:21  miker
+# Added prolog.
+#
+# Revision 2.1  1995/09/22  20:57:48  miker
+# Freeze DtSearch 0.1, AusText 2.1.8
+#
+# Revision 1.1  1995/09/19  21:22:47  miker
+# Initial revision
+#
+場合		* 7840
+問題		* 5745
+記事		* 4636
+日本		* 4627
+情報		* 4291
+自分		* 4197
+必要		* 3827
+意味		* 3573
+最近		* 3331
+議論		* 2922
+質問		* 2799
+投稿		* 2642
+以下		* 2624
+名前		* 2584
+時間		* 2576
+本当		* 2567
+現在		* 2486
+関係		* 2418
+方法		* 2208
+最後		* 2164
+出来		* 2138
+最初		* 2102
+話題		* 2058
+結果		* 2039
+日本語		* 2029
+実際		* 2013
+普通		* 1970
+試合		* 1953
+以上		* 1930
+今回		* 1905
+存在		* 1883
+理由		* 1856
+以前		* 1856
+内容		* 1823
+使用		* 1795
+今年		* 1778
+東京		* 1773
+部分		* 1765
+間違		* 1756
+人間		* 1697
+意見		* 1670
+面白		* 1619
+説明		* 1571
+投票		* 1566
+株式会社	* 1555
+非常		* 1549
+期待		* 1546
+以外		* 1515
+簡単		* 1513
+利用		* 1504
+作成		* 1472
+程度		* 1436
+場所		* 1391
+映画		* 1359
+記憶		* 1351
+設定		* 1345
+結構		* 1329
+参加		* 1319
+状態		* 1312
+表示		* 1305
+番組		* 1302
+文字		* 1293
+可能性		* 1265
+結局		* 1261
+漢字		* 1259
+存知		* 1256
+相手		* 1244
+主張		* 1233
+残念		* 1233
+対応		* 1227
+理解		* 1221
+世界		* 1201
+研究所		* 1191
+今日		* 1186
+当然		* 1177
+状況		* 1163
+東大		* 1152
+可能		* 1130
+変更		* 1118
+子供		* 1110
+予定		* 1088
+紹介		* 1085
+興味		* 1085
+確認		* 1078
+同様		* 1065
+女性		* 1051
+英語		* 1050
+機能		* 1032
+指定		* 1031
+出力		* 0996
+原因		* 0991
+判断		* 0981
+一緒		* 0978
+東工大		* 0977
+注意		* 0974
+作品		* 0964
+定義		* 0961
+変換		* 0945
+無理		* 0933
+数学		* 0923
+京大		* 0902
+表現		* 0900
+友人		* 0896
+電話		* 0889
+値段		* 0880
+疑問		* 0863
+実行		* 0862
+言語		* 0859
+参考		* 0843
+音楽		* 0840
+放送		* 0839
+購入		* 0836
+先日		* 0833
+一度		* 0831
+選手		* 0822
+上記		* 0819
+目的		* 0817
+勝手		* 0817
+会社		* 0816
+十分		* 0812
+今度		* 0811
+交換		* 0811
+一部		* 0808
+大丈夫		* 0804
+条件		* 0803
+一人		* 0803
+完全		* 0797
+経験		* 0795
+納得		* 0790
+基本的		* 0790
+評価		* 0785
+大変		* 0781
+研究室		* 0775
+雑誌		* 0773
+個人的		* 0772
+記述		* 0754
+多分		* 0753
+開発		* 0749
+途中		* 0747
+万円		* 0745
+気持		* 0744
+環境		* 0739
+発表		* 0735
+影響		* 0735
+解釈		* 0734
+重要		* 0733
+中村		* 0731
+引用		* 0725
+日本人		* 0717
+事実		* 0717
+通信		* 0716
+発売		* 0715
+鈴木		* 0708
+報告		* 0706
+動作		* 0703
+自由		* 0703
+指摘		* 0695
+来年		* 0692
+一応		* 0692
+関西		* 0687
+一般		* 0680
+選択		* 0679
+阪大		* 0677
+仕事		* 0675
+研究		* 0671
+太田		* 0665
+予想		* 0660
+結論		* 0659
+認識		* 0658
+構成		* 0656
+去年		* 0650
+入力		* 0644
+全部		* 0643
+感想		* 0643
+大阪		* 0642
+無視		* 0640
+写真		* 0638
+東京大学	* 0634
+反対		* 0633
+一番		* 0628
+便利		* 0627
+処理		* 0626
+計算		* 0625
+駄目		* 0624
+危険		* 0622
+今後		* 0621
+頑張		* 0615
+田中		* 0612
+具体的		* 0612
+責任		* 0607
+昨日		* 0607
+入手		* 0605
+賛成		* 0605
+過去		* 0603
+正確		* 0601
+山本		* 0600
+登場		* 0598
+大学		* 0595
+画面		* 0594
+安全		* 0591
+不思議		* 0589
+中略		* 0581
+差別		* 0576
+管理人		* 0576
+接続		* 0573
+仕方		* 0571
+心配		* 0570
+種類		* 0570
+発生		* 0568
+印象		* 0568
+通常		* 0566
+彼女		* 0565
+同時		* 0565
+形式		* 0564
+失礼		* 0559
+一般的		* 0558
+位置		* 0558
+効果		* 0557
+演奏		* 0556
+対象		* 0554
+違法		* 0553
+連絡		* 0548
+池田		* 0548
+両方		* 0547
+当時		* 0546
+適当		* 0546
+行為		* 0546
+趣味		* 0543
+現状		* 0543
+奥山		* 0541
+新聞		* 0540
+比較		* 0539
+時代		* 0536
+有名		* 0535
+情報工学科	* 0532
+運転		* 0530
+技術		* 0522
+年前		* 0519
+個人		* 0516
+会場		* 0513
+決定		* 0512
+森口博子	* 0509
+提供		* 0508
+予約		* 0505
+事故		* 0504
+想像		* 0502
+絶対		* 0502
+文章		* 0501
+知識		* 0500
+自体		* 0500
+横浜		* 0499
+結婚		* 0498
+伊藤		* 0493
+小方		* 0491
+文字列		* 0490
+他人		* 0490
+何度		* 0490
+発言		* 0486
+西田		* 0484
+中心		* 0483
+時期		* 0483
+優勝		* 0481
+展開		* 0481
+関東		* 0480
+失敗		* 0479
+解説		* 0479
+希望		* 0478
+立場		* 0477
+小林		* 0474
+提案		* 0472
+電通大		* 0469
+最高		* 0467
+佐藤		* 0467
+管理		* 0467
+雰囲気		* 0466
+長谷川		* 0466
+電総研		* 0465
+用意		* 0464
+二人		* 0464
+速度		* 0464
+昨年		* 0462
+井上		* 0461
+複数		* 0460
+自然		* 0459
+関連		* 0459
+操作		* 0457
+全体		* 0456
+神野		* 0454
+酒井法子	* 0454
+何故		* 0454
+工学部		* 0452
+日本電気	* 0451
+誤解		* 0451
+免許		* 0450
+区別		* 0450
+初心者		* 0449
+週間		* 0449
+岡田		* 0449
+元気		* 0448
+部屋		* 0447
+有効		* 0444
+範囲		* 0443
+清水		* 0443
+概念		* 0443
+反応		* 0441
+電子		* 0441
+時点		* 0441
+解決		* 0439
+納豆		* 0436
+情報交換	* 0435
+実現		* 0435
+否定		* 0434
+番号		* 0433
+開発部		* 0433
+本人		* 0432
+根拠		* 0431
+変化		* 0430
+現象		* 0430
+関数		* 0429
+河野		* 0429
+皆様		* 0428
+人気		* 0427
+発音		* 0426
+西村知美	* 0425
+製品		* 0424
+苦労		* 0423
+料理		* 0422
+順位		* 0421
+社会		* 0421
+北海道		* 0418
+反論		* 0418
+東芝		* 0418
+意識		* 0418
+前田		* 0417
+面倒		* 0416
+参照		* 0416
+高橋由美子	* 0414
+仕様		* 0413
+旅行		* 0409
+登録		* 0409
+科学		* 0409
+一方		* 0408
+資料		* 0406
+方向		* 0405
+京都		* 0404
+記録		* 0404
+機会		* 0402
+下記		* 0402
+円滑		* 0402
+手元		* 0401
+海外		* 0400
+省略		* 0398
+競馬		* 0397
+三菱電機	* 0396
+今週		* 0396
+攻撃		* 0396
+価値		* 0396
+月号		* 0393
+不幸		* 0392
+先生		* 0392
+自転車		* 0392
+学生		* 0392
+返事		* 0391
+筑波大		* 0390
+教育		* 0390
+電車		* 0389
+実験		* 0387
+起動		* 0387
+法律		* 0386
+直接		* 0386
+方式		* 0385
+発見		* 0385
+修正		* 0385
+研究部		* 0385
+禁止		* 0385
+辞書		* 0384
+案内		* 0384
+勉強		* 0383
+大井		* 0383
+日立		* 0382
+内線		* 0382
+大阪大学	* 0380
+松下電器	* 0380
+文句		* 0378
+不安		* 0377
+距離		* 0377
+価格		* 0376
+迷惑		* 0373
+是非		* 0373
+能力		* 0370
+数字		* 0370
+平成		* 0369
+標準		* 0369
+本来		* 0368
+自信		* 0368
+筑波大学	* 0365
+相当		* 0365
+移動		* 0365
+開催		* 0364
+漫画		* 0363
+富士通		* 0363
+練習		* 0359
+友達		* 0359
+松下		* 0359
+現実		* 0359
+所属		* 0356
+石田		* 0355
+症状		* 0355
+公開		* 0354
+設計		* 0353
+切符		* 0353
+日文酔夢	* 0352
+合意		* 0352
+要求		* 0351
+本体		* 0350
+復活		* 0350
+駐車場		* 0349
+確実		* 0349
+以降		* 0349
+努力		* 0348
+行動		* 0348
+感動		* 0348
+名古屋		* 0347
+斉藤		* 0346
+機械		* 0345
+列車		* 0344
+特別		* 0344
+前提		* 0344
+研究会		* 0344
+明日		* 0343
+藤本		* 0343
+参加者		* 0343
+気分		* 0343
+態度		* 0342
+活動		* 0342
+木村		* 0341
+全然		* 0341
+感覚		* 0339
+修理		* 0338
+山崎		* 0338
+配布		* 0337
+追加		* 0337
+論文		* 0336
+人達		* 0336
+訂正		* 0335
+自身		* 0335
+事業部		* 0335
+不明		* 0334
+一言		* 0334
+事情		* 0333
+基本		* 0333
+特定		* 0332
+制限		* 0332
+高橋		* 0332
+料金		* 0331
+富士通研究所	* 0331
+転送		* 0330
+早見優		* 0330
+終了		* 0330
+後半		* 0329
+中嶋		* 0328
+男性		* 0328
+国内		* 0328
+先週		* 0327
+機種		* 0327
+富士通研	* 0324
+富士		* 0324
+詳細		* 0324
+構造		* 0324
+午後		* 0324
+確保		* 0323
+近藤		* 0321
+録音		* 0319
+大好		* 0319
+新幹線		* 0319
+世話		* 0318
+信号		* 0318
+収録		* 0318
+職業		* 0316
+小川範子	* 0316
+意図		* 0316
+変数		* 0315
+早稲田大学	* 0315
+岡本		* 0315
+違反		* 0315
+歴史		* 0313
+和田		* 0311
+記号		* 0311
+命令		* 0310
+同感		* 0310
+考慮		* 0310
+京都大学	* 0310
+単純		* 0308
+住所		* 0308
+突然		* 0307
+証明		* 0305
+手引		* 0305
+文化		* 0304
+美味		* 0303
+鉄道		* 0303
+阪神		* 0303
+明確		* 0302
+応援		* 0302
+東京工業大学	* 0301
+前川		* 0301
+女子高生	* 0301
+共通		* 0301
+前回		* 0300
+制御		* 0299
+基準		* 0299
+後者		* 0298
+日時		* 0297
+最大		* 0297
+正常		* 0296
+性格		* 0295
+森高千里	* 0295
+#**************** JPN.KNJ *******************

cde/programs/dtdocbook/infolib/Makefile.am

@@ -0,0 +1,154 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+include ../dtdocbook.am
+
+infolibdir = $(dtdocbooklibexecdir)/infolib
+
+infolib_PROGRAMS = \
+		   MixedGen \
+		   NCFGen \
+		   NodeParser \
+		   StyleUpdate \
+		   dbdrv \
+		   valBase \
+		   validator
+
+infolib_SCRIPTS = ChangeCaseTitle DeInstallBase Librarian
+
+noinst_PROGRAMS = restore
+
+AM_LFLAGS = -Cf -L -8 -s
+AM_YFLAGS = -d
+
+AM_CXXFLAGS = \
+	      -DCDE_NEXT \
+	      -DDTDCBK_DATAROOTDIR=\"$(dtdocbookdatadir)\" \
+	      -DDTSEARCH \
+	      -DDtinfoClient \
+	      -DEXPAND_TEMPLATES \
+	      -I$(top_builddir)/lib/DtMmdb
+
+AM_LDFLAGS = $(XTOOLLIB) $(LIBMMDB) $(DTCLIENTLIBS)
+
+MixedGen_SOURCES = \
+		   MixedGen.C \
+		   AttributeList.C \
+		   AttributeRec.C \
+		   BTCollectable.C \
+		   BookCaseDB.C \
+		   DataBase.C \
+		   FlexBuffer.C \
+		   Handler.C \
+		   RemoteId.C \
+		   SGMLName.C \
+		   StringList.C \
+		   Token.C
+
+NCFGen_SOURCES = \
+		 NCFGen.C \
+		 AttributeList.C \
+		 AttributeRec.C \
+		 BTCollectable.C \
+		 BookCaseDB.C \
+		 DataBase.C \
+		 Handler.C \
+		 SGMLName.C \
+		 StringList.C \
+		 StyleValidate.C \
+		 Token.C
+
+NodeParser_SOURCES = \
+		     NodeParser.C \
+		     AttributeData.C \
+		     AttributeList.C \
+		     AttributeRec.C \
+		     AusText.C \
+		     AusTextStorage.C \
+		     BookCaseDB.C \
+		     BookTasks.C \
+		     ConcatTask.C \
+		     Content.C \
+		     ContentType.C \
+		     DataBase.C \
+		     DataRepository.C \
+		     Dispatch.C \
+		     EntityList.C \
+		     ExprList.C \
+		     Expression.C \
+		     FirstOf.C \
+		     FlexBuffer.C \
+		     GenericId.C \
+		     GraphicsTask.C \
+		     Handler.C \
+		     LcfTask.C \
+		     NodeData.C \
+		     NodeTask.C \
+		     OLAF.C \
+		     OL_Data.C \
+		     OL_DataExpr.C \
+		     ReplaceIdIdref.C \
+		     SGMLDefn.C \
+		     SGMLName.C \
+		     SearchEng.C \
+		     SearchPath.C \
+		     StringList.C \
+		     StyleTask.C \
+		     StyleTaskDB.C \
+		     TOCTask.C \
+		     Task.C \
+		     Token.C \
+		     gr_type.C \
+		     lex.ll
+
+StyleUpdate_SOURCES = \
+		      StyleUpdate.C \
+		      AttributeData.C \
+		      AttributeList.C \
+		      AttributeRec.C \
+		      ConcatTask.C \
+		      Content.C \
+		      ContentType.C \
+		      Dispatch.C \
+		      EntityList.C \
+		      ExprList.C \
+		      Expression.C \
+		      FirstOf.C \
+		      FlexBuffer.C \
+		      GenericId.C \
+		      Handler.C \
+		      OLAF.C \
+		      OL_Data.C \
+		      OL_DataExpr.C \
+		      SGMLDefn.C \
+		      SGMLName.C \
+		      SearchPath.C \
+		      StyleTask.C \
+		      StyleValidate.C \
+		      Task.C \
+		      Token.C \
+		      lex.ll
+
+CLEANFILES = \
+	     OL_DataExpr.C \
+	     OL_DataExpr.tab.h \
+	     ContentType.C \
+	     ReplaceIdIdref.C \
+	     RemoteId.C \
+	     gr_type.C \
+	     lex.cc
+
+OL_DataExpr.C: OL_DataExpr.yy
+	$(YACC) $(AM_YFLAGS) -p ol_data -b OL_DataExpr $<
+	mv OL_DataExpr.tab.c $@
+
+ContentType.C: ContentType.ll OL_DataExpr.C
+	$(LEX) $(AM_LFLAGS) -P ol_data -o $@ $<
+
+ReplaceIdIdref.C: ReplaceIdIdref.ll
+	$(LEX) $(AM_LFLAGS) -P nodedata -o $@ $<
+
+RemoteId.C: RemoteId.ll
+	$(LEX) $(AM_LFLAGS) -P remote -o $@ $<
+
+gr_type.C: gr_type.ll
+	$(LEX) $(AM_LFLAGS) -P graphics_task -o $@ $<