Author: scottl
Date: Sun Nov 15 20:24:59 2020
New Revision: 367711
URL: https://svnweb.freebsd.org/changeset/base/367711
Log:
Revert the whole getlocalbase() set of changes while a different design is
hashed out.
Deleted:
head/lib/libutil/getlocalbase.3
head/lib/libutil/getlocalbase.c
Modified:
head/lib/libutil/Makefile
head/lib/libutil/libutil.h
head/sbin/nvmecontrol/comnd.c
head/sbin/nvmecontrol/comnd.h
head/sbin/nvmecontrol/nvmecontrol.c
head/usr.sbin/mailwrapper/mailwrapper.c
head/usr.sbin/pkg/Makefile
head/usr.sbin/pkg/pkg.c
Modified: head/lib/libutil/Makefile
==============================================================================
--- head/lib/libutil/Makefile Sun Nov 15 14:04:27 2020 (r367710)
+++ head/lib/libutil/Makefile Sun Nov 15 20:24:59 2020 (r367711)
@@ -12,8 +12,7 @@ PACKAGE= runtime
LIB= util
SHLIB_MAJOR= 9
-SRCS= _secure_path.c auth.c expand_number.c flopen.c fparseln.c \
- getlocalbase.c gr_util.c \
+SRCS= _secure_path.c auth.c expand_number.c flopen.c fparseln.c gr_util.c \
hexdump.c humanize_number.c kinfo_getfile.c \
kinfo_getallproc.c kinfo_getproc.c kinfo_getvmmap.c \
kinfo_getvmobject.c kld.c \
@@ -31,7 +30,7 @@ CFLAGS+= -DINET6
CFLAGS+= -I${.CURDIR} -I${SRCTOP}/lib/libc/gen/
-MAN+= expand_number.3 flopen.3 fparseln.3 getlocalbase.3 hexdump.3 \
+MAN+= expand_number.3 flopen.3 fparseln.3 hexdump.3 \
humanize_number.3 kinfo_getallproc.3 kinfo_getfile.3 \
kinfo_getproc.3 kinfo_getvmmap.3 kinfo_getvmobject.3 kld.3 \
login_auth.3 login_cap.3 \
Modified: head/lib/libutil/libutil.h
==============================================================================
--- head/lib/libutil/libutil.h Sun Nov 15 14:04:27 2020 (r367710)
+++ head/lib/libutil/libutil.h Sun Nov 15 20:24:59 2020 (r367711)
@@ -65,11 +65,6 @@ typedef __size_t size_t;
#define _SIZE_T_DECLARED
#endif
-#ifndef _SSIZE_T_DECLARED
-typedef __ssize_t ssize_t;
-#define _SSIZE_T_DECLARED
-#endif
-
#ifndef _UID_T_DECLARED
typedef __uid_t uid_t;
#define _UID_T_DECLARED
@@ -103,7 +98,6 @@ int flopen(const char *_path, int _flags, ...);
int flopenat(int _dirfd, const char *_path, int _flags, ...);
int forkpty(int *_amaster, char *_name,
struct termios *_termp, struct winsize *_winp);
-ssize_t getlocalbase(char *path, size_t pathlen);
void hexdump(const void *_ptr, int _length, const char *_hdr, int _flags);
int humanize_number(char *_buf, size_t _len, int64_t _number,
const char *_suffix, int _scale, int _flags);
Modified: head/sbin/nvmecontrol/comnd.c
==============================================================================
--- head/sbin/nvmecontrol/comnd.c Sun Nov 15 14:04:27 2020
(r367710)
+++ head/sbin/nvmecontrol/comnd.c Sun Nov 15 20:24:59 2020
(r367711)
@@ -287,7 +287,7 @@ bad_arg:
* Loads all the .so's from the specified directory.
*/
void
-cmd_load_dir(char *dir, cmd_load_cb_t cb, void *argp)
+cmd_load_dir(const char *dir __unused, cmd_load_cb_t cb __unused, void *argp
__unused)
{
DIR *d;
struct dirent *dent;
Modified: head/sbin/nvmecontrol/comnd.h
==============================================================================
--- head/sbin/nvmecontrol/comnd.h Sun Nov 15 14:04:27 2020
(r367710)
+++ head/sbin/nvmecontrol/comnd.h Sun Nov 15 20:24:59 2020
(r367711)
@@ -96,7 +96,7 @@ void cmd_register(struct cmd *, struct cmd *);
int arg_parse(int argc, char * const *argv, const struct cmd *f);
void arg_help(int argc, char * const *argv, const struct cmd *f);
void cmd_init(void);
-void cmd_load_dir(char *dir, cmd_load_cb_t *cb, void *argp);
+void cmd_load_dir(const char *dir, cmd_load_cb_t *cb, void *argp);
int cmd_dispatch(int argc, char *argv[], const struct cmd *);
#endif /* COMND_H */
Modified: head/sbin/nvmecontrol/nvmecontrol.c
==============================================================================
--- head/sbin/nvmecontrol/nvmecontrol.c Sun Nov 15 14:04:27 2020
(r367710)
+++ head/sbin/nvmecontrol/nvmecontrol.c Sun Nov 15 20:24:59 2020
(r367711)
@@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$");
#include <err.h>
#include <errno.h>
#include <fcntl.h>
-#include <libutil.h>
#include <paths.h>
#include <stdbool.h>
#include <stddef.h>
@@ -179,17 +178,11 @@ get_nsid(int fd, char **ctrlr_str, uint32_t *nsid)
int
main(int argc, char *argv[])
{
- char locallib[MAXPATHLEN];
- size_t len;
cmd_init();
- snprintf(locallib, MAXPATHLEN, "/lib/nvmecontrol");
- cmd_load_dir(locallib, NULL, NULL);
- if ((len = getlocalbase(locallib, MAXPATHLEN)) > 0) {
- strlcat(locallib, "/lib/nvmecontrol", MAXPATHLEN);
- cmd_load_dir(locallib, NULL, NULL);
- }
+ cmd_load_dir("/lib/nvmecontrol", NULL, NULL);
+ cmd_load_dir(_PATH_LOCALBASE "/lib/nvmecontrol", NULL, NULL);
cmd_dispatch(argc, argv, NULL);
Modified: head/usr.sbin/mailwrapper/mailwrapper.c
==============================================================================
--- head/usr.sbin/mailwrapper/mailwrapper.c Sun Nov 15 14:04:27 2020
(r367710)
+++ head/usr.sbin/mailwrapper/mailwrapper.c Sun Nov 15 20:24:59 2020
(r367711)
@@ -105,10 +105,8 @@ main(int argc, char *argv[], char *envp[])
initarg(&al);
addarg(&al, argv[0]);
- if ((len = getlocalbase(localmailerconf, MAXPATHLEN)) <= 0)
- err(EX_OSERR, "cannot determine local path");
-
- strlcat(localmailerconf, "/etc/mail/mailer.conf", MAXPATHLEN);
+ snprintf(localmailerconf, MAXPATHLEN, "%s/etc/mail/mailer.conf",
+ getenv("LOCALBASE") ? getenv("LOCALBASE") : _PATH_LOCALBASE);
mailerconf = localmailerconf;
if ((config = fopen(localmailerconf, "r")) == NULL)
Modified: head/usr.sbin/pkg/Makefile
==============================================================================
--- head/usr.sbin/pkg/Makefile Sun Nov 15 14:04:27 2020 (r367710)
+++ head/usr.sbin/pkg/Makefile Sun Nov 15 20:24:59 2020 (r367711)
@@ -25,6 +25,6 @@ MAN= pkg.7
CFLAGS+=-I${SRCTOP}/contrib/libucl/include
.PATH: ${SRCTOP}/contrib/libucl/include
-LIBADD= archive fetch ucl sbuf crypto ssl util
+LIBADD= archive fetch ucl sbuf crypto ssl
.include <bsd.prog.mk>
Modified: head/usr.sbin/pkg/pkg.c
==============================================================================
--- head/usr.sbin/pkg/pkg.c Sun Nov 15 14:04:27 2020 (r367710)
+++ head/usr.sbin/pkg/pkg.c Sun Nov 15 20:24:59 2020 (r367711)
@@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$");
#include <errno.h>
#include <fcntl.h>
#include <fetch.h>
-#include <libutil.h>
#include <paths.h>
#include <stdbool.h>
#include <stdlib.h>
@@ -1038,7 +1037,6 @@ main(int argc, char *argv[])
{
char pkgpath[MAXPATHLEN];
const char *pkgarg;
- size_t len;
int i;
bool bootstrap_only, force, yes;
@@ -1047,11 +1045,8 @@ main(int argc, char *argv[])
pkgarg = NULL;
yes = false;
- if ((len = getlocalbase(pkgpath, MAXPATHLEN)) <= 0) {
- fprintf(stderr, "Cannot determine local path\n");
- exit(EXIT_FAILURE);
- }
- strlcat(pkgpath, "/sbin/pkg", MAXPATHLEN);
+ snprintf(pkgpath, MAXPATHLEN, "%s/sbin/pkg",
+ getenv("LOCALBASE") ? getenv("LOCALBASE") : _PATH_LOCALBASE);
if (argc > 1 && strcmp(argv[1], "bootstrap") == 0) {
bootstrap_only = true;
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
