system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-21 18:27:22 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

whereis: fix fetching of user.cs_path sysctl variable

Browse source 
The current implementation of sysctlbyname() does not support the user
sub-tree. This function exits with a return value of 0, but sets the
passed string buffer to an empty string.

As a result, the whereis program did not use the value of the sysctl
variable "user.cs_path", but only the value of the environment
variable "PATH".

This update makes whereis use the sysctl function with a fixed OID,
which already supports the user sub-tree.

MFC after:	3 days
This commit is contained in:
Stefan Eßer 2022-02-04 23:37:12 +01:00
parent 7510633e76
commit c454c57163
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
usr.bin/whereis/whereis.c
View file

@ -261,6 +261,7 @@ defaults(void)
DIR *dir;
struct stat sb;
struct dirent *dirp;
const int oid[2] = {CTL_USER, USER_CS_PATH};
/* default to -bms if none has been specified */
if (!opt_b && !opt_m && !opt_s)
@ -269,13 +270,12 @@ defaults(void)
/* -b defaults to default path + /usr/libexec +
* user's path */
if (!bindirs) {
if (sysctlbyname("user.cs_path", (void *)NULL, &s,
(void *)NULL, 0) == -1)
err(EX_OSERR, "sysctlbyname(\"user.cs_path\")");
if (sysctl(oid, 2, NULL, &s, NULL, 0) == -1)
err(EX_OSERR, "sysctl(\"user.cs_path\")");
if ((b = malloc(s + 1)) == NULL)
abort();
if (sysctlbyname("user.cs_path", b, &s, (void *)NULL, 0) == -1)
err(EX_OSERR, "sysctlbyname(\"user.cs_path\")");
if (sysctl(oid, 2, b, &s, NULL, 0) == -1)
err(EX_OSERR, "sysctl(\"user.cs_path\")");
nele = 0;
decolonify(b, &bindirs, &nele);
bindirs = realloc(bindirs, (nele + 2) * sizeof(char *));