aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuncaen <mail@duncano.de>2017-03-09 04:16:43 +0100
committerDuncaen <mail@duncano.de>2017-03-09 04:28:45 +0100
commitfd5af0336a48185f86ab77e94ce1c9ec9ef14e9a (patch)
tree0c822c01a5939f50c1a4cad8ff0ba6c8fa65cc65
parentd57ddb5fa408a448989d9bb2576b3e2278587768 (diff)
downloadlobase-fd5af0336a48185f86ab77e94ce1c9ec9ef14e9a.tar.gz
lib/liboutil: renamed from libutil
-rw-r--r--bin/date/Makefile2
-rw-r--r--bin/df/Makefile2
-rw-r--r--bin/ls/Makefile2
-rw-r--r--include/compat.h3
l---------include/imsg.h2
l---------include/ohash.h2
l---------include/util.h2
-rw-r--r--lib/Makefile2
-rw-r--r--lib/liboutil/Makefile (renamed from lib/libutil/Makefile)2
-rw-r--r--lib/liboutil/bcrypt_pbkdf.3 (renamed from lib/libutil/bcrypt_pbkdf.3)0
-rw-r--r--lib/liboutil/bcrypt_pbkdf.c (renamed from lib/libutil/bcrypt_pbkdf.c)0
-rw-r--r--lib/liboutil/check_expire.3 (renamed from lib/libutil/check_expire.3)0
-rw-r--r--lib/liboutil/check_expire.c (renamed from lib/libutil/check_expire.c)0
-rw-r--r--lib/liboutil/fmt_scaled.3 (renamed from lib/libutil/fmt_scaled.3)0
-rw-r--r--lib/liboutil/fmt_scaled.c (renamed from lib/libutil/fmt_scaled.c)0
-rw-r--r--lib/liboutil/fparseln.3 (renamed from lib/libutil/fparseln.3)0
-rw-r--r--lib/liboutil/fparseln.c (renamed from lib/libutil/fparseln.c)0
-rw-r--r--lib/liboutil/imsg-buffer.c (renamed from lib/libutil/imsg-buffer.c)0
-rw-r--r--lib/liboutil/imsg.c (renamed from lib/libutil/imsg.c)0
-rw-r--r--lib/liboutil/imsg.h (renamed from lib/libutil/imsg.h)0
-rw-r--r--lib/liboutil/imsg_init.3 (renamed from lib/libutil/imsg_init.3)0
-rw-r--r--lib/liboutil/isduid.3 (renamed from lib/libutil/isduid.3)0
-rw-r--r--lib/liboutil/logwtmp.c (renamed from lib/libutil/logwtmp.c)0
-rw-r--r--lib/liboutil/ohash.c (renamed from lib/libutil/ohash.c)0
-rw-r--r--lib/liboutil/ohash.h (renamed from lib/libutil/ohash.h)0
-rw-r--r--lib/liboutil/ohash_init.3 (renamed from lib/libutil/ohash_init.3)0
-rw-r--r--lib/liboutil/ohash_interval.3 (renamed from lib/libutil/ohash_interval.3)0
-rw-r--r--lib/liboutil/pidfile.3 (renamed from lib/libutil/pidfile.3)0
-rw-r--r--lib/liboutil/pidfile.c (renamed from lib/libutil/pidfile.c)0
-rw-r--r--lib/liboutil/pkcs5_pbkdf2.3 (renamed from lib/libutil/pkcs5_pbkdf2.3)0
-rw-r--r--lib/liboutil/pkcs5_pbkdf2.c (renamed from lib/libutil/pkcs5_pbkdf2.c)0
-rw-r--r--lib/liboutil/readlabel.c (renamed from lib/libutil/readlabel.c)0
-rw-r--r--lib/liboutil/readlabelfs.3 (renamed from lib/libutil/readlabelfs.3)0
-rw-r--r--lib/liboutil/shlib_version (renamed from lib/libutil/shlib_version)0
-rw-r--r--lib/liboutil/util.h (renamed from lib/libutil/util.h)0
-rw-r--r--lib/liboutil/uucplock.3 (renamed from lib/libutil/uucplock.3)0
-rw-r--r--lib/liboutil/uucplock.c (renamed from lib/libutil/uucplock.c)0
-rw-r--r--mk/bsd.prog.mk6
-rw-r--r--usr.bin/du/Makefile2
-rw-r--r--usr.bin/file/Makefile2
-rw-r--r--usr.bin/sdiff/Makefile2
-rw-r--r--usr.bin/tsort/Makefile2
-rw-r--r--usr.bin/wc/Makefile2
-rw-r--r--usr.sbin/rdate/Makefile2
44 files changed, 20 insertions, 17 deletions
diff --git a/bin/date/Makefile b/bin/date/Makefile
index dbf7a86..5460f6a 100644
--- a/bin/date/Makefile
+++ b/bin/date/Makefile
@@ -5,6 +5,6 @@
PROG= date
SRCS= date.c
DPADD+= ${LIBUTIL}
-LDADD+= -lutil
+LDADD+= -loutil
include ${.TOPDIR}/mk/bsd.prog.mk
diff --git a/bin/df/Makefile b/bin/df/Makefile
index 87277b2..9d50126 100644
--- a/bin/df/Makefile
+++ b/bin/df/Makefile
@@ -4,7 +4,7 @@
PROG= df
SRCS= df.c
-LDADD= -lutil
+LDADD= -loutil
DPADD= ${LIBUTIL}
include ${.TOPDIR}/mk/bsd.prog.mk
diff --git a/bin/ls/Makefile b/bin/ls/Makefile
index 22d62a6..077e0b7 100644
--- a/bin/ls/Makefile
+++ b/bin/ls/Makefile
@@ -5,7 +5,7 @@
PROG= ls
SRCS= cmp.c ls.c main.c print.c util.c utf8.c
DPADD= ${LIBUTIL}
-LDADD= -lutil
+LDADD= -loutil
CPPFLAGS+=-D_GNU_SOURCE
include ${.TOPDIR}/mk/bsd.prog.mk
diff --git a/include/compat.h b/include/compat.h
index 755eb7c..6882f4b 100644
--- a/include/compat.h
+++ b/include/compat.h
@@ -144,6 +144,9 @@ uintmax_t strtoumax(const char *, char **, int);
#define SHA512_Init SHA512Init
#define SHA512_Final SHA512Final
+/* sys/socket.h */
+#define RT_TABLEID_MAX 255
+
/* sys/syslimits.h */
#define CHILD_MAX 80 /* max simultaneous processes */
diff --git a/include/imsg.h b/include/imsg.h
index e0196ec..f23b290 120000
--- a/include/imsg.h
+++ b/include/imsg.h
@@ -1 +1 @@
-../lib/libutil/imsg.h \ No newline at end of file
+../lib/liboutil/imsg.h \ No newline at end of file
diff --git a/include/ohash.h b/include/ohash.h
index 1f11414..22a73d3 120000
--- a/include/ohash.h
+++ b/include/ohash.h
@@ -1 +1 @@
-../lib/libutil/ohash.h \ No newline at end of file
+../lib/liboutil/ohash.h \ No newline at end of file
diff --git a/include/util.h b/include/util.h
index df81d55..8c2c2b1 120000
--- a/include/util.h
+++ b/include/util.h
@@ -1 +1 @@
-../lib/libutil/util.h \ No newline at end of file
+../lib/liboutil/util.h \ No newline at end of file
diff --git a/lib/Makefile b/lib/Makefile
index 4ea9f4c..2fb00b3 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,3 +1,3 @@
TOPDIR?=..
-SUBDIR= libopenbsd libutil
+SUBDIR= libopenbsd liboutil
include ${.TOPDIR}/mk/bsd.subdir.mk
diff --git a/lib/libutil/Makefile b/lib/liboutil/Makefile
index 25fb4b3..42bc023 100644
--- a/lib/libutil/Makefile
+++ b/lib/liboutil/Makefile
@@ -4,7 +4,7 @@
.TOPDIR?=../..
.CURDIR?=.
-LIB= util
+LIB= outil
CPPFLAGS+=-D_GNU_SOURCE
HDRS= util.h imsg.h
diff --git a/lib/libutil/bcrypt_pbkdf.3 b/lib/liboutil/bcrypt_pbkdf.3
index eb43d43..eb43d43 100644
--- a/lib/libutil/bcrypt_pbkdf.3
+++ b/lib/liboutil/bcrypt_pbkdf.3
diff --git a/lib/libutil/bcrypt_pbkdf.c b/lib/liboutil/bcrypt_pbkdf.c
index cde347c..cde347c 100644
--- a/lib/libutil/bcrypt_pbkdf.c
+++ b/lib/liboutil/bcrypt_pbkdf.c
diff --git a/lib/libutil/check_expire.3 b/lib/liboutil/check_expire.3
index c2e8dab..c2e8dab 100644
--- a/lib/libutil/check_expire.3
+++ b/lib/liboutil/check_expire.3
diff --git a/lib/libutil/check_expire.c b/lib/liboutil/check_expire.c
index 7379cdb..7379cdb 100644
--- a/lib/libutil/check_expire.c
+++ b/lib/liboutil/check_expire.c
diff --git a/lib/libutil/fmt_scaled.3 b/lib/liboutil/fmt_scaled.3
index 6c45634..6c45634 100644
--- a/lib/libutil/fmt_scaled.3
+++ b/lib/liboutil/fmt_scaled.3
diff --git a/lib/libutil/fmt_scaled.c b/lib/liboutil/fmt_scaled.c
index eecbde7..eecbde7 100644
--- a/lib/libutil/fmt_scaled.c
+++ b/lib/liboutil/fmt_scaled.c
diff --git a/lib/libutil/fparseln.3 b/lib/liboutil/fparseln.3
index 5b7c787..5b7c787 100644
--- a/lib/libutil/fparseln.3
+++ b/lib/liboutil/fparseln.3
diff --git a/lib/libutil/fparseln.c b/lib/liboutil/fparseln.c
index b386e30..b386e30 100644
--- a/lib/libutil/fparseln.c
+++ b/lib/liboutil/fparseln.c
diff --git a/lib/libutil/imsg-buffer.c b/lib/liboutil/imsg-buffer.c
index 58c6655..58c6655 100644
--- a/lib/libutil/imsg-buffer.c
+++ b/lib/liboutil/imsg-buffer.c
diff --git a/lib/libutil/imsg.c b/lib/liboutil/imsg.c
index 9047997..9047997 100644
--- a/lib/libutil/imsg.c
+++ b/lib/liboutil/imsg.c
diff --git a/lib/libutil/imsg.h b/lib/liboutil/imsg.h
index 8994657..8994657 100644
--- a/lib/libutil/imsg.h
+++ b/lib/liboutil/imsg.h
diff --git a/lib/libutil/imsg_init.3 b/lib/liboutil/imsg_init.3
index cf66e17..cf66e17 100644
--- a/lib/libutil/imsg_init.3
+++ b/lib/liboutil/imsg_init.3
diff --git a/lib/libutil/isduid.3 b/lib/liboutil/isduid.3
index 4c5143a..4c5143a 100644
--- a/lib/libutil/isduid.3
+++ b/lib/liboutil/isduid.3
diff --git a/lib/libutil/logwtmp.c b/lib/liboutil/logwtmp.c
index 0919000..0919000 100644
--- a/lib/libutil/logwtmp.c
+++ b/lib/liboutil/logwtmp.c
diff --git a/lib/libutil/ohash.c b/lib/liboutil/ohash.c
index 74ca4fa..74ca4fa 100644
--- a/lib/libutil/ohash.c
+++ b/lib/liboutil/ohash.c
diff --git a/lib/libutil/ohash.h b/lib/liboutil/ohash.h
index c5f81ec..c5f81ec 100644
--- a/lib/libutil/ohash.h
+++ b/lib/liboutil/ohash.h
diff --git a/lib/libutil/ohash_init.3 b/lib/liboutil/ohash_init.3
index 6832563..6832563 100644
--- a/lib/libutil/ohash_init.3
+++ b/lib/liboutil/ohash_init.3
diff --git a/lib/libutil/ohash_interval.3 b/lib/liboutil/ohash_interval.3
index f174a6f..f174a6f 100644
--- a/lib/libutil/ohash_interval.3
+++ b/lib/liboutil/ohash_interval.3
diff --git a/lib/libutil/pidfile.3 b/lib/liboutil/pidfile.3
index 2ecbb6b..2ecbb6b 100644
--- a/lib/libutil/pidfile.3
+++ b/lib/liboutil/pidfile.3
diff --git a/lib/libutil/pidfile.c b/lib/liboutil/pidfile.c
index af049d1..af049d1 100644
--- a/lib/libutil/pidfile.c
+++ b/lib/liboutil/pidfile.c
diff --git a/lib/libutil/pkcs5_pbkdf2.3 b/lib/liboutil/pkcs5_pbkdf2.3
index 07b0887..07b0887 100644
--- a/lib/libutil/pkcs5_pbkdf2.3
+++ b/lib/liboutil/pkcs5_pbkdf2.3
diff --git a/lib/libutil/pkcs5_pbkdf2.c b/lib/liboutil/pkcs5_pbkdf2.c
index 789a712..789a712 100644
--- a/lib/libutil/pkcs5_pbkdf2.c
+++ b/lib/liboutil/pkcs5_pbkdf2.c
diff --git a/lib/libutil/readlabel.c b/lib/liboutil/readlabel.c
index e2cee31..e2cee31 100644
--- a/lib/libutil/readlabel.c
+++ b/lib/liboutil/readlabel.c
diff --git a/lib/libutil/readlabelfs.3 b/lib/liboutil/readlabelfs.3
index 8bd0169..8bd0169 100644
--- a/lib/libutil/readlabelfs.3
+++ b/lib/liboutil/readlabelfs.3
diff --git a/lib/libutil/shlib_version b/lib/liboutil/shlib_version
index eb2c603..eb2c603 100644
--- a/lib/libutil/shlib_version
+++ b/lib/liboutil/shlib_version
diff --git a/lib/libutil/util.h b/lib/liboutil/util.h
index 83ac040..83ac040 100644
--- a/lib/libutil/util.h
+++ b/lib/liboutil/util.h
diff --git a/lib/libutil/uucplock.3 b/lib/liboutil/uucplock.3
index b94f61c..b94f61c 100644
--- a/lib/libutil/uucplock.3
+++ b/lib/liboutil/uucplock.3
diff --git a/lib/libutil/uucplock.c b/lib/liboutil/uucplock.c
index 59f8a27..59f8a27 100644
--- a/lib/libutil/uucplock.c
+++ b/lib/liboutil/uucplock.c
diff --git a/mk/bsd.prog.mk b/mk/bsd.prog.mk
index bc886e8..3316444 100644
--- a/mk/bsd.prog.mk
+++ b/mk/bsd.prog.mk
@@ -11,10 +11,10 @@ LIBPATHS+= ${.TOPDIR}/obj/lib ${.TOPDIR}/lib
_find_lib= $(firstword $(wildcard $(LIBPATHS:%=%/$(1))))
LIBC?= $(call _find_lib,libopenbsd/libopenbsd.a)
-LIBUTIL?= $(call _find_lib,libutil/libutil.a)
+LIBOUTIL?= $(call _find_lib,liboutil/liboutil.a)
-ifeq (-lutil,$(filter -lutil,$(LDADD)))
-LDFLAGS+= -L$(dir $(LIBUTIL))
+ifeq (-loutil,$(filter -loutil,$(LDADD)))
+LDFLAGS+= -L$(dir $(LIBOUTIL))
endif
LDFLAGS+= -L$(dir $(LIBC)) $(LDADD) -lopenbsd
diff --git a/usr.bin/du/Makefile b/usr.bin/du/Makefile
index c42fa4a..2d865a2 100644
--- a/usr.bin/du/Makefile
+++ b/usr.bin/du/Makefile
@@ -4,6 +4,6 @@
PROG= du
DPADD= ${LIBUTIL}
-LDADD= -lutil
+LDADD= -loutil
include ${.TOPDIR}/mk/bsd.prog.mk
diff --git a/usr.bin/file/Makefile b/usr.bin/file/Makefile
index 5352ceb..1efc126 100644
--- a/usr.bin/file/Makefile
+++ b/usr.bin/file/Makefile
@@ -7,7 +7,7 @@ SRCS= file.c magic-dump.c magic-load.c magic-test.c magic-common.c \
text.c xmalloc.c
MAN= file.1 magic.5
-LDADD= -lutil
+LDADD= -loutil
DPADD= ${LIBUTIL}
CDIAGFLAGS+= -Wno-long-long -Wall -W -Wnested-externs -Wformat=2
diff --git a/usr.bin/sdiff/Makefile b/usr.bin/sdiff/Makefile
index 02f6042..b2ced48 100644
--- a/usr.bin/sdiff/Makefile
+++ b/usr.bin/sdiff/Makefile
@@ -6,7 +6,7 @@ PROG=sdiff
SRCS=common.c edit.c sdiff.c
COPTS+=-Wall -W
-LDADD+= -lutil
+LDADD+= -loutil
DPADD+= ${LIBUTIL}
include ${.TOPDIR}/mk/bsd.prog.mk
diff --git a/usr.bin/tsort/Makefile b/usr.bin/tsort/Makefile
index f217002..5f2bb9a 100644
--- a/usr.bin/tsort/Makefile
+++ b/usr.bin/tsort/Makefile
@@ -7,6 +7,6 @@ SRCS = tsort.c
CDIAGFLAGS = -Wall -Wno-char-subscripts -Wstrict-prototypes -pedantic -W
DPADD += ${LIBUTIL}
-LDADD += -lutil
+LDADD += -loutil
include ${.TOPDIR}/mk/bsd.prog.mk
diff --git a/usr.bin/wc/Makefile b/usr.bin/wc/Makefile
index 4470fc4..3166dad 100644
--- a/usr.bin/wc/Makefile
+++ b/usr.bin/wc/Makefile
@@ -4,6 +4,6 @@
PROG= wc
DPADD= ${LIBUTIL}
-LDADD= -lutil
+LDADD= -loutil
include ${.TOPDIR}/mk/bsd.prog.mk
diff --git a/usr.sbin/rdate/Makefile b/usr.sbin/rdate/Makefile
index a1b0ca7..c04efff 100644
--- a/usr.sbin/rdate/Makefile
+++ b/usr.sbin/rdate/Makefile
@@ -6,7 +6,7 @@ PROG= rdate
SRCS= rdate.c rfc868time.c ntp.c ntpleaps.c
CFLAGS+=-Wall
DPADD+= ${LIBUTIL}
-LDADD+= -lutil
+LDADD+= -loutil
MAN= rdate.8