d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

correct type of mmap len parameter

Browse Source 
Using locate -m on a database > 2GB should work now.

PR: 261277
This commit is contained in:
Wolfram Schneider 2022-01-19 19:20:11 +00:00
parent 170a0a8ebb
commit a97ce14abc
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.bin/locate/locate/fastfind.c
View File

@ -1,7 +1,7 @@
/*
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
* Copyright (c) 1995-2022 Wolfram Schneider <wosch@FreeBSD.org>
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
@ -119,7 +119,7 @@ fastfind_mmap
(pathpart, paddr, len, database)
char *pathpart; /* search string */
caddr_t paddr; /* mmap pointer */
int len; /* length of database */
off_t len; /* length of database */
char *database; /* for error message */

10
usr.bin/locate/locate/locate.c
View File

@ -1,7 +1,7 @@
/*
* SPDX-License-Identifier: BSD-4-Clause
*
* Copyright (c) 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
* Copyright (c) 1995-2022 Wolfram Schneider <wosch@FreeBSD.org>
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
@ -122,8 +122,8 @@ void usage(void);
void statistic(FILE *, char *);
void fastfind(FILE *, char *, char *);
void fastfind_icase(FILE *, char *, char *);
void fastfind_mmap(char *, caddr_t, int, char *);
void fastfind_mmap_icase(char *, caddr_t, int, char *);
void fastfind_mmap(char *, caddr_t, off_t, char *);
void fastfind_mmap_icase(char *, caddr_t, off_t, char *);
void search_mmap(char *, char **);
void search_fopen(char *, char **);
unsigned long cputime(void);
@ -314,9 +314,9 @@ search_mmap(char *db, char **s)
t0 = cputime();
#endif
if (f_icase)
fastfind_mmap_icase(*s, p, (int)len, db);
fastfind_mmap_icase(*s, p, len, db);
else
fastfind_mmap(*s, p, (int)len, db);
fastfind_mmap(*s, p, len, db);
#ifdef DEBUG
warnx("fastfind %ld ms", cputime () - t0);
#endif