src-test2/usr.bin/locate, branch release/8.4.0

Merge three revisions from head:

2010-12-27T23:46:47Z

r214583 | wollman | 2010-10-30 22:36:05 -0400 (Sat, 30 Oct 2010) | 6 lines Changed paths: M /head/usr.bin/locate/locate/locate.rc M /head/usr.bin/locate/locate/updatedb.sh Make it possible to exclude directories by name no matter where they are in the filesystem from the locate database. By default, exclude ".zfs" directories, as users who who have set snapdir=visible and are taking frequent snapshots most likely do not want the snapshots included in the locate database. ------------------------------------------------------------------------ r214613 | wollman | 2010-10-31 21:51:47 -0400 (Sun, 31 Oct 2010) | 7 lines Changed paths: M /head/usr.bin/locate/locate/updatedb.sh jilles@ pointed out that using ${PRUNEDIRS:=".zfs"} in updatedb.sh made it impossible to override PRUNEDIRS to make it empty. Use the non-colon form to only set PRUNEDIRS if it is completely unset. (For parallelism, the other configuration defaults here could be done the same way, but that could be more obviously accomplished by disabling updatedb in periodic.conf, so leave them alone for now.) ------------------------------------------------------------------------ r214615 | wollman | 2010-10-31 22:20:18 -0400 (Sun, 31 Oct 2010) | 6 lines Changed paths: M /head/usr.bin/locate/locate/updatedb.sh Style cleanup: make this look more like a 21st-century shell script and not something out of the early 1980s. Make sure all error messages go to stderr, not stdout. Since there's error-handling code to handle empty SEARCHPATHS and FILESYSTEMS, use the initialization form that allows this error to be diagnosed. (hat tip: jilles@)

MFC r215752:

2010-11-27T00:46:57Z

Properly use SCHAR_MAX instead of CHAR_MAX for 0x7f. This fixes operation of locate(1) on systems on which char is unsigned by default (ARM and PowerPC). Reported by: Paul Mather

Move the check to ensure the locate database has the minimum required size

2009-07-24T13:40:25Z

when using mmap() before invoking mmap(). This avoids a confusing error message when locate is invoked against a zero-size database after the recent change to make mmap() fail requests to map 0 bytes. Submitted by: Jaakko Heinonen jh of saunalahti dot fi Approved by: re (kensmith) MFC after: 1 week

Signed/unsigned fixes, should be WARNS=2 clean now.

2009-04-02T21:44:55Z

Don't crash when we have an invalid count number.

2009-04-02T21:23:04Z

PR: bin/32686 Submitted by: Jaakko Heinonen MFC after: 1 week

Use RUSAGE_SELF for the current process instead of hardcoded value

2008-09-02T02:59:38Z

The previous version included too many file system types in the scan,

2007-10-17T07:27:51Z

since "local" includes also synthetic file systems (e.g. /dev, /proc) and loopback mounts. This version uses lsvfs to identify file system types that are local and additionally not synthetik, loopback mounts, or read-only. This has been suggested by Craig Rodrigues half a year ago. The patch that has been committed is based on his suggestion, but slightly modified. The comments in locate.rc have been updated to reflect the change and o include zfs and xfs in the example file system parameter that can be used to override the default outlined above. PR: 114101 Submitted by: rodrigc at crodrigues dot org (Craig Rodrigues) MFC: 2 weeks

Make the updatedb script installed as /usr/libexec/locate.updatedb

2007-10-15T22:09:19Z

inspect all local file systems, not only ufs and ext2fs. A number of local file systems has been added over time, and at least zfs has the potential to become a popular choice. Without this change a ZFS root file system causes the script to ignore all file-systems and leads to an empty locate db. (An alternative is to add all the relevant file systems individually, which means that at least zfs, xfs, ntfs, ntfs-3g, msdosfs should be added, probably more).

Update the default FILESYSTEMS value in a comment to note that ext2fs is

2007-07-19T21:00:08Z

included in the default list in the locate.updatedb script. Approved by: re (bmah) Inspired by: mwlucas

Markup fixes.

2006-09-29T15:20:48Z