=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mandocdb.c,v retrieving revision 1.4 retrieving revision 1.5 diff -c -r1.4 -r1.5 *** src/usr.bin/mandoc/mandocdb.c 2011/11/13 00:53:07 1.4 --- src/usr.bin/mandoc/mandocdb.c 2011/11/13 10:40:52 1.5 *************** *** 1,4 **** ! /* $Id: mandocdb.c,v 1.4 2011/11/13 00:53:07 schwarze Exp $ */ /* * Copyright (c) 2011 Kristaps Dzonsons * --- 1,4 ---- ! /* $Id: mandocdb.c,v 1.5 2011/11/13 10:40:52 schwarze Exp $ */ /* * Copyright (c) 2011 Kristaps Dzonsons * *************** *** 29,56 **** #include "man.h" #include "mdoc.h" #include "mandoc.h" - #define MANDOC_DB "mandoc.db" - #define MANDOC_IDX "mandoc.index" #define MANDOC_BUFSZ BUFSIZ #define MANDOC_SLOP 1024 - /* Bit-fields. See mandocdb.8. */ - - #define TYPE_NAME 0x01 - #define TYPE_FUNCTION 0x02 - #define TYPE_UTILITY 0x04 - #define TYPE_INCLUDES 0x08 - #define TYPE_VARIABLE 0x10 - #define TYPE_STANDARD 0x20 - #define TYPE_AUTHOR 0x40 - #define TYPE_CONFIG 0x80 - #define TYPE_DESC 0x100 - #define TYPE_XREF 0x200 - #define TYPE_PATH 0x400 - #define TYPE_ENV 0x800 - #define TYPE_ERR 0x1000 - /* Tiny list for files. No need to bring in QUEUE. */ struct of { --- 29,39 ---- #include "man.h" #include "mdoc.h" #include "mandoc.h" + #include "mandocdb.h" #define MANDOC_BUFSZ BUFSIZ #define MANDOC_SLOP 1024 /* Tiny list for files. No need to bring in QUEUE. */ struct of { *************** *** 719,725 **** return; buf_appendmdoc(buf, n->child, 0); ! hash_put(hash, buf, TYPE_AUTHOR); } static void --- 702,708 ---- return; buf_appendmdoc(buf, n->child, 0); ! hash_put(hash, buf, TYPE_An); } static void *************** *** 780,786 **** buf_appendb(buf, start, (size_t)(end - start + 1)); buf_appendb(buf, "", 1); ! hash_put(hash, buf, TYPE_INCLUDES); } /* ARGSUSED */ --- 763,769 ---- buf_appendb(buf, start, (size_t)(end - start + 1)); buf_appendb(buf, "", 1); ! hash_put(hash, buf, TYPE_In); } /* ARGSUSED */ *************** *** 792,798 **** return; buf_appendmdoc(buf, n->child, 0); ! hash_put(hash, buf, TYPE_CONFIG); } /* ARGSUSED */ --- 775,781 ---- return; buf_appendmdoc(buf, n->child, 0); ! hash_put(hash, buf, TYPE_Cd); } /* ARGSUSED */ *************** *** 806,812 **** return; buf_append(buf, n->child->string); ! hash_put(hash, buf, TYPE_INCLUDES); } /* ARGSUSED */ --- 789,795 ---- return; buf_append(buf, n->child->string); ! hash_put(hash, buf, TYPE_In); } /* ARGSUSED */ *************** *** 832,838 **** cp++; buf_append(buf, cp); ! hash_put(hash, buf, TYPE_FUNCTION); } /* ARGSUSED */ --- 815,821 ---- cp++; buf_append(buf, cp); ! hash_put(hash, buf, TYPE_Fn); } /* ARGSUSED */ *************** *** 846,852 **** return; buf_append(buf, n->child->string); ! hash_put(hash, buf, TYPE_STANDARD); } /* ARGSUSED */ --- 829,835 ---- return; buf_append(buf, n->child->string); ! hash_put(hash, buf, TYPE_St); } /* ARGSUSED */ *************** *** 865,871 **** } else buf_appendb(buf, ".", 2); ! hash_put(hash, buf, TYPE_XREF); } /* ARGSUSED */ --- 848,854 ---- } else buf_appendb(buf, ".", 2); ! hash_put(hash, buf, TYPE_Xr); } /* ARGSUSED */ *************** *** 902,908 **** buf_appendb(buf, start, sz); buf_appendb(buf, "", 1); ! hash_put(hash, buf, TYPE_VARIABLE); } /* ARGSUSED */ --- 885,891 ---- buf_appendb(buf, start, sz); buf_appendb(buf, "", 1); ! hash_put(hash, buf, TYPE_Va); } /* ARGSUSED */ *************** *** 916,922 **** return; buf_append(buf, n->child->string); ! hash_put(hash, buf, TYPE_FUNCTION); } --- 899,905 ---- return; buf_append(buf, n->child->string); ! hash_put(hash, buf, TYPE_Fn); } *************** *** 931,937 **** buf_appendmdoc(dbuf, n->child, 1); buf_appendmdoc(buf, n->child, 0); ! hash_put(hash, buf, TYPE_DESC); } /* ARGSUSED */ --- 914,920 ---- buf_appendmdoc(dbuf, n->child, 1); buf_appendmdoc(buf, n->child, 0); ! hash_put(hash, buf, TYPE_Nd); } /* ARGSUSED */ *************** *** 943,949 **** return; buf_appendmdoc(buf, n->child, 0); ! hash_put(hash, buf, TYPE_ERR); } /* ARGSUSED */ --- 926,932 ---- return; buf_appendmdoc(buf, n->child, 0); ! hash_put(hash, buf, TYPE_Er); } /* ARGSUSED */ *************** *** 955,961 **** return; buf_appendmdoc(buf, n->child, 0); ! hash_put(hash, buf, TYPE_ENV); } /* ARGSUSED */ --- 938,944 ---- return; buf_appendmdoc(buf, n->child, 0); ! hash_put(hash, buf, TYPE_Ev); } /* ARGSUSED */ *************** *** 967,973 **** return; buf_appendmdoc(buf, n->child, 0); ! hash_put(hash, buf, TYPE_PATH); } /* ARGSUSED */ --- 950,956 ---- return; buf_appendmdoc(buf, n->child, 0); ! hash_put(hash, buf, TYPE_Pa); } /* ARGSUSED */ *************** *** 977,983 **** if (SEC_NAME == n->sec) { buf_appendmdoc(buf, n->child, 0); ! hash_put(hash, buf, TYPE_NAME); return; } else if (SEC_SYNOPSIS != n->sec || MDOC_HEAD != n->type) return; --- 960,966 ---- if (SEC_NAME == n->sec) { buf_appendmdoc(buf, n->child, 0); ! hash_put(hash, buf, TYPE_Nm); return; } else if (SEC_SYNOPSIS != n->sec || MDOC_HEAD != n->type) return; *************** *** 986,992 **** buf_append(buf, m->name); buf_appendmdoc(buf, n->child, 0); ! hash_put(hash, buf, TYPE_UTILITY); } static void --- 969,975 ---- buf_append(buf, m->name); buf_appendmdoc(buf, n->child, 0); ! hash_put(hash, buf, TYPE_Nm); } static void *************** *** 1116,1122 **** buf_appendb(buf, start, sz); buf_appendb(buf, "", 1); ! hash_put(hash, buf, TYPE_NAME); if (' ' == start[(int)sz]) { start += (int)sz + 1; --- 1099,1105 ---- buf_appendb(buf, start, sz); buf_appendb(buf, "", 1); ! hash_put(hash, buf, TYPE_Nm); if (' ' == start[(int)sz]) { start += (int)sz + 1; *************** *** 1155,1161 **** buf_appendb(dbuf, start, sz); buf_appendb(buf, start, sz); ! hash_put(hash, buf, TYPE_DESC); } } --- 1138,1144 ---- buf_appendb(dbuf, start, sz); buf_appendb(buf, start, sz); ! hash_put(hash, buf, TYPE_Nd); } }