The NetBSD Project

CVS log for src/usr.sbin/makemandb/apropos-utils.h

[BACK] Up to [] / src / usr.sbin / makemandb

Request diff between arbitrary revisions

Default branch: MAIN
Current tag: MAIN

Revision 1.14 / (download) - annotate - [select for diffs], Sat Nov 25 14:29:38 2017 UTC (13 months, 3 weeks ago) by abhinav
Branch: MAIN
CVS Tags: phil-wifi-base, phil-wifi, pgoyette-compat-base, pgoyette-compat-1226, pgoyette-compat-1126, pgoyette-compat-1020, pgoyette-compat-0930, pgoyette-compat-0906, pgoyette-compat-0728, pgoyette-compat-0625, pgoyette-compat-0521, pgoyette-compat-0502, pgoyette-compat-0422, pgoyette-compat-0415, pgoyette-compat-0407, pgoyette-compat-0330, pgoyette-compat-0322, pgoyette-compat-0315, pgoyette-compat, HEAD
Changes since 1.13: +13 -3 lines
Diff to previous 1.13 (colored)

Encapsulate all the arguments required by the query callback function in a struct.

If we want to add or remove arguments from the callback functions, it requires
changing the callback interface all over the place. By letting the callback simply
expect a single struct argument, it would clean things up a bit.

ok christos

Revision 1.13 / (download) - annotate - [select for diffs], Sun Jun 18 16:24:10 2017 UTC (18 months, 4 weeks ago) by abhinav
Branch: MAIN
CVS Tags: perseant-stdc-iso10646-base, perseant-stdc-iso10646
Changes since 1.12: +2 -2 lines
Diff to previous 1.12 (colored)

Add a custom tokenizer which does not stem certain keywords.

Which keywords should not be stemmed is specified in the nostem.txt file.
(Right now I have taken all the man page names, split them if they had
underscores, removed common English words and converted everything to

The tokenizer itself is based on the Porter stemming tokenizer shipped with
Sqlite. The code in custom_apropos_tokenizer.c is copy of that code with
some modifications to prevent stemming keywords specified in nostem.txt.

Additionally, it now uses underscore `_' also as a token delimiter. Therefore,
now it's possible to do query for `lwp' and all `_lwp_*' man page names
will be matched. Or the query can be `unconst' and `__UNCONST' will be matched.
This was not possible earlier, because underscore was not a delimiter and therefore
the index would have __UNCONST as a key rather than UNCONST.

The tokenizer needs fts3_tokenizer.h file, which is not shipped with the
amalgamation build of Sqlite, therefore it needs to be added here (unless
we decide there is a better place for it).

To enforce using the new tokenizer, a schema version bump is needed

Since the tokenization is done both at the indexing time (via makemandb) and
also while query time (via apropos or whatis), it will be needed to bump
the schema version everytime nostem.txt is modified. Otherwise the
index will consist of old tokens and desired changes will not be seen with

This should also fix the issue reported in PR bin/46255. Similar suggestion was
also made on tech-userlevel@ recently:

Thanks to christos@ for multiple rounds of reviews of the tokenizer code.

Revision 1.12 / (download) - annotate - [select for diffs], Mon May 1 05:28:00 2017 UTC (20 months, 2 weeks ago) by abhinav
Branch: MAIN
CVS Tags: prg-localcount2-base3, prg-localcount2-base2, prg-localcount2-base1, netbsd-8-base, netbsd-8-0-RELEASE, netbsd-8-0-RC2, netbsd-8-0-RC1, netbsd-8, matt-nb8-mediatek-base, matt-nb8-mediatek
Changes since 1.11: +2 -2 lines
Diff to previous 1.11 (colored)

Simplify handling of the section arguments in apropos(1).

Earlier, a white space separated string was generated containing all the section
numbers passed through command line arguments. Later on that would have to be
tokenized and processed. Instead of that, use a NULL terminated array of strings.

Thanks to christos@ for reviewing and suggesting further improvements.

Revision 1.11 / (download) - annotate - [select for diffs], Wed Apr 13 11:48:29 2016 UTC (2 years, 9 months ago) by christos
Branch: MAIN
CVS Tags: prg-localcount2-base, pgoyette-localcount-base, pgoyette-localcount-20170426, pgoyette-localcount-20170320, pgoyette-localcount-20170107, pgoyette-localcount-20161104, pgoyette-localcount-20160806, pgoyette-localcount-20160726, pgoyette-localcount, localcount-20160914, bouyer-socketcan-base1, bouyer-socketcan-base, bouyer-socketcan
Branch point for: prg-localcount2
Changes since 1.10: +2 -3 lines
Diff to previous 1.10 (colored)

PR/51062: Abhinav Upadhyay: Allow non numeric sections to be indexed and
searched by apropos(1).
Fold long lines.

Revision 1.10 / (download) - annotate - [select for diffs], Wed Apr 13 01:37:50 2016 UTC (2 years, 9 months ago) by christos
Branch: MAIN
Changes since 1.9: +8 -5 lines
Diff to previous 1.9 (colored)

PR/51038: Abhinav Upadhyay: check for access permissions to the sqlite database

Revision 1.9 / (download) - annotate - [select for diffs], Tue Apr 2 17:16:50 2013 UTC (5 years, 9 months ago) by christos
Branch: MAIN
CVS Tags: yamt-pagecache-base9, tls-maxphys-base, tls-earlyentropy-base, tls-earlyentropy, riastradh-xf86-video-intel-2-7-1-pre-2-21-15, riastradh-drm2-base3, riastradh-drm2-base2, riastradh-drm2-base1, riastradh-drm2-base, riastradh-drm2, netbsd-7-nhusb-base-20170116, netbsd-7-nhusb-base, netbsd-7-nhusb, netbsd-7-base, netbsd-7-2-RELEASE, netbsd-7-1-RELEASE, netbsd-7-1-RC2, netbsd-7-1-RC1, netbsd-7-1-2-RELEASE, netbsd-7-1-1-RELEASE, netbsd-7-1, netbsd-7-0-RELEASE, netbsd-7-0-RC3, netbsd-7-0-RC2, netbsd-7-0-RC1, netbsd-7-0-2-RELEASE, netbsd-7-0-1-RELEASE, netbsd-7-0, netbsd-7
Changes since 1.8: +9 -7 lines
Diff to previous 1.8 (colored)

instead of having a format and no format flag, and exposing various formatters,
provide a format enum and expose html formatting too.

Revision 1.8 / (download) - annotate - [select for diffs], Fri Mar 29 20:07:31 2013 UTC (5 years, 9 months ago) by christos
Branch: MAIN
Changes since 1.7: +2 -1 lines
Diff to previous 1.7 (colored)

- If the stdout is not a tty, prevent formatting unless forced with -i
- Don't ever page unless asked for with -p
- Introduce "legacy mode" (-l)
  1. searches only name and name_desc, prints name(section) - name_description
  2. turns off escape formatting (can be forced on with -i)
  3. turns off context printing (can be forced on with -c)
- Parse the environment $APROPOS variable as an argument vector.

With these changes one can simply 'export APROPOS=-l' and get the old apropos

Revision 1.7 / (download) - annotate - [select for diffs], Sun Feb 10 23:58:27 2013 UTC (5 years, 11 months ago) by christos
Branch: MAIN
CVS Tags: agc-symver-base, agc-symver
Changes since 1.6: +3 -1 lines
Diff to previous 1.6 (colored)

add -r flag to elide tty formatting

Revision 1.6 / (download) - annotate - [select for diffs], Sun Feb 10 23:24:18 2013 UTC (5 years, 11 months ago) by christos
Branch: MAIN
Changes since 1.5: +2 -2 lines
Diff to previous 1.5 (colored)

remove trailing whitespace

Revision 1.5 / (download) - annotate - [select for diffs], Mon Jan 14 21:26:25 2013 UTC (6 years ago) by christos
Branch: MAIN
CVS Tags: yamt-pagecache-base8
Changes since 1.4: +2 -1 lines
Diff to previous 1.4 (colored)

- move the terminal handling in apropos-utils.c since htmp and pager are also
  handled there.
- underline the name, section, and description so that it is prettier.
- change to bold terminal the terminal highlighting to match with less

Revision 1.4 / (download) - annotate - [select for diffs], Sat Oct 6 15:33:59 2012 UTC (6 years, 3 months ago) by wiz
Branch: MAIN
CVS Tags: yamt-pagecache-base7, yamt-pagecache-base6
Changes since 1.3: +4 -3 lines
Diff to previous 1.3 (colored)

Make mandb path configurable. makemandb (and related tools) use
the path from the _mandb variable from man.conf now.

Set _mandb in man.conf to same value as was used before.

From Abhinav Upadhyay <>.

Revision 1.3 / (download) - annotate - [select for diffs], Mon May 7 11:18:16 2012 UTC (6 years, 8 months ago) by wiz
Branch: MAIN
CVS Tags: yamt-pagecache-base5
Branch point for: tls-maxphys
Changes since 1.2: +2 -2 lines
Diff to previous 1.2 (colored)

PR 46419 by Abhinav Upadhyay using his updated patch:
Clean up after removing man page aliases.

Revision 1.2 / (download) - annotate - [select for diffs], Tue Feb 7 19:17:16 2012 UTC (6 years, 11 months ago) by joerg
Branch: MAIN
CVS Tags: yamt-pagecache-base4, netbsd-6-base
Branch point for: yamt-pagecache, netbsd-6
Changes since 1.1: +1 -1 lines
Diff to previous 1.1 (colored)

Fix C&P error with $NetBSD$

Revision 1.1 / (download) - annotate - [select for diffs], Tue Feb 7 19:13:32 2012 UTC (6 years, 11 months ago) by joerg
Branch: MAIN

Import the new apropos/whatis.

This code has been developed by Abhinav Upadhyay as part of Google's Summer
of Code 2011. It uses libmandoc to parse man pages and builds a Full
Text Index in a SQLite database. The combination of indexing the full
manual page, filtering out stop words and ranking individual matches
based on the section gives a much improved user experience.

The old makewhatis and friends are kept under MKMAKEMANDB=no for now.

This form allows you to request diff's between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.

CVSweb <>