The NetBSD Project

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

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

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.51 / (download) - annotate - [select for diffs], Thu Aug 3 07:49:23 2023 UTC (7 months, 3 weeks ago) by rin
Branch: MAIN
CVS Tags: HEAD
Changes since 1.50: +4 -4 lines
Diff to previous 1.50 (colored) to selected 1.15.4.1 (colored)

makemandb: trailing whitespace

Revision 1.50 / (download) - annotate - [select for diffs], Sun Sep 11 20:32:37 2022 UTC (18 months, 2 weeks ago) by gutteridge
Branch: MAIN
CVS Tags: netbsd-10-base, netbsd-10-0-RC6, netbsd-10-0-RC5, netbsd-10-0-RC4, netbsd-10-0-RC3, netbsd-10-0-RC2, netbsd-10-0-RC1, netbsd-10
Changes since 1.49: +5 -5 lines
Diff to previous 1.49 (colored) to selected 1.15.4.1 (colored)

makemandb/*: fix spelling of database and consistency of SQLite

Revision 1.45.2.1 / (download) - annotate - [select for diffs], Fri Jun 3 12:25:14 2022 UTC (21 months, 3 weeks ago) by martin
Branch: netbsd-9
CVS Tags: netbsd-9-3-RELEASE
Changes since 1.45: +29 -22 lines
Diff to previous 1.45 (colored) next main 1.46 (colored) to selected 1.15.4.1 (colored)

Pull up following revision(s) (requested by gutteridge in ticket #1461):

	usr.sbin/makemandb/apropos.1: revision 1.19
	usr.sbin/makemandb/apropos.c: revision 1.25
	usr.sbin/makemandb/apropos.c: revision 1.26
	usr.sbin/makemandb/apropos.1: revision 1.20
	usr.sbin/makemandb/apropos.1: revision 1.21
	usr.sbin/makemandb/apropos.1: revision 1.22
	usr.sbin/makemandb/apropos.1: revision 1.23
	usr.sbin/makemandb/apropos-utils.c: revision 1.46
	usr.sbin/makemandb/apropos-utils.c: revision 1.47
	usr.sbin/makemandb/apropos-utils.c: revision 1.49

PR/54343: Prevent NULL pointers in callback strings; use "*?*" for now to
identify them.

PR bin/54343:  We want the callback_args.machine to be NULL if it is not
present in the DB.

The previous commit fixed the problem of allowing apropos to not crash and
produce output even if the database is missing values for certain mandatory
fields, such as name, section etc. Normally we don't expect those values
to be missing in the database but in case of parsing errors it can happen.

However, the machine architecture is an optional field since not all man pages
are hardware specific so that should be allowed to be set to NULL if not
present in the database.

apropos.c: fix pager functionality

Issue reported by Rocky Hotas on NetBSD-Users, patch input from RVP on
same, adjustments by me.

apropos.1: document the PAGER environment variable

apropos(1): use proper -width

apropos(1): use proper -width for the list of options too

apropos(1): Tweak the description of -1, ... -9, and -s

-s is not for compatibility only, because section names can be
anything.  E.g. we have 3lua and 9lua in base.  We have rudiments of
3f (for FORTRAN libs).  Some packages in pkgsrc also use suffixed 1
and 3 sections.

apropos(1): Use the official spelling for "SQLite".
While here, use .Bx to refer to 3BSD.

apropos(1): improve error handling in edge cases
Patch from RVP on NetBSD-Users, with an additional comment tweak by me.

Summary from RVP:
1. Ignore SIGPIPE so that we're not killed in the middle of some
   DB operation by a botched $PAGER:
$ env PAGER=3D/non-existent apropos -p ...
2. Return proper exit status in case of write errors:
$ apropos ... >/dev/full || echo fail

Revision 1.49 / (download) - annotate - [select for diffs], Thu May 19 04:08:03 2022 UTC (22 months, 1 week ago) by gutteridge
Branch: MAIN
Changes since 1.48: +15 -15 lines
Diff to previous 1.48 (colored) to selected 1.15.4.1 (colored)

apropos(1): improve error handling in edge cases

Patch from RVP on NetBSD-Users, with an additional comment tweak by me.
Summary from RVP:

1. Ignore SIGPIPE so that we're not killed in the middle of some
   DB operation by a botched $PAGER:

$ env PAGER=/non-existent apropos -p ...

2. Return proper exit status in case of write errors:

$ apropos ... >/dev/full || echo fail

Revision 1.48 / (download) - annotate - [select for diffs], Sat Nov 27 22:30:25 2021 UTC (2 years, 3 months ago) by rillig
Branch: MAIN
Changes since 1.47: +3 -3 lines
Diff to previous 1.47 (colored) to selected 1.15.4.1 (colored)

usr.sbin: remove unnecessary CONSTCOND, lint no longer needs it

Since 2021-01-31, lint no longer requires a CONSTCOND comment in a
do-while-0 statement since this is a common code pattern, especially in
statement-like macros.

sed -i -E 's,} while \(/\* ?CONSTCOND ?\*/ ?0\),} while (0),' */*.[ch]

Revision 1.40.4.2 / (download) - annotate - [select for diffs], Mon Apr 13 08:05:54 2020 UTC (3 years, 11 months ago) by martin
Branch: phil-wifi
Changes since 1.40.4.1: +16 -9 lines
Diff to previous 1.40.4.1 (colored) to branchpoint 1.40 (colored) next main 1.41 (colored) to selected 1.15.4.1 (colored)

Mostly merge changes from HEAD upto 20200411

Revision 1.47 / (download) - annotate - [select for diffs], Sun Aug 18 09:14:30 2019 UTC (4 years, 7 months ago) by abhinav
Branch: MAIN
CVS Tags: phil-wifi-20200421, phil-wifi-20200411, phil-wifi-20200406, phil-wifi-20191119, is-mlppp-base, is-mlppp, cjep_sun2x-base1, cjep_sun2x-base, cjep_sun2x, cjep_staticlib_x-base1, cjep_staticlib_x-base, cjep_staticlib_x
Changes since 1.46: +3 -3 lines
Diff to previous 1.46 (colored) to selected 1.15.4.1 (colored)

PR bin/54343:  We want the callback_args.machine to be NULL if it is not present in the DB.

The previous commit fixed the problem of allowing apropos to not crash and
produce output even if the database is missing values for certain mandatory
fields, such as name, section etc. Normally we don't expect those values
to be missing in the database but in case of parsing errors it can happen.

However, the machine architecture is an optional field since not all man pages
are hardware specific so that should be allowed to be set to NULL if not
present in the database.

Revision 1.46 / (download) - annotate - [select for diffs], Thu Aug 15 10:29:07 2019 UTC (4 years, 7 months ago) by christos
Branch: MAIN
Changes since 1.45: +17 -10 lines
Diff to previous 1.45 (colored) to selected 1.15.4.1 (colored)

PR/54343: Prevent NULL pointers in callback strings; use "*?*" for now to
identify them.

Revision 1.40.4.1 / (download) - annotate - [select for diffs], Mon Jun 10 22:10:33 2019 UTC (4 years, 9 months ago) by christos
Branch: phil-wifi
Changes since 1.40: +22 -13 lines
Diff to previous 1.40 (colored) to selected 1.15.4.1 (colored)

Sync with HEAD

Revision 1.45 / (download) - annotate - [select for diffs], Fri Jun 7 16:43:58 2019 UTC (4 years, 9 months ago) by leot
Branch: MAIN
CVS Tags: phil-wifi-20190609, netbsd-9-base, netbsd-9-2-RELEASE, netbsd-9-1-RELEASE, netbsd-9-0-RELEASE, netbsd-9-0-RC2, netbsd-9-0-RC1
Branch point for: netbsd-9
Changes since 1.44: +3 -3 lines
Diff to previous 1.44 (colored) to selected 1.15.4.1 (colored)

Properly free section_clause.

Revision 1.44 / (download) - annotate - [select for diffs], Sat May 18 07:56:43 2019 UTC (4 years, 10 months ago) by abhinav
Branch: MAIN
Changes since 1.43: +3 -3 lines
Diff to previous 1.43 (colored) to selected 1.15.4.1 (colored)

PR misc/54213: Fix performance of whatis(1) when no matches are found

In revision 1.6 of whatis.c the query was modified to return matches for names found
in MLINKS of the man pages as well. However it was slow. The reason probably being that it
required a join. But more importantly the where condition on an FTS virtual table column
is very slow. To avoid the join and the expensive where condition on the virtual table,
add the name_desc column to the mandb_links table as well. This improves the performance
of whatis(1) to the original level at the expense of slight data duplication.

Bump the schema to force database rebuild to take account for the new column addition

Revision 1.43 / (download) - annotate - [select for diffs], Fri Apr 19 20:35:13 2019 UTC (4 years, 11 months ago) by abhinav
Branch: MAIN
Changes since 1.42: +6 -6 lines
Diff to previous 1.42 (colored) to selected 1.15.4.1 (colored)

Memory allocated by sqlite3_mprintf should be free'd by sqlite3_free

This was causing memory corruption thus making apropos(1) fail in some cases.
Specifically following options were broken and should be fixed with this commit:

-n option was causing a core dump
apropos was giving warning when using -l and any of the section numbers as options
as reported by paulg on current-users.

Revision 1.42 / (download) - annotate - [select for diffs], Sun Apr 14 07:59:56 2019 UTC (4 years, 11 months ago) by abhinav
Branch: MAIN
Changes since 1.41: +7 -4 lines
Diff to previous 1.41 (colored) to selected 1.15.4.1 (colored)

Set the snippet_length field of the callback_args

Because of this field not being set, apropos was failing to show snippet when piped to a pager
or when used with -p argument.

Revision 1.41 / (download) - annotate - [select for diffs], Thu Mar 7 22:08:59 2019 UTC (5 years ago) by christos
Branch: MAIN
Changes since 1.40: +13 -7 lines
Diff to previous 1.40 (colored) to selected 1.15.4.1 (colored)

fix memory allocation problems detected by jemalloc...

Revision 1.40 / (download) - annotate - [select for diffs], Sat Nov 25 14:29:38 2017 UTC (6 years, 4 months ago) by abhinav
Branch: MAIN
CVS Tags: phil-wifi-base, pgoyette-compat-merge-20190127, pgoyette-compat-base, pgoyette-compat-20190127, pgoyette-compat-20190118, 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
Branch point for: phil-wifi
Changes since 1.39: +52 -47 lines
Diff to previous 1.39 (colored) to selected 1.15.4.1 (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.39 / (download) - annotate - [select for diffs], Tue Aug 1 16:16:32 2017 UTC (6 years, 7 months ago) by abhinav
Branch: MAIN
Changes since 1.38: +11 -5 lines
Diff to previous 1.38 (colored) to selected 1.15.4.1 (colored)

Don't use the custom tokenizer when compiled with debugging on

Using the custom tokenizer means one cannot interactively query the database
through the SQLite shell, thus thwarting the purpose of the debug build option.

Thanks to leot@ for reporting it.

(While there change the debug macro from DEBUG to APROPOS_DEBUG)

Revision 1.38 / (download) - annotate - [select for diffs], Sun Jun 18 16:24:10 2017 UTC (6 years, 9 months ago) by abhinav
Branch: MAIN
CVS Tags: perseant-stdc-iso10646-base, perseant-stdc-iso10646
Changes since 1.37: +35 -4 lines
Diff to previous 1.37 (colored) to selected 1.15.4.1 (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
lowercase.)

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
apropos.

This should also fix the issue reported in PR bin/46255. Similar suggestion was
also made on tech-userlevel@ recently:
<http://mail-index.netbsd.org/tech-userlevel/2017/06/08/msg010620.html>

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

Revision 1.31.2.1 / (download) - annotate - [select for diffs], Tue May 2 03:19:23 2017 UTC (6 years, 10 months ago) by pgoyette
Branch: prg-localcount2
Changes since 1.31: +46 -61 lines
Diff to previous 1.31 (colored) next main 1.32 (colored) to selected 1.15.4.1 (colored)

Sync with HEAD - tag prg-localcount2-base1

Revision 1.37 / (download) - annotate - [select for diffs], Mon May 1 05:28:00 2017 UTC (6 years, 10 months ago) by abhinav
Branch: MAIN
CVS Tags: prg-localcount2-base3, prg-localcount2-base2, prg-localcount2-base1, netbsd-8-base, netbsd-8-2-RELEASE, netbsd-8-1-RELEASE, netbsd-8-1-RC1, netbsd-8-0-RELEASE, netbsd-8-0-RC2, netbsd-8-0-RC1, netbsd-8, matt-nb8-mediatek-base, matt-nb8-mediatek
Changes since 1.36: +10 -34 lines
Diff to previous 1.36 (colored) to selected 1.15.4.1 (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.36 / (download) - annotate - [select for diffs], Sun Apr 30 16:56:30 2017 UTC (6 years, 10 months ago) by abhinav
Branch: MAIN
Changes since 1.35: +4 -6 lines
Diff to previous 1.35 (colored) to selected 1.15.4.1 (colored)

Simplify

Revision 1.35 / (download) - annotate - [select for diffs], Sun Apr 30 15:27:24 2017 UTC (6 years, 10 months ago) by abhinav
Branch: MAIN
Changes since 1.34: +12 -9 lines
Diff to previous 1.34 (colored) to selected 1.15.4.1 (colored)

Instead of dereferencing the pointer passed in as function argument, use a
temporary local buffer. Saves the cost of pointer dereferencing at so many places.

Revision 1.34 / (download) - annotate - [select for diffs], Sun Apr 30 14:53:58 2017 UTC (6 years, 10 months ago) by abhinav
Branch: MAIN
Changes since 1.33: +8 -6 lines
Diff to previous 1.33 (colored) to selected 1.15.4.1 (colored)

Update the comment to be in sync with the code.

Revision 1.33 / (download) - annotate - [select for diffs], Sun Apr 30 14:49:26 2017 UTC (6 years, 10 months ago) by abhinav
Branch: MAIN
Changes since 1.32: +16 -12 lines
Diff to previous 1.32 (colored) to selected 1.15.4.1 (colored)

Use sqlite3_mprintf() to generate SQL query instead of asprintf.

Revision 1.32 / (download) - annotate - [select for diffs], Thu Apr 27 08:02:24 2017 UTC (6 years, 11 months ago) by abhinav
Branch: MAIN
Changes since 1.31: +6 -4 lines
Diff to previous 1.31 (colored) to selected 1.15.4.1 (colored)

Disable the database compression if DEBUG is defined.

When debugging makemandb(8), it helps to be able to view the text being
stored in the database.

Revision 1.28.2.3 / (download) - annotate - [select for diffs], Wed Apr 26 02:53:36 2017 UTC (6 years, 11 months ago) by pgoyette
Branch: pgoyette-localcount
Changes since 1.28.2.2: +34 -5 lines
Diff to previous 1.28.2.2 (colored) to branchpoint 1.28 (colored) next main 1.29 (colored) to selected 1.15.4.1 (colored)

Sync with HEAD

Revision 1.31 / (download) - annotate - [select for diffs], Sun Apr 23 13:52:57 2017 UTC (6 years, 11 months ago) by abhinav
Branch: MAIN
CVS Tags: prg-localcount2-base, pgoyette-localcount-20170426
Branch point for: prg-localcount2
Changes since 1.30: +34 -5 lines
Diff to previous 1.30 (colored) to selected 1.15.4.1 (colored)

Better handle MLINKS in apropos(1).

apropos(1) only indexes the first .Nm entry from the NAME section in the full
text index. Rest of the .Nm entries are stored in a separate table: mandb_links.

Till now apropos(1) did not use the mandb_links table. So whenever a query
was being made for one of the man page links, such as realloc(3), it was showing
malloc(3) in the results but not as the first result. And, also the result would
show up as malloc(3), rather than realloc(3) (which can be confusing).

With this change, for single keyword queries, apropos(1) would now utilise the
mandb_links table as well. If the query is for one of the links of a man page,
it would show as the first result. Also, the result would show up as the name
of the link rather than the original man page name. For example, if the query
was for realloc, the output would be realloc(3), rather than malloc(3).

Following are some example queries showing difference in the output before this
change and after this change:

#Before changes
$ apropos -n 5 -M realloc
reallocarr (3)    reallocate array
reallocarray (3)  reallocate memory for an array of elements checking
for overflow
fgetwln (3)       get a line of wide characters from a stream
fgetln (3)        get a line from a stream
posix_memalign (3)        aligned memory allocation

#After changes
$ ./apropos -n 5 -M realloc
realloc (3)       general memory allocation operations
realloc (3)       general purpose memory allocation functions
realloc (9)       general-purpose kernel memory allocator
reallocarr (3)    reallocate array
reallocarray (3)  reallocate memory for an array of elements checking
for overflow

#Before changes
$ apropos -n 5 -M TAILQ_REMOVE
SLIST_HEAD (3) implementations of singly-linked lists, lists, simple
queues, tail queues, and singly-linked tail queues

#After changes
$ ./apropos -n 5 -M TAILQ_REMOVE
TAILQ_REMOVE (3)  implementations of singly-linked lists, lists,
simple queues, tail queues, and singly-linked tail queues

#Before changes
$ apropos -n 5 -M falloc
filedesc (9)      file descriptor tables and operations
file (9)  operations on file entries

#After changes
$ ./apropos -n 5 -M falloc
falloc (9)        file descriptor tables and operations
file (9)  operations on file entries

ok christos@

Revision 1.28.2.2 / (download) - annotate - [select for diffs], Mon Mar 20 06:58:08 2017 UTC (7 years ago) by pgoyette
Branch: pgoyette-localcount
Changes since 1.28.2.1: +3 -2 lines
Diff to previous 1.28.2.1 (colored) to branchpoint 1.28 (colored) to selected 1.15.4.1 (colored)

Sync with HEAD

Revision 1.30 / (download) - annotate - [select for diffs], Tue Jan 10 04:34:07 2017 UTC (7 years, 2 months ago) by kamil
Branch: MAIN
CVS Tags: pgoyette-localcount-20170320, bouyer-socketcan-base1, bouyer-socketcan-base, bouyer-socketcan
Changes since 1.29: +3 -2 lines
Diff to previous 1.29 (colored) to selected 1.15.4.1 (colored)

Include <unistd.h> for R_OK W_OK STDOUT_FILENO access(2)

These symbols are undefined after switch to new zlib.

Revision 1.28.2.1 / (download) - annotate - [select for diffs], Fri Nov 4 14:49:27 2016 UTC (7 years, 4 months ago) by pgoyette
Branch: pgoyette-localcount
Changes since 1.28: +4 -3 lines
Diff to previous 1.28 (colored) to selected 1.15.4.1 (colored)

Sync with HEAD

Revision 1.29 / (download) - annotate - [select for diffs], Mon Oct 3 13:36:35 2016 UTC (7 years, 5 months ago) by abhinav
Branch: MAIN
CVS Tags: pgoyette-localcount-20170107, pgoyette-localcount-20161104
Changes since 1.28: +4 -3 lines
Diff to previous 1.28 (colored) to selected 1.15.4.1 (colored)

Mark the section and md5_hash columns as unindexed in the FTS table, as they are not used for search

Revision 1.28 / (download) - annotate - [select for diffs], Wed Jul 6 18:03:27 2016 UTC (7 years, 8 months ago) by abhinav
Branch: MAIN
CVS Tags: pgoyette-localcount-base, pgoyette-localcount-20160806, pgoyette-localcount-20160726, localcount-20160914
Branch point for: pgoyette-localcount
Changes since 1.27: +3 -3 lines
Diff to previous 1.27 (colored) to selected 1.15.4.1 (colored)

Fix an off by one issue when concatenating strings.

Revision 1.27 / (download) - annotate - [select for diffs], Wed Jul 6 06:57:40 2016 UTC (7 years, 8 months ago) by abhinav
Branch: MAIN
Changes since 1.26: +10 -9 lines
Diff to previous 1.26 (colored) to selected 1.15.4.1 (colored)

Fix possible buffer overflow when concatenating strings.
Patch from christos@

Revision 1.26 / (download) - annotate - [select for diffs], Wed Jun 1 15:59:18 2016 UTC (7 years, 9 months ago) by abhinav
Branch: MAIN
Changes since 1.25: +71 -48 lines
Diff to previous 1.25 (colored) to selected 1.15.4.1 (colored)

Refactor the function for executing the search SQL query into two parts.

One part is responsible for generating the SQL query
The other part is responsible for executing the generated query.

While there, also remove a comment which is not valid anymore.
And, don't call the snippet function when doing legacy mode search as we are
not using the full text feature there.

Revision 1.25 / (download) - annotate - [select for diffs], Sun Apr 24 18:11:43 2016 UTC (7 years, 11 months ago) by christos
Branch: MAIN
Changes since 1.24: +3 -3 lines
Diff to previous 1.24 (colored) to selected 1.15.4.1 (colored)

CID 1358675: Wrong variable test

Revision 1.16.2.1 / (download) - annotate - [select for diffs], Fri Apr 15 07:47:29 2016 UTC (7 years, 11 months ago) by snj
Branch: netbsd-7
CVS Tags: netbsd-7-nhusb-base-20170116, netbsd-7-nhusb-base, netbsd-7-nhusb, 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
Changes since 1.16: +37 -6 lines
Diff to previous 1.16 (colored) next main 1.17 (colored) to selected 1.15.4.1 (colored)

Pull up following revision(s) (requested by christos in ticket #1142):
	usr.sbin/makemandb/apropos-utils.c: revisions 1.18, 1.19
CID 1341551: Don't bother formatting if ti == NULL
--
PR/50344: Stephen Fisher: apropos shows formatting on console with vt100 term
type. Can't print terminfo sequences directly; need to process them with
ti_puts() to handle padding. This removes the padding delays, and stricly
could break on slow terminal hardware, but they way the code is structured
makes it impossible to fix properly (since the formatting strings are
passed in the query).

Revision 1.24 / (download) - annotate - [select for diffs], Wed Apr 13 11:48:29 2016 UTC (7 years, 11 months ago) by christos
Branch: MAIN
Changes since 1.23: +103 -73 lines
Diff to previous 1.23 (colored) to selected 1.15.4.1 (colored)

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

Revision 1.23 / (download) - annotate - [select for diffs], Wed Apr 13 01:37:50 2016 UTC (7 years, 11 months ago) by christos
Branch: MAIN
Changes since 1.22: +27 -11 lines
Diff to previous 1.22 (colored) to selected 1.15.4.1 (colored)

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

Revision 1.22 / (download) - annotate - [select for diffs], Thu Mar 31 20:16:58 2016 UTC (7 years, 11 months ago) by christos
Branch: MAIN
Changes since 1.21: +2 -4 lines
Diff to previous 1.21 (colored) to selected 1.15.4.1 (colored)

PR/51025: Abhinav Upadhyay: Remove unused includes from apropos-utils.c

Revision 1.21 / (download) - annotate - [select for diffs], Thu Mar 24 16:07:13 2016 UTC (8 years ago) by christos
Branch: MAIN
Changes since 1.20: +69 -61 lines
Diff to previous 1.20 (colored) to selected 1.15.4.1 (colored)

PR/51004: Abhinav Upadhyay: apropos html mode doesn't handle especial
characters in the short description

Revision 1.20 / (download) - annotate - [select for diffs], Sun Mar 20 17:31:09 2016 UTC (8 years ago) by christos
Branch: MAIN
Changes since 1.19: +3 -5 lines
Diff to previous 1.19 (colored) to selected 1.15.4.1 (colored)

PR/50460: Abhinav Upadhyay: Fix legacy apropos query to match both the name
and the one line description and delete extra args.

Revision 1.19 / (download) - annotate - [select for diffs], Thu Dec 3 21:01:50 2015 UTC (8 years, 3 months ago) by christos
Branch: MAIN
Changes since 1.18: +5 -2 lines
Diff to previous 1.18 (colored) to selected 1.15.4.1 (colored)

CID 1341551: Don't bother formatting if ti == NULL

Revision 1.18 / (download) - annotate - [select for diffs], Mon Nov 23 22:34:00 2015 UTC (8 years, 4 months ago) by christos
Branch: MAIN
Changes since 1.17: +34 -6 lines
Diff to previous 1.17 (colored) to selected 1.15.4.1 (colored)

PR/50344: Stephen Fisher: apropos shows formatting on console with vt100 term
type. Can't print terminfo sequences directly; need to process them with
ti_puts() to handle padding. This removes the padding delays, and stricly
could break on slow terminal hardware, but they way the code is structured
makes it impossible to fix properly (since the formatting strings are
passed in the query).
XXX: pullup-7

Revision 1.17 / (download) - annotate - [select for diffs], Sat Oct 18 08:33:31 2014 UTC (9 years, 5 months ago) by snj
Branch: MAIN
Changes since 1.16: +5 -5 lines
Diff to previous 1.16 (colored) to selected 1.15.4.1 (colored)

src is too big these days to tolerate superfluous apostrophes.  It's
"its", people!

Revision 1.6.2.4 / (download) - annotate - [select for diffs], Wed Aug 20 00:05:09 2014 UTC (9 years, 7 months ago) by tls
Branch: tls-maxphys
Changes since 1.6.2.3: +2 -2 lines
Diff to previous 1.6.2.3 (colored) to branchpoint 1.6 (colored) next main 1.7 (colored) to selected 1.15.4.1 (colored)

Rebase to HEAD as of a few days ago.

Revision 1.15.4.1 / (download) - annotate - [selected], Sun Aug 10 06:59:45 2014 UTC (9 years, 7 months ago) by tls
Branch: tls-earlyentropy
Changes since 1.15: +4 -4 lines
Diff to previous 1.15 (colored) next main 1.16 (colored)

Rebase.

Revision 1.16 / (download) - annotate - [select for diffs], Fri Aug 1 12:55:00 2014 UTC (9 years, 7 months ago) by wiz
Branch: MAIN
CVS Tags: tls-maxphys-base, tls-earlyentropy-base, netbsd-7-base, 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
Branch point for: netbsd-7
Changes since 1.15: +4 -4 lines
Diff to previous 1.15 (colored) to selected 1.15.4.1 (colored)

Fix an off by one bug in apropos.
The bug is in the html output where some garbage characters are
seen in the context match output.

From Abhinav Upadhyay in PR 49058.

Revision 1.4.2.6 / (download) - annotate - [select for diffs], Thu May 22 11:43:06 2014 UTC (9 years, 10 months ago) by yamt
Branch: yamt-pagecache
Changes since 1.4.2.5: +114 -60 lines
Diff to previous 1.4.2.5 (colored) to branchpoint 1.4 (colored) next main 1.5 (colored) to selected 1.15.4.1 (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.6.2.3 / (download) - annotate - [select for diffs], Sun Jun 23 06:29:05 2013 UTC (10 years, 9 months ago) by tls
Branch: tls-maxphys
Changes since 1.6.2.2: +83 -34 lines
Diff to previous 1.6.2.2 (colored) to branchpoint 1.6 (colored) to selected 1.15.4.1 (colored)

resync from head

Revision 1.15 / (download) - annotate - [select for diffs], Tue Apr 2 17:16:50 2013 UTC (10 years, 11 months ago) by christos
Branch: MAIN
CVS Tags: yamt-pagecache-base9, 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
Branch point for: tls-earlyentropy
Changes since 1.14: +43 -25 lines
Diff to previous 1.14 (colored) to selected 1.15.4.1 (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.14 / (download) - annotate - [select for diffs], Fri Mar 29 20:46:07 2013 UTC (11 years ago) by christos
Branch: MAIN
Changes since 1.13: +12 -7 lines
Diff to previous 1.13 (colored) to selected 1.15.4.1 (colored)

fix legacy mode in pager filter. (don't ul format if we are not formatting).

Revision 1.13 / (download) - annotate - [select for diffs], Fri Mar 29 20:37:00 2013 UTC (11 years ago) by christos
Branch: MAIN
Changes since 1.12: +8 -14 lines
Diff to previous 1.12 (colored) to selected 1.15.4.1 (colored)

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

Revision 1.12 / (download) - annotate - [select for diffs], Fri Mar 29 20:07:31 2013 UTC (11 years ago) by christos
Branch: MAIN
Changes since 1.11: +47 -15 lines
Diff to previous 1.11 (colored) to selected 1.15.4.1 (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.6.2.2 / (download) - annotate - [select for diffs], Mon Feb 25 00:30:45 2013 UTC (11 years, 1 month ago) by tls
Branch: tls-maxphys
Changes since 1.6.2.1: +176 -36 lines
Diff to previous 1.6.2.1 (colored) to branchpoint 1.6 (colored) to selected 1.15.4.1 (colored)

resync with head

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

add -r flag to elide tty formatting

Revision 1.10 / (download) - annotate - [select for diffs], Sun Feb 10 23:24:18 2013 UTC (11 years, 1 month ago) by christos
Branch: MAIN
Changes since 1.9: +34 -34 lines
Diff to previous 1.9 (colored) to selected 1.15.4.1 (colored)

remove trailing whitespace

Revision 1.4.2.5 / (download) - annotate - [select for diffs], Wed Jan 23 00:06:43 2013 UTC (11 years, 2 months ago) by yamt
Branch: yamt-pagecache
CVS Tags: yamt-pagecache-tag8
Changes since 1.4.2.4: +140 -5 lines
Diff to previous 1.4.2.4 (colored) to branchpoint 1.4 (colored) to selected 1.15.4.1 (colored)

sync with head

Revision 1.9 / (download) - annotate - [select for diffs], Mon Jan 14 21:26:25 2013 UTC (11 years, 2 months ago) by christos
Branch: MAIN
CVS Tags: yamt-pagecache-base8
Changes since 1.8: +139 -4 lines
Diff to previous 1.8 (colored) to selected 1.15.4.1 (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.8 / (download) - annotate - [select for diffs], Mon Jan 14 18:01:59 2013 UTC (11 years, 2 months ago) by christos
Branch: MAIN
Changes since 1.7: +3 -3 lines
Diff to previous 1.7 (colored) to selected 1.15.4.1 (colored)

Since mdocml decided to name headers that conflict with system ones (term.h)
move the header inclusion one up.

Revision 1.6.2.1 / (download) - annotate - [select for diffs], Tue Nov 20 03:03:02 2012 UTC (11 years, 4 months ago) by tls
Branch: tls-maxphys
Changes since 1.6: +33 -5 lines
Diff to previous 1.6 (colored) to selected 1.15.4.1 (colored)

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

Revision 1.4.2.4 / (download) - annotate - [select for diffs], Tue Oct 30 19:00:37 2012 UTC (11 years, 4 months ago) by yamt
Branch: yamt-pagecache
Changes since 1.4.2.3: +33 -5 lines
Diff to previous 1.4.2.3 (colored) to branchpoint 1.4 (colored) to selected 1.15.4.1 (colored)

sync with head

Revision 1.7 / (download) - annotate - [select for diffs], Sat Oct 6 15:33:59 2012 UTC (11 years, 5 months ago) by wiz
Branch: MAIN
CVS Tags: yamt-pagecache-base7, yamt-pagecache-base6
Changes since 1.6: +33 -5 lines
Diff to previous 1.6 (colored) to selected 1.15.4.1 (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.4.2.3 / (download) - annotate - [select for diffs], Wed May 23 10:08:29 2012 UTC (11 years, 10 months ago) by yamt
Branch: yamt-pagecache
Changes since 1.4.2.2: +8 -5 lines
Diff to previous 1.4.2.2 (colored) to branchpoint 1.4 (colored) to selected 1.15.4.1 (colored)

sync with head.

Revision 1.6 / (download) - annotate - [select for diffs], Thu May 10 15:36:09 2012 UTC (11 years, 10 months ago) by joerg
Branch: MAIN
CVS Tags: yamt-pagecache-base5
Branch point for: tls-maxphys
Changes since 1.5: +4 -3 lines
Diff to previous 1.5 (colored) to selected 1.15.4.1 (colored)

KNF

Revision 1.2.2.2 / (download) - annotate - [select for diffs], Wed May 9 03:41:00 2012 UTC (11 years, 10 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, 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.2.2.1: +6 -4 lines
Diff to previous 1.2.2.1 (colored) to branchpoint 1.2 (colored) next main 1.3 (colored) to selected 1.15.4.1 (colored)

Pull up following revision(s) (requested by wiz in ticket #229):
	usr.sbin/makemandb/makemandb.c: revision 1.9
	usr.sbin/makemandb/DBSCHEMA: revision 1.2
	usr.sbin/makemandb/apropos-utils.c: revision 1.5
	usr.sbin/makemandb/apropos-utils.h: revision 1.3
PR 46419 by Abhinav Upadhyay using his updated patch:
Clean up after removing man page aliases.

Revision 1.5 / (download) - annotate - [select for diffs], Mon May 7 11:18:16 2012 UTC (11 years, 10 months ago) by wiz
Branch: MAIN
Changes since 1.4: +6 -4 lines
Diff to previous 1.4 (colored) to selected 1.15.4.1 (colored)

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

Revision 1.2.2.1 / (download) - annotate - [select for diffs], Thu Apr 19 20:03:00 2012 UTC (11 years, 11 months ago) by riz
Branch: netbsd-6
Changes since 1.2: +18 -7 lines
Diff to previous 1.2 (colored) to selected 1.15.4.1 (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.4.2.2 / (download) - annotate - [select for diffs], Tue Apr 17 00:09:49 2012 UTC (11 years, 11 months ago) by yamt
Branch: yamt-pagecache
Changes since 1.4.2.1: +766 -0 lines
Diff to previous 1.4.2.1 (colored) to branchpoint 1.4 (colored) to selected 1.15.4.1 (colored)

sync with head

Revision 1.4.2.1, Sun Apr 15 15:56:52 2012 UTC (11 years, 11 months ago) by yamt
Branch: yamt-pagecache
Changes since 1.4: +0 -766 lines
FILE REMOVED

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

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

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

Revision 1.3 / (download) - annotate - [select for diffs], Sat Apr 7 10:44:58 2012 UTC (11 years, 11 months ago) by apb
Branch: MAIN
Changes since 1.2: +13 -7 lines
Diff to previous 1.2 (colored) to selected 1.15.4.1 (colored)

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".

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

Fix C&P error with $NetBSD$

Revision 1.1 / (download) - annotate - [select for diffs], Tue Feb 7 19:13:32 2012 UTC (12 years, 1 month ago) by joerg
Branch: MAIN
Diff to selected 1.15.4.1 (colored)

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>