The NetBSD Project

CVS log for src/usr.sbin/makemandb/apropos.c

[BACK] Up to [cvs.NetBSD.org] / src / usr.sbin / makemandb

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.21 / (download) - annotate - [select for diffs], Sun May 22 19:26:04 2016 UTC (2 months ago) by abhinav
Branch: MAIN
CVS Tags: pgoyette-localcount-base, pgoyette-localcount, HEAD
Changes since 1.20: +14 -9 lines
Diff to previous 1.20 (colored)

Add options to whatis and apropos to accept custom man.conf.

makemandb(8), man(1) already use -C as an option to take man.conf path,
	so use the same option for whatis(1) and apropos(1) for consitency.
	apropos was using -C/-c to disable/enable context of the search
	matches, change that to -M/-m respectively.

Revision 1.20 / (download) - annotate - [select for diffs], Sat Apr 23 14:15:36 2016 UTC (3 months ago) by christos
Branch: MAIN
Changes since 1.19: +3 -2 lines
Diff to previous 1.19 (colored)

add a newline

Revision 1.19 / (download) - annotate - [select for diffs], Wed Apr 13 11:48:29 2016 UTC (3 months, 1 week ago) by christos
Branch: MAIN
Changes since 1.18: +28 -14 lines
Diff to previous 1.18 (colored)

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

Revision 1.18 / (download) - annotate - [select for diffs], Thu Mar 31 20:13:37 2016 UTC (3 months, 3 weeks ago) by christos
Branch: MAIN
Changes since 1.17: +2 -4 lines
Diff to previous 1.17 (colored)

PR/51007: Abhinav Upadhyay: apropos.c: Remove unused includes

Revision 1.17 / (download) - annotate - [select for diffs], Sun Dec 20 19:45:29 2015 UTC (7 months ago) by christos
Branch: MAIN
Changes since 1.16: +9 -5 lines
Diff to previous 1.16 (colored)

if we only asked for stopwords, use the original query.

Revision 1.6.2.5 / (download) - annotate - [select for diffs], Thu May 22 11:43:06 2014 UTC (2 years, 2 months ago) by yamt
Branch: yamt-pagecache
Changes since 1.6.2.4: +114 -56 lines
Diff to previous 1.6.2.4 (colored) to branchpoint 1.6 (colored) next main 1.7 (colored)

sync with head.

for a reference, the tree before this commit was tagged
as yamt-pagecache-tag8.

this commit was splitted into small chunks to avoid
a limitation of cvs.  ("Protocol error: too many arguments")

Revision 1.7.2.3 / (download) - annotate - [select for diffs], Sun Jun 23 06:29:05 2013 UTC (3 years, 1 month ago) by tls
Branch: tls-maxphys
Changes since 1.7.2.2: +109 -55 lines
Diff to previous 1.7.2.2 (colored) next main 1.8 (colored)

resync from head

Revision 1.16 / (download) - annotate - [select for diffs], Tue Apr 2 17:16:50 2013 UTC (3 years, 3 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-base, netbsd-7-0-RELEASE, netbsd-7-0-RC3, netbsd-7-0-RC2, netbsd-7-0-RC1, netbsd-7-0-1-RELEASE, netbsd-7-0, netbsd-7
Changes since 1.15: +36 -18 lines
Diff to previous 1.15 (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.15 / (download) - annotate - [select for diffs], Fri Mar 29 21:39:16 2013 UTC (3 years, 3 months ago) by wiz
Branch: MAIN
Changes since 1.14: +4 -4 lines
Diff to previous 1.14 (colored)

Sync usage with man page.

Revision 1.14 / (download) - annotate - [select for diffs], Fri Mar 29 20:37:00 2013 UTC (3 years, 3 months ago) by christos
Branch: MAIN
Changes since 1.13: +4 -4 lines
Diff to previous 1.13 (colored)

- Fix legacy mode to use like instead of match. This loses ranking.
- default to unlimited lines
- fix formatting of legacy mode

Revision 1.13 / (download) - annotate - [select for diffs], Fri Mar 29 20:07:31 2013 UTC (3 years, 3 months ago) by christos
Branch: MAIN
Changes since 1.12: +84 -48 lines
Diff to previous 1.12 (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
behavior.

Revision 1.7.2.2 / (download) - annotate - [select for diffs], Mon Feb 25 00:30:45 2013 UTC (3 years, 4 months ago) by tls
Branch: tls-maxphys
Changes since 1.7.2.1: +18 -17 lines
Diff to previous 1.7.2.1 (colored)

resync with head

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

add -r flag to elide tty formatting

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

remove trailing whitespace

Revision 1.6.2.4 / (download) - annotate - [select for diffs], Wed Jan 23 00:06:43 2013 UTC (3 years, 6 months ago) by yamt
Branch: yamt-pagecache
CVS Tags: yamt-pagecache-tag8
Changes since 1.6.2.3: +7 -10 lines
Diff to previous 1.6.2.3 (colored) to branchpoint 1.6 (colored)

sync with head

Revision 1.10 / (download) - annotate - [select for diffs], Mon Jan 14 21:26:25 2013 UTC (3 years, 6 months ago) by christos
Branch: MAIN
CVS Tags: yamt-pagecache-base8
Changes since 1.9: +4 -36 lines
Diff to previous 1.9 (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.9 / (download) - annotate - [select for diffs], Mon Jan 14 18:04:58 2013 UTC (3 years, 6 months ago) by christos
Branch: MAIN
Changes since 1.8: +39 -10 lines
Diff to previous 1.8 (colored)

Fix the #ifdef NOTYET, namely use the terminal standout mode to highlight the
search terms.

Revision 1.4.2.3 / (download) - annotate - [select for diffs], Tue Nov 20 23:11:47 2012 UTC (3 years, 8 months ago) by riz
Branch: netbsd-6
CVS Tags: netbsd-6-1-RELEASE, netbsd-6-1-RC4, netbsd-6-1-RC3, netbsd-6-1-RC2, netbsd-6-1-RC1, netbsd-6-1-5-RELEASE, netbsd-6-1-4-RELEASE, netbsd-6-1-3-RELEASE, netbsd-6-1-2-RELEASE, netbsd-6-1-1-RELEASE, netbsd-6-1
Changes since 1.4.2.2: +1 -1 lines
Diff to previous 1.4.2.2 (colored) to branchpoint 1.4 (colored) next main 1.5 (colored)

Pull up following revision(s) (requested by tron in ticket #676):
	usr.sbin/makemandb/apropos.c: revision 1.7
	usr.sbin/makemandb/makemandb.8: revision 1.3
	usr.sbin/makemandb/makemandb.8: revision 1.4
	usr.sbin/makemandb/makemandb.8: revision 1.5
	etc/rc.d/makemandb: revision 1.4
	etc/weekly: revision 1.29
	usr.sbin/makemandb/makemandb.c: revision 1.10
	usr.sbin/makemandb/makemandb.c: revision 1.11
	usr.sbin/makemandb/makemandb.c: revision 1.12
	usr.sbin/makemandb/makemandb.c: revision 1.13
	usr.sbin/makemandb/makemandb.c: revision 1.14
	usr.sbin/makemandb/apropos.1: revision 1.5
	etc/daily: revision 1.87
Add HISTORY section. From Abhinav Upadhyay in private mail.
Sync with reality, From Abhinav Upadhyay in private mail.
Fix typo in a message.
Bug fix for PR 46733:
 > makemandb always reports the same number for "Total Number of new or
 > updated pages enountered" and "Total number of (hard or symbolic)
 > links found".
Patch from Abhinav Upadhyay.
Sort options in SYNOPSIS.
Sync usage with manpage.
Add -Q flag:
Print only fatal error messages (i.e., when the database is left in
an inconsistent state and needs manual intervention).
From Abhinav Upadhyay <er.abhinav.upadhyay@gmail.com>.
Use new makemandb -Q flag to be really quiet.
Fix usage, from Abhinav Upadhyay <er.abhinav.upadhyay@gmail.com>.
Use emalloc in one more place, like the rest of the code does.
From Abhinav Upadhyay <er.abhinav.upadhyay@gmail.com>.

Revision 1.7.2.1 / (download) - annotate - [select for diffs], Tue Nov 20 03:03:02 2012 UTC (3 years, 8 months ago) by tls
Branch: tls-maxphys
Changes since 1.7: +3 -3 lines
Diff to previous 1.7 (colored)

Resync to 2012-11-19 00:00:00 UTC

Revision 1.6.2.3 / (download) - annotate - [select for diffs], Tue Oct 30 19:00:38 2012 UTC (3 years, 8 months ago) by yamt
Branch: yamt-pagecache
Changes since 1.6.2.2: +4 -4 lines
Diff to previous 1.6.2.2 (colored) to branchpoint 1.6 (colored)

sync with head

Revision 1.8 / (download) - annotate - [select for diffs], Sat Oct 6 15:33:59 2012 UTC (3 years, 9 months ago) by wiz
Branch: MAIN
CVS Tags: yamt-pagecache-base7, yamt-pagecache-base6
Changes since 1.7: +3 -3 lines
Diff to previous 1.7 (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 <er.abhinav.upadhyay@gmail.com>.

Revision 1.7 / (download) - annotate - [select for diffs], Fri Sep 7 11:28:46 2012 UTC (3 years, 10 months ago) by wiz
Branch: MAIN
Branch point for: tls-maxphys
Changes since 1.6: +3 -3 lines
Diff to previous 1.6 (colored)

Fix usage, from Abhinav Upadhyay <er.abhinav.upadhyay@gmail.com>.

Revision 1.4.2.2 / (download) - annotate - [select for diffs], Thu Apr 19 20:03:00 2012 UTC (4 years, 3 months ago) by riz
Branch: netbsd-6
CVS Tags: netbsd-6-0-RELEASE, netbsd-6-0-RC2, netbsd-6-0-RC1, netbsd-6-0-6-RELEASE, netbsd-6-0-5-RELEASE, netbsd-6-0-4-RELEASE, netbsd-6-0-3-RELEASE, netbsd-6-0-2-RELEASE, netbsd-6-0-1-RELEASE, netbsd-6-0, matt-nb6-plus-nbase, matt-nb6-plus-base, matt-nb6-plus
Changes since 1.4.2.1: +3 -3 lines
Diff to previous 1.4.2.1 (colored) to branchpoint 1.4 (colored)

Pull up following revision(s) (requested by wiz in ticket #186):
	usr.sbin/makemandb/apropos.c: revision 1.6
	usr.sbin/makemandb/apropos-utils.c: revision 1.3
	usr.sbin/makemandb/apropos-utils.c: revision 1.4
Add the result from sqlite3_errmsg() to some error messages.
Now we can get "apropos: Unable to query schema version: database is locked"
instead of just "apropos: Unable to query schema version".
Handle pages with slashes in their names better.
From Abhinav Upadhyay in private mail.

Revision 1.6.2.2 / (download) - annotate - [select for diffs], Tue Apr 17 00:09:49 2012 UTC (4 years, 3 months ago) by yamt
Branch: yamt-pagecache
Changes since 1.6.2.1: +283 -0 lines
Diff to previous 1.6.2.1 (colored) to branchpoint 1.6 (colored)

sync with head

Revision 1.6.2.1, Sun Apr 15 15:56:52 2012 UTC (4 years, 3 months ago) by yamt
Branch: yamt-pagecache
Changes since 1.6: +0 -283 lines
FILE REMOVED

file apropos.c was added on branch yamt-pagecache on 2012-04-17 00:09:49 +0000

Revision 1.6 / (download) - annotate - [select for diffs], Sun Apr 15 15:56:52 2012 UTC (4 years, 3 months ago) by wiz
Branch: MAIN
CVS Tags: yamt-pagecache-base5, yamt-pagecache-base4
Branch point for: yamt-pagecache
Changes since 1.5: +3 -3 lines
Diff to previous 1.5 (colored)

Handle pages with slashes in their names better.
From Abhinav Upadhyay in private mail.

Revision 1.4.2.1 / (download) - annotate - [select for diffs], Sat Feb 18 18:03:26 2012 UTC (4 years, 5 months ago) by riz
Branch: netbsd-6
Changes since 1.4: +12 -5 lines
Diff to previous 1.4 (colored)

Pull up following revision(s) (requested by joerg in ticket #4):
	usr.sbin/makemandb/apropos.c: revision 1.5
	external/bsd/mdocml/dist/read.c: revision 1.6
	external/bsd/mdocml/dist/mandoc.h: revision 1.2
	usr.sbin/makemandb/makemandb.c: revision 1.3
	usr.sbin/makemandb/makemandb.c: revision 1.4
	usr.sbin/makemandb/makemandb.c: revision 1.5
	usr.sbin/makemandb/Makefile: revision 1.2
	etc/man.conf: revision 1.30
	usr.sbin/makemandb/apropos.1: revision 1.3
	external/bsd/mdocml/Makefile.inc: revision 1.15
Be a bit more friendly to man pages using the roff .so command by
changing the current directory to the parent of the man -p entry, e.g.
/usr/share/man for /usr/share/man1.
Also handle hyphen replacement if it was used as plain input and no
backslash sequence was used at all in the line.
Add support for apropos -s like in the old apropos. Fix capitalisation.
Add note about optional quotation. From Abhinav Upadhyay.
Merge mandoc.h r1.99 and read.c 1.28 from upstream:
Add mparse_readmem, which allows application to run the parser directly
from memory, e.g. after de-compressing a document.
Add support for compressed man pages in all the usual formats.
Use mmap when dealing with plain files.
Add entries for bzip2 and xz.

Revision 1.5 / (download) - annotate - [select for diffs], Wed Feb 15 23:53:13 2012 UTC (4 years, 5 months ago) by joerg
Branch: MAIN
Changes since 1.4: +12 -5 lines
Diff to previous 1.4 (colored)

Add support for apropos -s like in the old apropos. Fix capitalisation.
Add note about optional quotation. From Abhinav Upadhyay.

Revision 1.4 / (download) - annotate - [select for diffs], Tue Feb 7 23:03:34 2012 UTC (4 years, 5 months ago) by joerg
Branch: MAIN
CVS Tags: netbsd-6-base
Branch point for: netbsd-6
Changes since 1.3: +3 -3 lines
Diff to previous 1.3 (colored)

Kill bad magic invocation.

Revision 1.3 / (download) - annotate - [select for diffs], Tue Feb 7 22:59:32 2012 UTC (4 years, 5 months ago) by joerg
Branch: MAIN
Changes since 1.2: +3 -4 lines
Diff to previous 1.2 (colored)

getopt returns int, not char.

Revision 1.2 / (download) - annotate - [select for diffs], Tue Feb 7 19:17:16 2012 UTC (4 years, 5 months ago) by joerg
Branch: MAIN
Changes since 1.1: +2 -2 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 (4 years, 5 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 <webmaster@jp.NetBSD.org>