diff options
Diffstat (limited to 'usr/src')
315 files changed, 1910 insertions, 20494 deletions
diff --git a/usr/src/Makefile b/usr/src/Makefile index 8fea9a9e02..e29a4c518a 100644 --- a/usr/src/Makefile +++ b/usr/src/Makefile @@ -26,7 +26,7 @@ # Copyright 2015 OmniTI Computer Consulting, Inc. All rights reserved. # Copyright 2016 Toomas Soome <tsoome@me.com> # Copyright 2018 Joyent, Inc. -# Copyright 2018 OmniOS Community Edition (OmniOSce) Association. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # # @@ -201,9 +201,6 @@ bldtools: rootdirs: $(ROOTDIRS) $(INS) -d -m 775 $(ROOT)/var/mail/:saved -lint: FRC - $(MAKE) -f Makefile.lint - _msgdirs: $(MSGDIRS) $(ROOTDIRS) $(MSGDIRS): diff --git a/usr/src/Makefile.lint b/usr/src/Makefile.lint deleted file mode 100644 index 31463cf952..0000000000 --- a/usr/src/Makefile.lint +++ /dev/null @@ -1,515 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# - -# -# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. -# Copyright (c) 2012 by Delphix. All rights reserved. -# Copyright 2015 Garrett D'Amore <garrett@damore.org> -# Copyright 2018 Nexenta Systems, Inc. -# Copyright 2018 Joyent, Inc. -# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. -# - -# include global definitions -include Makefile.master - -# -# As pieces are made lint-clean, add them here so the nightly build -# can be used to keep them that way. -# -COMMON_SUBDIRS = \ - cmd/acctadm \ - cmd/asa \ - cmd/amt \ - cmd/audio/audioctl \ - cmd/audio/audiotest \ - cmd/audit \ - cmd/auditconfig \ - cmd/auditd \ - cmd/auditreduce \ - cmd/auditstat \ - cmd/auths \ - cmd/autopush \ - cmd/availdevs \ - cmd/awk \ - cmd/banner \ - cmd/bart \ - cmd/basename \ - cmd/bdiff \ - cmd/busstat \ - cmd/boot \ - cmd/cal \ - cmd/captoinfo \ - cmd/cat \ - cmd/cdrw \ - cmd/cfgadm \ - cmd/checkeq \ - cmd/checknr \ - cmd/chgrp \ - cmd/chmod \ - cmd/chown \ - cmd/chroot \ - cmd/clinfo \ - cmd/cmd-crypto \ - cmd/cmd-inet/lib \ - cmd/cmd-inet/lib/netcfgd \ - cmd/cmd-inet/lib/nwamd \ - cmd/cmd-inet/sbin \ - cmd/cmd-inet/usr.bin \ - cmd/cmd-inet/usr.lib/bridged \ - cmd/cmd-inet/usr.lib/ilbd \ - cmd/cmd-inet/usr.lib/in.mpathd \ - cmd/cmd-inet/usr.lib/in.ndpd \ - cmd/cmd-inet/usr.lib/inetd \ - cmd/cmd-inet/usr.lib/pppoe \ - cmd/cmd-inet/usr.lib/slpd \ - cmd/cmd-inet/usr.lib/vrrpd \ - cmd/cmd-inet/usr.lib/wpad \ - cmd/cmd-inet/usr.sadm \ - cmd/cmd-inet/usr.sbin \ - cmd/cmd-inet/usr.sbin/ilbadm \ - cmd/cmd-inet/usr.sbin/nwamadm \ - cmd/cmd-inet/usr.sbin/nwamcfg \ - cmd/col \ - cmd/column \ - cmd/compress \ - cmd/consadm \ - cmd/coreadm \ - cmd/cpc \ - cmd/cpio \ - cmd/crypt \ - cmd/csplit \ - cmd/ctfdump \ - cmd/ctrun \ - cmd/ctstat \ - cmd/ctwatch \ - cmd/date \ - cmd/dd \ - cmd/deroff \ - cmd/devctl \ - cmd/devfsadm \ - cmd/devinfo \ - cmd/devmgmt \ - cmd/devprop \ - cmd/dfs.cmds \ - cmd/diff3 \ - cmd/dis \ - cmd/dirname \ - cmd/diskscan \ - cmd/dispadmin \ - cmd/dladm \ - cmd/dlmgmtd \ - cmd/dtrace \ - cmd/du \ - cmd/dumpadm \ - cmd/dumpcs \ - cmd/echo \ - cmd/eject \ - cmd/emul64ioctl \ - cmd/env \ - cmd/expand \ - cmd/fcinfo \ - cmd/fdetach \ - cmd/fdformat \ - cmd/fdisk \ - cmd/file \ - cmd/find \ - cmd/fmthard \ - cmd/fmtmsg \ - cmd/fold \ - cmd/fm \ - cmd/format \ - cmd/fs.d/fd \ - cmd/fs.d/lofs/mount \ - cmd/fs.d/mntfs \ - cmd/fs.d/pcfs/mount \ - cmd/fs.d/proc \ - cmd/fs.d/tmpfs \ - cmd/fs.d/udfs/mount \ - cmd/fs.d/ufs/mount \ - cmd/fs.d/ufs/fsirand\ - cmd/fs.d/zfs/fstyp \ - cmd/fwflash \ - cmd/fuser \ - cmd/gcore \ - cmd/genmsg \ - cmd/getconf \ - cmd/getdevpolicy \ - cmd/getfacl \ - cmd/getopt \ - cmd/gettext \ - cmd/grep \ - cmd/groups \ - cmd/halt \ - cmd/head \ - cmd/hostid \ - cmd/hostname \ - cmd/hotplug \ - cmd/hotplugd \ - cmd/idmap \ - cmd/init \ - cmd/intrstat \ - cmd/ipcrm \ - cmd/ipcs \ - cmd/isaexec \ - cmd/isalist \ - cmd/iscsiadm \ - cmd/iscsid \ - cmd/iscsitsvc \ - cmd/isns \ - cmd/itadm \ - cmd/kbd \ - cmd/killall \ - cmd/ldap \ - cmd/last \ - cmd/lastcomm \ - cmd/ldapcachemgr \ - cmd/line \ - cmd/link \ - cmd/locator \ - cmd/localedef \ - cmd/lockstat \ - cmd/lofiadm \ - cmd/logadm \ - cmd/logger \ - cmd/login \ - cmd/logins \ - cmd/ls \ - cmd/luxadm \ - cmd/machid \ - cmd/mailwrapper \ - cmd/makekey \ - cmd/mdb \ - cmd/mesg \ - cmd/mkdir \ - cmd/mkfifo \ - cmd/mkfile \ - cmd/mkmsgs \ - cmd/mknod \ - cmd/mpathadm \ - cmd/modload \ - cmd/msgfmt \ - cmd/msgid \ - cmd/mt \ - cmd/mv \ - cmd/ndmpadm \ - cmd/ndmpd \ - cmd/ndmpstat \ - cmd/newform \ - cmd/newgrp \ - cmd/newtask \ - cmd/nice \ - cmd/nl \ - cmd/nohup \ - cmd/nscd \ - cmd/od \ - cmd/pagesize \ - cmd/passwd \ - cmd/pathchk \ - cmd/pbind \ - cmd/pcidr \ - cmd/pcitool \ - cmd/pfexec \ - cmd/pgrep \ - cmd/picl/picld \ - cmd/picl/prtpicl \ - cmd/plockstat \ - cmd/pools \ - cmd/power \ - cmd/powertop \ - cmd/printf \ - cmd/latencytop \ - cmd/ppgsz \ - cmd/pptadm \ - cmd/praudit \ - cmd/prctl \ - cmd/priocntl \ - cmd/profiles \ - cmd/prstat \ - cmd/prtconf \ - cmd/prtdiag \ - cmd/prtvtoc \ - cmd/ps \ - cmd/psradm \ - cmd/psrinfo \ - cmd/psrset \ - cmd/ptools \ - cmd/pwck \ - cmd/pwconv \ - cmd/ramdiskadm \ - cmd/raidctl \ - cmd/rcap \ - cmd/rcm_daemon \ - cmd/rctladm \ - cmd/renice \ - cmd/rm \ - cmd/rmdir \ - cmd/rmformat \ - cmd/rmt \ - cmd/roles \ - cmd/rpcgen \ - cmd/rpcsvc/rpc.bootparamd \ - cmd/runat \ - cmd/savecore \ - cmd/sbdadm \ - cmd/sdpadm \ - cmd/sed \ - cmd/setpgrp \ - cmd/smbios \ - cmd/smbsrv \ - cmd/smserverd \ - cmd/sort \ - cmd/split \ - cmd/srptadm \ - cmd/srptsvc \ - cmd/stat \ - cmd/stmfadm \ - cmd/stmfsvc \ - cmd/stmsboot \ - cmd/streams/strcmd \ - cmd/strings \ - cmd/su \ - cmd/sulogin \ - cmd/svc \ - cmd/swap \ - cmd/sync \ - cmd/syseventadm \ - cmd/syseventd \ - cmd/syslogd \ - cmd/tabs \ - cmd/tail \ - cmd/th_tools \ - cmd/touch \ - cmd/tr \ - cmd/truss \ - cmd/tty \ - cmd/tzreload \ - cmd/uadmin \ - cmd/ul \ - cmd/userattr \ - cmd/users \ - cmd/utmp_update \ - cmd/utmpd \ - cmd/valtools \ - cmd/vrrpadm \ - cmd/vt \ - cmd/wall \ - cmd/who \ - cmd/whodo \ - cmd/wracct \ - cmd/xargs \ - cmd/xstr \ - cmd/yes \ - cmd/yppasswd \ - cmd/zdb \ - cmd/zdump \ - cmd/zfs \ - cmd/zhack \ - cmd/zinject \ - cmd/zlogin \ - cmd/zoneadm \ - cmd/zoneadmd \ - cmd/zonecfg \ - cmd/zonename \ - cmd/zpool \ - cmd/zlook \ - cmd/ztest \ - lib/abi \ - lib/auditd_plugins \ - lib/libbe \ - lib/pylibbe \ - lib/brand/sn1 \ - lib/brand/solaris10 \ - lib/crypt_modules \ - lib/extendedFILE \ - lib/libadm \ - lib/libadutils \ - lib/libadt_jni \ - lib/libaio \ - lib/libavl \ - lib/libbrand \ - lib/libbsdmalloc \ - lib/libbsm \ - lib/libc_db \ - lib/libcfgadm \ - lib/libcmdutils \ - lib/libcommputil \ - lib/libcontract \ - lib/libcryptoutil \ - lib/libctf \ - lib/libdevice \ - lib/libdevid \ - lib/libdevinfo \ - lib/libdhcpagent \ - lib/libdhcputil \ - lib/libdisasm \ - lib/libdiskmgt \ - lib/libdladm \ - lib/libdlpi \ - lib/libdoor \ - lib/libdtrace \ - lib/libefi \ - lib/libelfsign \ - lib/libexacct \ - lib/libfcoe \ - lib/libgen \ - lib/libgrubmgmt \ - lib/libgss \ - lib/libhotplug \ - lib/libidmap \ - lib/libilb \ - lib/libinetsvc \ - lib/libinetutil \ - lib/libinstzones \ - lib/libipadm \ - lib/libipmi \ - lib/libipmp \ - lib/libipp \ - lib/libipsecutil \ - lib/libiscsit \ - lib/libkmf \ - lib/libkstat \ - lib/liblgrp \ - lib/liblm \ - lib/libm \ - lib/libm1 \ - lib/libmvec \ - lib/libmalloc \ - lib/libmapmalloc \ - lib/libmapid \ - lib/libmd \ - lib/libmp \ - lib/libmtmalloc \ - lib/libndmp \ - lib/libnsl \ - lib/libnvpair \ - lib/libnwam \ - lib/libpam \ - lib/libpctx \ - lib/libpicl \ - lib/libpicltree \ - lib/libpkg \ - lib/libpool \ - lib/libppt \ - lib/libproc \ - lib/libpthread \ - lib/libraidcfg \ - lib/librcm \ - lib/libreparse \ - lib/librestart \ - lib/librstp \ - lib/librt \ - lib/libscf \ - lib/libsec \ - lib/libsecdb \ - lib/libsendfile \ - lib/libsip \ - lib/libshare \ - lib/libsldap \ - lib/libslp \ - lib/libsmbfs \ - lib/libsmbios \ - lib/libsmedia \ - lib/libsrpt \ - lib/libstmf \ - lib/libsun_ima \ - lib/libsysevent \ - lib/libthread \ - lib/libtsnet \ - lib/libtsol \ - lib/libumem \ - lib/libuuid \ - lib/libuutil \ - lib/libvrrpadm \ - lib/libxnet \ - lib/libzfs \ - lib/libzfs_jni \ - lib/libzonecfg \ - lib/libzoneinfo \ - lib/madv \ - lib/mpss \ - lib/nametoaddr \ - lib/ncad_addr \ - lib/nsswitch \ - lib/pam_modules \ - lib/passwdutil \ - lib/pkcs11 \ - lib/raidcfg_plugins \ - lib/scsi \ - lib/smbsrv \ - lib/fm \ - lib/udapl \ - lib/watchmalloc \ - psm \ - test \ - ucbcmd/basename \ - ucbcmd/biff \ - ucbcmd/echo \ - ucbcmd/groups \ - ucbcmd/mkstr \ - ucbcmd/printenv \ - ucbcmd/sum \ - ucbcmd/test \ - ucbcmd/users \ - ucbcmd/whoami - -i386_SUBDIRS= \ - cmd/acpihpd \ - cmd/biosdev \ - cmd/rtc \ - cmd/ucodeadm \ - lib/brand/lx \ - lib/cfgadm_plugins/sata \ - lib/cfgadm_plugins/sbd \ - lib/libfdisk - -sparc_SUBDIRS= \ - cmd/datadm \ - cmd/dcs \ - cmd/drd \ - cmd/fruadm \ - cmd/ldmad \ - cmd/prtdscp \ - cmd/prtfru \ - cmd/sckmd \ - cmd/virtinfo \ - cmd/vntsd \ - lib/libds \ - lib/libdscp \ - lib/libpri \ - lib/libpcp \ - lib/libtsalarm \ - lib/libv12n \ - lib/storage \ - stand - -LINTSUBDIRS= $(COMMON_SUBDIRS) $($(MACH)_SUBDIRS) - -.PARALLEL: $(LINTSUBDIRS) - -lint: uts .WAIT subdirs - -subdirs: $(LINTSUBDIRS) - -uts $(LINTSUBDIRS): FRC - @cd $@; pwd; $(MAKE) lint - -FRC: diff --git a/usr/src/Targetdirs b/usr/src/Targetdirs index 87c79379af..7e0a37543f 100644 --- a/usr/src/Targetdirs +++ b/usr/src/Targetdirs @@ -677,27 +677,13 @@ $(DIRLINKS:%=$(ROOT)%):= \ # have actually been moved to usr/lib # Rather than adding another set of rules, we add usr/lib/lwp files here $(ROOT)/usr/ccs/lib/libcurses.so:= REALPATH=../../../lib/libcurses.so.1 -$(ROOT)/usr/ccs/lib/llib-lcurses:= REALPATH=../../../lib/llib-lcurses -$(ROOT)/usr/ccs/lib/llib-lcurses.ln:= REALPATH=../../../lib/llib-lcurses.ln $(ROOT)/usr/ccs/lib/libform.so:= REALPATH=../../lib/libform.so.1 -$(ROOT)/usr/ccs/lib/llib-lform:= REALPATH=../../lib/llib-lform -$(ROOT)/usr/ccs/lib/llib-lform.ln:= REALPATH=../../lib/llib-lform.ln $(ROOT)/usr/ccs/lib/libgen.so:= REALPATH=../../../lib/libgen.so.1 -$(ROOT)/usr/ccs/lib/llib-lgen:= REALPATH=../../../lib/llib-lgen -$(ROOT)/usr/ccs/lib/llib-lgen.ln:= REALPATH=../../../lib/llib-lgen.ln $(ROOT)/usr/ccs/lib/libmalloc.so:= REALPATH=../../lib/libmalloc.so.1 $(ROOT)/usr/ccs/lib/libmenu.so:= REALPATH=../../lib/libmenu.so.1 -$(ROOT)/usr/ccs/lib/llib-lmenu:= REALPATH=../../lib/llib-lmenu -$(ROOT)/usr/ccs/lib/llib-lmenu.ln:= REALPATH=../../lib/llib-lmenu.ln $(ROOT)/usr/ccs/lib/libpanel.so:= REALPATH=../../lib/libpanel.so.1 -$(ROOT)/usr/ccs/lib/llib-lpanel:= REALPATH=../../lib/llib-lpanel -$(ROOT)/usr/ccs/lib/llib-lpanel.ln:= REALPATH=../../lib/llib-lpanel.ln $(ROOT)/usr/ccs/lib/libtermlib.so:= REALPATH=../../../lib/libcurses.so.1 -$(ROOT)/usr/ccs/lib/llib-ltermlib:= REALPATH=../../../lib/llib-lcurses -$(ROOT)/usr/ccs/lib/llib-ltermlib.ln:= REALPATH=../../../lib/llib-lcurses.ln $(ROOT)/usr/ccs/lib/libtermcap.so:= REALPATH=../../../lib/libtermcap.so.1 -$(ROOT)/usr/ccs/lib/llib-ltermcap:= REALPATH=../../../lib/llib-ltermcap -$(ROOT)/usr/ccs/lib/llib-ltermcap.ln:= REALPATH=../../../lib/llib-ltermcap.ln $(ROOT)/usr/ccs/lib/values-Xa.o:= REALPATH=../../lib/values-Xa.o $(ROOT)/usr/ccs/lib/values-Xc.o:= REALPATH=../../lib/values-Xc.o $(ROOT)/usr/ccs/lib/values-Xs.o:= REALPATH=../../lib/values-Xs.o @@ -712,34 +698,20 @@ $(ROOT)/usr/lib/lwp/libthread_db.so.1:= REALPATH=../libthread_db.so.1 # symlinks to populate usr/ccs/lib/$(MACH64) $(ROOT)/usr/ccs/lib/$(MACH64)/libcurses.so:= \ REALPATH=../../../../lib/$(MACH64)/libcurses.so.1 -$(ROOT)/usr/ccs/lib/$(MACH64)/llib-lcurses.ln:= \ - REALPATH=../../../../lib/$(MACH64)/llib-lcurses.ln $(ROOT)/usr/ccs/lib/$(MACH64)/libform.so:= \ REALPATH=../../../lib/$(MACH64)/libform.so.1 -$(ROOT)/usr/ccs/lib/$(MACH64)/llib-lform.ln:= \ - REALPATH=../../../lib/$(MACH64)/llib-lform.ln $(ROOT)/usr/ccs/lib/$(MACH64)/libgen.so:= \ REALPATH=../../../../lib/$(MACH64)/libgen.so.1 -$(ROOT)/usr/ccs/lib/$(MACH64)/llib-lgen.ln:= \ - REALPATH=../../../../lib/$(MACH64)/llib-lgen.ln $(ROOT)/usr/ccs/lib/$(MACH64)/libmalloc.so:= \ REALPATH=../../../lib/$(MACH64)/libmalloc.so.1 $(ROOT)/usr/ccs/lib/$(MACH64)/libmenu.so:= \ REALPATH=../../../lib/$(MACH64)/libmenu.so.1 -$(ROOT)/usr/ccs/lib/$(MACH64)/llib-lmenu.ln:= \ - REALPATH=../../../lib/$(MACH64)/llib-lmenu.ln $(ROOT)/usr/ccs/lib/$(MACH64)/libpanel.so:= \ REALPATH=../../../lib/$(MACH64)/libpanel.so.1 -$(ROOT)/usr/ccs/lib/$(MACH64)/llib-lpanel.ln:= \ - REALPATH=../../../lib/$(MACH64)/llib-lpanel.ln $(ROOT)/usr/ccs/lib/$(MACH64)/libtermlib.so:= \ REALPATH=../../../../lib/$(MACH64)/libcurses.so.1 -$(ROOT)/usr/ccs/lib/$(MACH64)/llib-ltermlib.ln:= \ - REALPATH=../../../../lib/$(MACH64)/llib-lcurses.ln $(ROOT)/usr/ccs/lib/$(MACH64)/libtermcap.so:= \ REALPATH=../../../../lib/$(MACH64)/libtermcap.so.1 -$(ROOT)/usr/ccs/lib/$(MACH64)/llib-ltermcap.ln:= \ - REALPATH=../../../../lib/$(MACH64)/llib-ltermcap.ln $(ROOT)/usr/ccs/lib/$(MACH64)/values-Xa.o:= \ REALPATH=../../../lib/$(MACH64)/values-Xa.o $(ROOT)/usr/ccs/lib/$(MACH64)/values-Xc.o:= \ @@ -763,27 +735,13 @@ $(ROOT)/usr/lib/lwp/$(MACH64)/libthread_db.so.1:= \ SYM.USRCCSLIB= \ /usr/ccs/lib/libcurses.so \ - /usr/ccs/lib/llib-lcurses \ - /usr/ccs/lib/llib-lcurses.ln \ /usr/ccs/lib/libform.so \ - /usr/ccs/lib/llib-lform \ - /usr/ccs/lib/llib-lform.ln \ /usr/ccs/lib/libgen.so \ - /usr/ccs/lib/llib-lgen \ - /usr/ccs/lib/llib-lgen.ln \ /usr/ccs/lib/libmalloc.so \ /usr/ccs/lib/libmenu.so \ - /usr/ccs/lib/llib-lmenu \ - /usr/ccs/lib/llib-lmenu.ln \ /usr/ccs/lib/libpanel.so \ - /usr/ccs/lib/llib-lpanel \ - /usr/ccs/lib/llib-lpanel.ln \ /usr/ccs/lib/libtermlib.so \ - /usr/ccs/lib/llib-ltermlib \ - /usr/ccs/lib/llib-ltermlib.ln \ /usr/ccs/lib/libtermcap.so \ - /usr/ccs/lib/llib-ltermcap \ - /usr/ccs/lib/llib-ltermcap.ln \ /usr/ccs/lib/values-Xa.o \ /usr/ccs/lib/values-Xc.o \ /usr/ccs/lib/values-Xs.o \ @@ -797,20 +755,13 @@ SYM.USRCCSLIB= \ SYM.USRCCSLIB64= \ /usr/ccs/lib/$(MACH64)/libcurses.so \ - /usr/ccs/lib/$(MACH64)/llib-lcurses.ln \ /usr/ccs/lib/$(MACH64)/libform.so \ - /usr/ccs/lib/$(MACH64)/llib-lform.ln \ /usr/ccs/lib/$(MACH64)/libgen.so \ - /usr/ccs/lib/$(MACH64)/llib-lgen.ln \ /usr/ccs/lib/$(MACH64)/libmalloc.so \ /usr/ccs/lib/$(MACH64)/libmenu.so \ - /usr/ccs/lib/$(MACH64)/llib-lmenu.ln \ /usr/ccs/lib/$(MACH64)/libpanel.so \ - /usr/ccs/lib/$(MACH64)/llib-lpanel.ln \ /usr/ccs/lib/$(MACH64)/libtermlib.so \ - /usr/ccs/lib/$(MACH64)/llib-ltermlib.ln \ /usr/ccs/lib/$(MACH64)/libtermcap.so \ - /usr/ccs/lib/$(MACH64)/llib-ltermcap.ln \ /usr/ccs/lib/$(MACH64)/values-Xa.o \ /usr/ccs/lib/$(MACH64)/values-Xc.o \ /usr/ccs/lib/$(MACH64)/values-Xs.o \ @@ -826,8 +777,6 @@ SYM.USRCCSLIB64= \ # from /usr/lib to /lib in order to live in the root filesystem. $(ROOT)/lib/libposix4.so.1:= REALPATH=librt.so.1 $(ROOT)/lib/libposix4.so:= REALPATH=libposix4.so.1 -$(ROOT)/lib/llib-lposix4:= REALPATH=llib-lrt -$(ROOT)/lib/llib-lposix4.ln:= REALPATH=llib-lrt.ln $(ROOT)/lib/libthread_db.so.1:= REALPATH=libc_db.so.1 $(ROOT)/lib/libthread_db.so:= REALPATH=libc_db.so.1 $(ROOT)/usr/lib/ld.so.1:= REALPATH=../../lib/ld.so.1 @@ -968,100 +917,6 @@ $(ROOT)/usr/lib/libzfs.so.1:= REALPATH=../../lib/libzfs.so.1 $(ROOT)/usr/lib/libzfs.so:= REALPATH=../../lib/libzfs.so.1 $(ROOT)/usr/lib/libzfs_core.so.1:= REALPATH=../../lib/libzfs_core.so.1 $(ROOT)/usr/lib/libzfs_core.so:= REALPATH=../../lib/libzfs_core.so.1 -$(ROOT)/usr/lib/llib-ladm.ln:= REALPATH=../../lib/llib-ladm.ln -$(ROOT)/usr/lib/llib-ladm:= REALPATH=../../lib/llib-ladm -$(ROOT)/usr/lib/llib-laio.ln:= REALPATH=../../lib/llib-laio.ln -$(ROOT)/usr/lib/llib-laio:= REALPATH=../../lib/llib-laio -$(ROOT)/usr/lib/llib-lavl.ln:= REALPATH=../../lib/llib-lavl.ln -$(ROOT)/usr/lib/llib-lavl:= REALPATH=../../lib/llib-lavl -$(ROOT)/usr/lib/llib-lbsm.ln:= REALPATH=../../lib/llib-lbsm.ln -$(ROOT)/usr/lib/llib-lbsm:= REALPATH=../../lib/llib-lbsm -$(ROOT)/usr/lib/llib-lcmdutils.ln:= REALPATH=../../lib/llib-lcmdutils.ln -$(ROOT)/usr/lib/llib-lcmdutils:= REALPATH=../../lib/llib-lcmdutils -$(ROOT)/usr/lib/llib-lcontract.ln:= REALPATH=../../lib/llib-lcontract.ln -$(ROOT)/usr/lib/llib-lcontract:= REALPATH=../../lib/llib-lcontract -$(ROOT)/usr/lib/llib-lctf.ln:= REALPATH=../../lib/llib-lctf.ln -$(ROOT)/usr/lib/llib-lctf:= REALPATH=../../lib/llib-lctf -$(ROOT)/usr/lib/llib-lcurses.ln:= REALPATH=../../lib/llib-lcurses.ln -$(ROOT)/usr/lib/llib-lcurses:= REALPATH=../../lib/llib-lcurses -$(ROOT)/usr/lib/llib-ldevice.ln:= REALPATH=../../lib/llib-ldevice.ln -$(ROOT)/usr/lib/llib-ldevice:= REALPATH=../../lib/llib-ldevice -$(ROOT)/usr/lib/llib-ldevid.ln:= REALPATH=../../lib/llib-ldevid.ln -$(ROOT)/usr/lib/llib-ldevid:= REALPATH=../../lib/llib-ldevid -$(ROOT)/usr/lib/llib-ldevinfo.ln:= REALPATH=../../lib/llib-ldevinfo.ln -$(ROOT)/usr/lib/llib-ldevinfo:= REALPATH=../../lib/llib-ldevinfo -$(ROOT)/usr/lib/llib-ldhcpagent.ln:= REALPATH=../../lib/llib-ldhcpagent.ln -$(ROOT)/usr/lib/llib-ldhcpagent:= REALPATH=../../lib/llib-ldhcpagent -$(ROOT)/usr/lib/llib-ldhcputil.ln:= REALPATH=../../lib/llib-ldhcputil.ln -$(ROOT)/usr/lib/llib-ldhcputil:= REALPATH=../../lib/llib-ldhcputil -$(ROOT)/usr/lib/llib-ldoor.ln:= REALPATH=../../lib/llib-ldoor.ln -$(ROOT)/usr/lib/llib-ldoor:= REALPATH=../../lib/llib-ldoor -$(ROOT)/usr/lib/llib-lefi.ln:= REALPATH=../../lib/llib-lefi.ln -$(ROOT)/usr/lib/llib-lefi:= REALPATH=../../lib/llib-lefi -$(ROOT)/usr/lib/llib-lfdisk.ln:= REALPATH=../../lib/llib-lfdisk.ln -$(ROOT)/usr/lib/llib-lfdisk:= REALPATH=../../lib/llib-lfdisk -$(ROOT)/usr/lib/llib-lgen.ln:= REALPATH=../../lib/llib-lgen.ln -$(ROOT)/usr/lib/llib-lgen:= REALPATH=../../lib/llib-lgen -$(ROOT)/usr/lib/llib-linetutil.ln:= REALPATH=../../lib/llib-linetutil.ln -$(ROOT)/usr/lib/llib-linetutil:= REALPATH=../../lib/llib-linetutil -$(ROOT)/usr/lib/llib-lintl.ln:= REALPATH=../../lib/llib-lintl.ln -$(ROOT)/usr/lib/llib-lintl:= REALPATH=../../lib/llib-lintl -$(ROOT)/usr/lib/llib-lkstat.ln:= REALPATH=../../lib/llib-lkstat.ln -$(ROOT)/usr/lib/llib-lkstat:= REALPATH=../../lib/llib-lkstat -$(ROOT)/usr/lib/llib-lm:= REALPATH=../../lib/llib-lm -$(ROOT)/usr/lib/llib-lm.ln:= REALPATH=../../lib/llib-lm.ln -$(ROOT)/usr/lib/llib-lmd5.ln:= REALPATH=../../lib/llib-lmd5.ln -$(ROOT)/usr/lib/llib-lmd5:= REALPATH=../../lib/llib-lmd5 -$(ROOT)/usr/lib/llib-lnsl.ln:= REALPATH=../../lib/llib-lnsl.ln -$(ROOT)/usr/lib/llib-lnsl:= REALPATH=../../lib/llib-lnsl -$(ROOT)/usr/lib/llib-lnvpair.ln:= REALPATH=../../lib/llib-lnvpair.ln -$(ROOT)/usr/lib/llib-lnvpair:= REALPATH=../../lib/llib-lnvpair -$(ROOT)/usr/lib/llib-lpam.ln:= REALPATH=../../lib/llib-lpam.ln -$(ROOT)/usr/lib/llib-lpam:= REALPATH=../../lib/llib-lpam -$(ROOT)/usr/lib/llib-lposix4.ln:= REALPATH=../../lib/llib-lrt.ln -$(ROOT)/usr/lib/llib-lposix4:= REALPATH=../../lib/llib-lrt -$(ROOT)/usr/lib/llib-lpthread.ln:= REALPATH=../../lib/llib-lpthread.ln -$(ROOT)/usr/lib/llib-lpthread:= REALPATH=../../lib/llib-lpthread -$(ROOT)/usr/lib/llib-lresolv.ln:= REALPATH=../../lib/llib-lresolv.ln -$(ROOT)/usr/lib/llib-lresolv:= REALPATH=../../lib/llib-lresolv -$(ROOT)/usr/lib/llib-lrpcsvc.ln:= REALPATH=../../lib/llib-lrpcsvc.ln -$(ROOT)/usr/lib/llib-lrpcsvc:= REALPATH=../../lib/llib-lrpcsvc -$(ROOT)/usr/lib/llib-lrt.ln:= REALPATH=../../lib/llib-lrt.ln -$(ROOT)/usr/lib/llib-lrt:= REALPATH=../../lib/llib-lrt -$(ROOT)/usr/lib/llib-lscf.ln:= REALPATH=../../lib/llib-lscf.ln -$(ROOT)/usr/lib/llib-lscf:= REALPATH=../../lib/llib-lscf -$(ROOT)/usr/lib/llib-lsec.ln:= REALPATH=../../lib/llib-lsec.ln -$(ROOT)/usr/lib/llib-lsec:= REALPATH=../../lib/llib-lsec -$(ROOT)/usr/lib/llib-lsecdb.ln:= REALPATH=../../lib/llib-lsecdb.ln -$(ROOT)/usr/lib/llib-lsecdb:= REALPATH=../../lib/llib-lsecdb -$(ROOT)/usr/lib/llib-lsendfile.ln:= REALPATH=../../lib/llib-lsendfile.ln -$(ROOT)/usr/lib/llib-lsendfile:= REALPATH=../../lib/llib-lsendfile -$(ROOT)/usr/lib/llib-lsocket.ln:= REALPATH=../../lib/llib-lsocket.ln -$(ROOT)/usr/lib/llib-lsocket:= REALPATH=../../lib/llib-lsocket -$(ROOT)/usr/lib/llib-lsysevent.ln:= REALPATH=../../lib/llib-lsysevent.ln -$(ROOT)/usr/lib/llib-lsysevent:= REALPATH=../../lib/llib-lsysevent -$(ROOT)/usr/lib/llib-ltermcap.ln:= REALPATH=../../lib/llib-ltermcap.ln -$(ROOT)/usr/lib/llib-ltermcap:= REALPATH=../../lib/llib-ltermcap -$(ROOT)/usr/lib/llib-ltermlib.ln:= REALPATH=../../lib/llib-lcurses.ln -$(ROOT)/usr/lib/llib-ltermlib:= REALPATH=../../lib/llib-lcurses -$(ROOT)/usr/lib/llib-lthread.ln:= REALPATH=../../lib/llib-lthread.ln -$(ROOT)/usr/lib/llib-lthread:= REALPATH=../../lib/llib-lthread -$(ROOT)/usr/lib/llib-lthread_db.ln:= REALPATH=../../lib/llib-lc_db.ln -$(ROOT)/usr/lib/llib-lthread_db:= REALPATH=../../lib/llib-lc_db -$(ROOT)/usr/lib/llib-ltsnet.ln:= REALPATH=../../lib/llib-ltsnet.ln -$(ROOT)/usr/lib/llib-ltsnet:= REALPATH=../../lib/llib-ltsnet -$(ROOT)/usr/lib/llib-ltsol.ln:= REALPATH=../../lib/llib-ltsol.ln -$(ROOT)/usr/lib/llib-ltsol:= REALPATH=../../lib/llib-ltsol -$(ROOT)/usr/lib/llib-lumem.ln:= REALPATH=../../lib/llib-lumem.ln -$(ROOT)/usr/lib/llib-lumem:= REALPATH=../../lib/llib-lumem -$(ROOT)/usr/lib/llib-luuid.ln:= REALPATH=../../lib/llib-luuid.ln -$(ROOT)/usr/lib/llib-luuid:= REALPATH=../../lib/llib-luuid -$(ROOT)/usr/lib/llib-lxnet.ln:= REALPATH=../../lib/llib-lxnet.ln -$(ROOT)/usr/lib/llib-lxnet:= REALPATH=../../lib/llib-lxnet -$(ROOT)/usr/lib/llib-lzfs.ln:= REALPATH=../../lib/llib-lzfs.ln -$(ROOT)/usr/lib/llib-lzfs:= REALPATH=../../lib/llib-lzfs -$(ROOT)/usr/lib/llib-lzfs_core.ln:= REALPATH=../../lib/llib-lzfs_core.ln -$(ROOT)/usr/lib/llib-lzfs_core:= REALPATH=../../lib/llib-lzfs_core $(ROOT)/usr/lib/nss_compat.so.1:= REALPATH=../../lib/nss_compat.so.1 $(ROOT)/usr/lib/nss_dns.so.1:= REALPATH=../../lib/nss_dns.so.1 $(ROOT)/usr/lib/nss_files.so.1:= REALPATH=../../lib/nss_files.so.1 @@ -1069,15 +924,11 @@ $(ROOT)/usr/lib/nss_nis.so.1:= REALPATH=../../lib/nss_nis.so.1 $(ROOT)/usr/lib/nss_user.so.1:= REALPATH=../../lib/nss_user.so.1 $(ROOT)/usr/lib/fm/libfmevent.so.1:= REALPATH=../../../lib/fm/libfmevent.so.1 $(ROOT)/usr/lib/fm/libfmevent.so:= REALPATH=../../../lib/fm/libfmevent.so.1 -$(ROOT)/usr/lib/fm/llib-lfmevent.ln:= REALPATH=../../../lib/fm/llib-lfmevent.ln -$(ROOT)/usr/lib/fm/llib-lfmevent:= REALPATH=../../../lib/fm/llib-lfmevent $(ROOT)/lib/$(MACH64)/libposix4.so.1:= \ REALPATH=librt.so.1 $(ROOT)/lib/$(MACH64)/libposix4.so:= \ REALPATH=libposix4.so.1 -$(ROOT)/lib/$(MACH64)/llib-lposix4.ln:= \ - REALPATH=llib-lrt.ln $(ROOT)/lib/$(MACH64)/libthread_db.so.1:= \ REALPATH=libc_db.so.1 $(ROOT)/lib/$(MACH64)/libthread_db.so:= \ @@ -1338,98 +1189,6 @@ $(ROOT)/usr/lib/$(MACH64)/libfdisk.so.1:= \ REALPATH=../../../lib/$(MACH64)/libfdisk.so.1 $(ROOT)/usr/lib/$(MACH64)/libfdisk.so:= \ REALPATH=../../../lib/$(MACH64)/libfdisk.so.1 -$(ROOT)/usr/lib/$(MACH64)/llib-ladm.ln:= \ - REALPATH=../../../lib/$(MACH64)/llib-ladm.ln -$(ROOT)/usr/lib/$(MACH64)/llib-laio.ln:= \ - REALPATH=../../../lib/$(MACH64)/llib-laio.ln -$(ROOT)/usr/lib/$(MACH64)/llib-lavl.ln:= \ - REALPATH=../../../lib/$(MACH64)/llib-lavl.ln -$(ROOT)/usr/lib/$(MACH64)/llib-lbsm.ln:= \ - REALPATH=../../../lib/$(MACH64)/llib-lbsm.ln -$(ROOT)/usr/lib/$(MACH64)/llib-lcmdutils.ln:= \ - REALPATH=../../../lib/$(MACH64)/llib-lcmdutils.ln -$(ROOT)/usr/lib/$(MACH64)/llib-lcontract.ln:= \ - REALPATH=../../../lib/$(MACH64)/llib-lcontract.ln -$(ROOT)/usr/lib/$(MACH64)/llib-lctf.ln:= \ - REALPATH=../../../lib/$(MACH64)/llib-lctf.ln -$(ROOT)/usr/lib/$(MACH64)/llib-lcurses.ln:= \ - REALPATH=../../../lib/$(MACH64)/llib-lcurses.ln -$(ROOT)/usr/lib/$(MACH64)/llib-ldevice.ln:= \ - REALPATH=../../../lib/$(MACH64)/llib-ldevice.ln -$(ROOT)/usr/lib/$(MACH64)/llib-ldevid.ln:= \ - REALPATH=../../../lib/$(MACH64)/llib-ldevid.ln -$(ROOT)/usr/lib/$(MACH64)/llib-ldevinfo.ln:= \ - REALPATH=../../../lib/$(MACH64)/llib-ldevinfo.ln -$(ROOT)/usr/lib/$(MACH64)/llib-ldhcputil.ln:= \ - REALPATH=../../../lib/$(MACH64)/llib-ldhcputil.ln -$(ROOT)/usr/lib/$(MACH64)/llib-ldoor.ln:= \ - REALPATH=../../../lib/$(MACH64)/llib-ldoor.ln -$(ROOT)/usr/lib/$(MACH64)/llib-lefi.ln:= \ - REALPATH=../../../lib/$(MACH64)/llib-lefi.ln -$(ROOT)/usr/lib/$(MACH64)/llib-lgen.ln:= \ - REALPATH=../../../lib/$(MACH64)/llib-lgen.ln -$(ROOT)/usr/lib/$(MACH64)/llib-linetutil.ln:= \ - REALPATH=../../../lib/$(MACH64)/llib-linetutil.ln -$(ROOT)/usr/lib/$(MACH64)/llib-lintl.ln:= \ - REALPATH=../../../lib/$(MACH64)/llib-lintl.ln -$(ROOT)/usr/lib/$(MACH64)/llib-lkstat.ln:= \ - REALPATH=../../../lib/$(MACH64)/llib-lkstat.ln -$(ROOT)/usr/lib/$(MACH64)/llib-lm.ln:= \ - REALPATH=../../../lib/$(MACH64)/llib-lm.ln -$(ROOT)/usr/lib/$(MACH64)/llib-lmd5.ln:= \ - REALPATH=../../../lib/$(MACH64)/llib-lmd5.ln -$(ROOT)/usr/lib/$(MACH64)/llib-lnsl.ln:= \ - REALPATH=../../../lib/$(MACH64)/llib-lnsl.ln -$(ROOT)/usr/lib/$(MACH64)/llib-lnvpair.ln:= \ - REALPATH=../../../lib/$(MACH64)/llib-lnvpair.ln -$(ROOT)/usr/lib/$(MACH64)/llib-lpam.ln:= \ - REALPATH=../../../lib/$(MACH64)/llib-lpam.ln -$(ROOT)/usr/lib/$(MACH64)/llib-lposix4.ln:= \ - REALPATH=../../../lib/$(MACH64)/llib-lrt.ln -$(ROOT)/usr/lib/$(MACH64)/llib-lpthread.ln:= \ - REALPATH=../../../lib/$(MACH64)/llib-lpthread.ln -$(ROOT)/usr/lib/$(MACH64)/llib-lresolv.ln:= \ - REALPATH=../../../lib/$(MACH64)/llib-lresolv.ln -$(ROOT)/usr/lib/$(MACH64)/llib-lrpcsvc.ln:= \ - REALPATH=../../../lib/$(MACH64)/llib-lrpcsvc.ln -$(ROOT)/usr/lib/$(MACH64)/llib-lrt.ln:= \ - REALPATH=../../../lib/$(MACH64)/llib-lrt.ln -$(ROOT)/usr/lib/$(MACH64)/llib-lscf.ln:= \ - REALPATH=../../../lib/$(MACH64)/llib-lscf.ln -$(ROOT)/usr/lib/$(MACH64)/llib-lsec.ln:= \ - REALPATH=../../../lib/$(MACH64)/llib-lsec.ln -$(ROOT)/usr/lib/$(MACH64)/llib-lsecdb.ln:= \ - REALPATH=../../../lib/$(MACH64)/llib-lsecdb.ln -$(ROOT)/usr/lib/$(MACH64)/llib-lsendfile.ln:= \ - REALPATH=../../../lib/$(MACH64)/llib-lsendfile.ln -$(ROOT)/usr/lib/$(MACH64)/llib-lsocket.ln:= \ - REALPATH=../../../lib/$(MACH64)/llib-lsocket.ln -$(ROOT)/usr/lib/$(MACH64)/llib-lsysevent.ln:= \ - REALPATH=../../../lib/$(MACH64)/llib-lsysevent.ln -$(ROOT)/usr/lib/$(MACH64)/llib-ltermcap.ln:= \ - REALPATH=../../../lib/$(MACH64)/llib-ltermcap.ln -$(ROOT)/usr/lib/$(MACH64)/llib-ltermlib.ln:= \ - REALPATH=../../../lib/$(MACH64)/llib-lcurses.ln -$(ROOT)/usr/lib/$(MACH64)/llib-lthread.ln:= \ - REALPATH=../../../lib/$(MACH64)/llib-lthread.ln -$(ROOT)/usr/lib/$(MACH64)/llib-lthread_db.ln:= \ - REALPATH=../../../lib/$(MACH64)/llib-lc_db.ln -$(ROOT)/usr/lib/$(MACH64)/llib-ltsnet.ln:= \ - REALPATH=../../../lib/$(MACH64)/llib-ltsnet.ln -$(ROOT)/usr/lib/$(MACH64)/llib-ltsol.ln:= \ - REALPATH=../../../lib/$(MACH64)/llib-ltsol.ln -$(ROOT)/usr/lib/$(MACH64)/llib-lumem.ln:= \ - REALPATH=../../../lib/$(MACH64)/llib-lumem.ln -$(ROOT)/usr/lib/$(MACH64)/llib-luuid.ln:= \ - REALPATH=../../../lib/$(MACH64)/llib-luuid.ln -$(ROOT)/usr/lib/$(MACH64)/llib-lxnet.ln:= \ - REALPATH=../../../lib/$(MACH64)/llib-lxnet.ln -$(ROOT)/usr/lib/$(MACH64)/llib-lzfs.ln:= \ - REALPATH=../../../lib/$(MACH64)/llib-lzfs.ln -$(ROOT)/usr/lib/$(MACH64)/llib-lzfs_core.ln:= \ - REALPATH=../../../lib/$(MACH64)/llib-lzfs_core.ln -$(ROOT)/usr/lib/$(MACH64)/llib-lfdisk.ln:= \ - REALPATH=../../../lib/$(MACH64)/llib-lfdisk.ln $(ROOT)/usr/lib/$(MACH64)/nss_compat.so.1:= \ REALPATH=../../../lib/$(MACH64)/nss_compat.so.1 $(ROOT)/usr/lib/$(MACH64)/nss_dns.so.1:= \ @@ -1444,21 +1203,15 @@ $(ROOT)/usr/lib/fm/$(MACH64)/libfmevent.so.1:= \ REALPATH=../../../../lib/fm/$(MACH64)/libfmevent.so.1 $(ROOT)/usr/lib/fm/$(MACH64)/libfmevent.so:= \ REALPATH=../../../../lib/fm/$(MACH64)/libfmevent.so.1 -$(ROOT)/usr/lib/fm/$(MACH64)/llib-lfmevent.ln:= \ - REALPATH=../../../../lib/fm/$(MACH64)/llib-lfmevent.ln i386_SYM.USRLIB= \ /usr/lib/libfdisk.so \ - /usr/lib/libfdisk.so.1 \ - /usr/lib/llib-lfdisk \ - /usr/lib/llib-lfdisk.ln + /usr/lib/libfdisk.so.1 SYM.USRLIB= \ $($(MACH)_SYM.USRLIB) \ /lib/libposix4.so \ /lib/libposix4.so.1 \ - /lib/llib-lposix4 \ - /lib/llib-lposix4.ln \ /lib/libthread_db.so \ /lib/libthread_db.so.1 \ /usr/lib/ld.so.1 \ @@ -1591,121 +1344,25 @@ SYM.USRLIB= \ /usr/lib/libzfs.so.1 \ /usr/lib/libzfs_core.so \ /usr/lib/libzfs_core.so.1 \ - /usr/lib/llib-ladm \ - /usr/lib/llib-ladm.ln \ - /usr/lib/llib-laio \ - /usr/lib/llib-laio.ln \ - /usr/lib/llib-lavl \ - /usr/lib/llib-lavl.ln \ - /usr/lib/llib-lbsm \ - /usr/lib/llib-lbsm.ln \ - /usr/lib/llib-lcmdutils \ - /usr/lib/llib-lcmdutils.ln \ - /usr/lib/llib-lcontract \ - /usr/lib/llib-lcontract.ln \ - /usr/lib/llib-lctf \ - /usr/lib/llib-lctf.ln \ - /usr/lib/llib-lcurses \ - /usr/lib/llib-lcurses.ln \ - /usr/lib/llib-ldevice \ - /usr/lib/llib-ldevice.ln \ - /usr/lib/llib-ldevid \ - /usr/lib/llib-ldevid.ln \ - /usr/lib/llib-ldevinfo \ - /usr/lib/llib-ldevinfo.ln \ - /usr/lib/llib-ldhcpagent \ - /usr/lib/llib-ldhcpagent.ln \ - /usr/lib/llib-ldhcputil \ - /usr/lib/llib-ldhcputil.ln \ - /usr/lib/llib-ldoor \ - /usr/lib/llib-ldoor.ln \ - /usr/lib/llib-lefi \ - /usr/lib/llib-lefi.ln \ - /usr/lib/llib-lgen \ - /usr/lib/llib-lgen.ln \ - /usr/lib/llib-linetutil \ - /usr/lib/llib-linetutil.ln \ - /usr/lib/llib-lintl \ - /usr/lib/llib-lintl.ln \ - /usr/lib/llib-lkstat \ - /usr/lib/llib-lkstat.ln \ - /usr/lib/llib-lm \ - /usr/lib/llib-lm.ln \ - /usr/lib/llib-lmd5 \ - /usr/lib/llib-lmd5.ln \ - /usr/lib/llib-lnsl \ - /usr/lib/llib-lnsl.ln \ - /usr/lib/llib-lnvpair \ - /usr/lib/llib-lnvpair.ln \ - /usr/lib/llib-lpam \ - /usr/lib/llib-lpam.ln \ - /usr/lib/llib-lposix4 \ - /usr/lib/llib-lposix4.ln \ - /usr/lib/llib-lpthread \ - /usr/lib/llib-lpthread.ln \ - /usr/lib/llib-lresolv \ - /usr/lib/llib-lresolv.ln \ - /usr/lib/llib-lrpcsvc \ - /usr/lib/llib-lrpcsvc.ln \ - /usr/lib/llib-lrt \ - /usr/lib/llib-lrt.ln \ - /usr/lib/llib-lscf \ - /usr/lib/llib-lscf.ln \ - /usr/lib/llib-lsec \ - /usr/lib/llib-lsec.ln \ - /usr/lib/llib-lsecdb \ - /usr/lib/llib-lsecdb.ln \ - /usr/lib/llib-lsendfile \ - /usr/lib/llib-lsendfile.ln \ - /usr/lib/llib-lsocket \ - /usr/lib/llib-lsocket.ln \ - /usr/lib/llib-lsysevent \ - /usr/lib/llib-lsysevent.ln \ - /usr/lib/llib-ltermcap \ - /usr/lib/llib-ltermcap.ln \ - /usr/lib/llib-ltermlib \ - /usr/lib/llib-ltermlib.ln \ - /usr/lib/llib-lthread \ - /usr/lib/llib-lthread.ln \ - /usr/lib/llib-lthread_db \ - /usr/lib/llib-lthread_db.ln \ - /usr/lib/llib-ltsnet \ - /usr/lib/llib-ltsnet.ln \ - /usr/lib/llib-ltsol \ - /usr/lib/llib-ltsol.ln \ - /usr/lib/llib-lumem \ - /usr/lib/llib-lumem.ln \ - /usr/lib/llib-luuid \ - /usr/lib/llib-luuid.ln \ - /usr/lib/llib-lxnet \ - /usr/lib/llib-lxnet.ln \ - /usr/lib/llib-lzfs \ - /usr/lib/llib-lzfs.ln \ - /usr/lib/llib-lzfs_core \ - /usr/lib/llib-lzfs_core.ln \ /usr/lib/nss_compat.so.1 \ /usr/lib/nss_dns.so.1 \ /usr/lib/nss_files.so.1 \ /usr/lib/nss_nis.so.1 \ /usr/lib/nss_user.so.1 \ /usr/lib/fm/libfmevent.so \ - /usr/lib/fm/libfmevent.so.1 \ - /usr/lib/fm/llib-lfmevent \ - /usr/lib/fm/llib-lfmevent.ln + /usr/lib/fm/libfmevent.so.1 sparcv9_SYM.USRLIB64= amd64_SYM.USRLIB64= \ /usr/lib/amd64/libfdisk.so \ - /usr/lib/amd64/libfdisk.so.1 \ - /usr/lib/amd64/llib-lfdisk.ln + /usr/lib/amd64/libfdisk.so.1 SYM.USRLIB64= \ $($(MACH64)_SYM.USRLIB64) \ /lib/$(MACH64)/libposix4.so \ /lib/$(MACH64)/libposix4.so.1 \ - /lib/$(MACH64)/llib-lposix4.ln \ /lib/$(MACH64)/libthread_db.so \ /lib/$(MACH64)/libthread_db.so.1 \ /usr/lib/$(MACH64)/ld.so.1 \ @@ -1834,59 +1491,13 @@ SYM.USRLIB64= \ /usr/lib/$(MACH64)/libzfs.so.1 \ /usr/lib/$(MACH64)/libzfs_core.so \ /usr/lib/$(MACH64)/libzfs_core.so.1 \ - /usr/lib/$(MACH64)/llib-ladm.ln \ - /usr/lib/$(MACH64)/llib-laio.ln \ - /usr/lib/$(MACH64)/llib-lavl.ln \ - /usr/lib/$(MACH64)/llib-lbsm.ln \ - /usr/lib/$(MACH64)/llib-lcmdutils.ln \ - /usr/lib/$(MACH64)/llib-lcontract.ln \ - /usr/lib/$(MACH64)/llib-lctf.ln \ - /usr/lib/$(MACH64)/llib-lcurses.ln \ - /usr/lib/$(MACH64)/llib-ldevice.ln \ - /usr/lib/$(MACH64)/llib-ldevid.ln \ - /usr/lib/$(MACH64)/llib-ldevinfo.ln \ - /usr/lib/$(MACH64)/llib-ldhcputil.ln \ - /usr/lib/$(MACH64)/llib-ldoor.ln \ - /usr/lib/$(MACH64)/llib-lefi.ln \ - /usr/lib/$(MACH64)/llib-lgen.ln \ - /usr/lib/$(MACH64)/llib-linetutil.ln \ - /usr/lib/$(MACH64)/llib-lintl.ln \ - /usr/lib/$(MACH64)/llib-lkstat.ln \ - /usr/lib/$(MACH64)/llib-lm.ln \ - /usr/lib/$(MACH64)/llib-lmd5.ln \ - /usr/lib/$(MACH64)/llib-lnsl.ln \ - /usr/lib/$(MACH64)/llib-lnvpair.ln \ - /usr/lib/$(MACH64)/llib-lpam.ln \ - /usr/lib/$(MACH64)/llib-lposix4.ln \ - /usr/lib/$(MACH64)/llib-lpthread.ln \ - /usr/lib/$(MACH64)/llib-lresolv.ln \ - /usr/lib/$(MACH64)/llib-lrpcsvc.ln \ - /usr/lib/$(MACH64)/llib-lrt.ln \ - /usr/lib/$(MACH64)/llib-lscf.ln \ - /usr/lib/$(MACH64)/llib-lsec.ln \ - /usr/lib/$(MACH64)/llib-lsecdb.ln \ - /usr/lib/$(MACH64)/llib-lsendfile.ln \ - /usr/lib/$(MACH64)/llib-lsocket.ln \ - /usr/lib/$(MACH64)/llib-lsysevent.ln \ - /usr/lib/$(MACH64)/llib-ltermcap.ln \ - /usr/lib/$(MACH64)/llib-ltermlib.ln \ - /usr/lib/$(MACH64)/llib-lthread.ln \ - /usr/lib/$(MACH64)/llib-lthread_db.ln \ - /usr/lib/$(MACH64)/llib-ltsnet.ln \ - /usr/lib/$(MACH64)/llib-ltsol.ln \ - /usr/lib/$(MACH64)/llib-lumem.ln \ - /usr/lib/$(MACH64)/llib-luuid.ln \ - /usr/lib/$(MACH64)/llib-lxnet.ln \ - /usr/lib/$(MACH64)/llib-lzfs.ln \ - /usr/lib/$(MACH64)/llib-lzfs_core.ln \ /usr/lib/$(MACH64)/nss_compat.so.1 \ /usr/lib/$(MACH64)/nss_dns.so.1 \ /usr/lib/$(MACH64)/nss_files.so.1 \ /usr/lib/$(MACH64)/nss_nis.so.1 \ /usr/lib/$(MACH64)/nss_user.so.1 \ /usr/lib/fm/$(MACH64)/libfmevent.so \ - /usr/lib/fm/$(MACH64)/libfmevent.so.1 \ - /usr/lib/fm/$(MACH64)/llib-lfmevent.ln + /usr/lib/fm/$(MACH64)/libfmevent.so.1 # # usr/src/Makefile uses INS.dir for any member of ROOTDIRS, the fact diff --git a/usr/src/cmd/auditstat/auditstat.c b/usr/src/cmd/auditstat/auditstat.c index 594ba8e16a..cdb5a586ae 100644 --- a/usr/src/cmd/auditstat/auditstat.c +++ b/usr/src/cmd/auditstat/auditstat.c @@ -23,6 +23,10 @@ * Use is subject to license terms. */ +/* + * Copyright (c) 2018, Joyent, Inc. + */ + #include "statcommon.h" #include <sys/types.h> @@ -118,8 +122,7 @@ char **argv; static void -display_stats(s, cnt) -au_stat_t *s; +display_stats(au_stat_t *s, int cnt) { int offset[12]; /* used to line the header up correctly */ char buf[512]; diff --git a/usr/src/cmd/dladm/dladm.c b/usr/src/cmd/dladm/dladm.c index d80e68f165..97fc010fa2 100644 --- a/usr/src/cmd/dladm/dladm.c +++ b/usr/src/cmd/dladm/dladm.c @@ -233,7 +233,7 @@ static cmdfunc_t do_show_iptun, do_up_iptun, do_down_iptun; static cmdfunc_t do_create_overlay, do_delete_overlay, do_modify_overlay; static cmdfunc_t do_show_overlay; -static void do_up_vnic_common(int, char **, const char *, boolean_t); +static void do_up_vnic_common(int, char **, const char *, boolean_t); static int show_part(dladm_handle_t, datalink_id_t, void *); @@ -333,9 +333,9 @@ static cmd_t cmds[] = { " show-secobj [-pP] [-o <field>,...] [<secobj>,...]\n" }, { "init-linkprop", do_init_linkprop, NULL }, { "init-secobj", do_init_secobj, NULL }, - { "create-vlan", do_create_vlan, + { "create-vlan", do_create_vlan, " create-vlan [-ft] -l <link> -v <vid> [link]" }, - { "delete-vlan", do_delete_vlan, + { "delete-vlan", do_delete_vlan, " delete-vlan [-t] <link>" }, { "show-vlan", do_show_vlan, " show-vlan [-pP] [-o <field>,..] [<link>]\n" }, @@ -646,7 +646,7 @@ static const ofmt_field_t ether_fields[] = { { "REM_FAULT", 17, offsetof(ether_fields_buf_t, eth_rem_fault), print_default_cb}, {NULL, 0, - 0, NULL}} + 0, NULL}} ; typedef struct print_ether_state { @@ -678,8 +678,8 @@ static const ofmt_field_t link_s_fields[] = { { "IERRORS", 10, LINK_S_IERRORS, print_link_stats_cb}, { "OPACKETS", 12, LINK_S_OPKTS, print_link_stats_cb}, { "OBYTES", 12, LINK_S_OBYTES, print_link_stats_cb}, -{ "OERRORS", 8, LINK_S_OERRORS, print_link_stats_cb}} -; +{ "OERRORS", 8, LINK_S_OERRORS, print_link_stats_cb}, +{ NULL, 0, 0, NULL}}; typedef struct link_args_s { char *link_s_link; @@ -739,7 +739,7 @@ typedef struct laggr_fields_buf_s { typedef struct laggr_args_s { int laggr_lport; /* -1 indicates the aggr itself */ - const char *laggr_link; + const char *laggr_link; dladm_aggr_grp_attr_t *laggr_ginfop; dladm_status_t *laggr_status; pktsum_t *laggr_pktsumtot; /* -s only */ @@ -1649,7 +1649,7 @@ show_usage_time(dladm_usage_t *usage, void *arg) { show_usage_state_t *state = (show_usage_state_t *)arg; char buf[DLADM_STRSIZE]; - usage_l_fields_buf_t ubuf; + usage_l_fields_buf_t ubuf; time_t time; double bw; dladm_status_t status; @@ -1838,7 +1838,7 @@ do_show_usage(int argc, char *argv[], const char *use) die("show-usage requires a file"); if (optind == (argc-1)) { - uint32_t flags; + uint32_t flags; resource = argv[optind]; if (!state.us_showall && @@ -3107,7 +3107,7 @@ print_aggr_info(show_grp_state_t *state, const char *link, static boolean_t print_xaggr_cb(ofmt_arg_t *ofarg, char *buf, uint_t bufsize) { - const laggr_args_t *l = ofarg->ofmt_cbarg; + const laggr_args_t *l = ofarg->ofmt_cbarg; boolean_t is_port = (l->laggr_lport >= 0); char tmpbuf[DLADM_STRSIZE]; const char *objname; @@ -3293,7 +3293,7 @@ static boolean_t print_aggr_stats_cb(ofmt_arg_t *ofarg, char *buf, uint_t bufsize) { const laggr_args_t *l = ofarg->ofmt_cbarg; - int portnum; + int portnum; boolean_t is_port = (l->laggr_lport >= 0); dladm_aggr_port_attr_t *portp; dladm_status_t *stat, status; @@ -3949,7 +3949,7 @@ print_phys_one_hwgrp_cb(ofmt_arg_t *ofarg, char *buf, uint_t bufsize) case PHYS_H_RINGS: ringstr[0] = '\0'; for (i = 0; i < attr->hg_n_rings; i++) { - uint_t index = attr->hg_rings[i]; + uint_t index = attr->hg_rings[i]; if (start == -1) { start = index; @@ -5012,7 +5012,7 @@ do_up_vnic_common(int argc, char *argv[], const char *use, boolean_t vlan) { datalink_id_t linkid = DATALINK_ALL_LINKID; dladm_status_t status; - char *type; + char *type; type = vlan ? "vlan" : "vnic"; @@ -6712,7 +6712,7 @@ static boolean_t print_linkprop_cb(ofmt_arg_t *ofarg, char *buf, uint_t bufsize) { linkprop_args_t *arg = ofarg->ofmt_cbarg; - char *propname = arg->ls_propname; + char *propname = arg->ls_propname; show_linkprop_state_t *statep = arg->ls_state; char *ptr = statep->ls_line; char *lim = ptr + MAX_PROP_LINE; @@ -7790,9 +7790,9 @@ do_init_linkprop(int argc, char **argv, const char *use) static void do_show_ether(int argc, char **argv, const char *use) { - int option; + int option; datalink_id_t linkid; - print_ether_state_t state; + print_ether_state_t state; char *fields_str = NULL; ofmt_handle_t ofmt; ofmt_status_t oferr; diff --git a/usr/src/cmd/lp/lib/access/llib-llpacc b/usr/src/cmd/lp/lib/access/llib-llpacc deleted file mode 100644 index 8e15c15c3f..0000000000 --- a/usr/src/cmd/lp/lib/access/llib-llpacc +++ /dev/null @@ -1,58 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright (c) 1998 by Sun Microsystems, Inc. - * All rights reserved. - */ - -/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ -/* All Rights Reserved */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -int allow_form_printer ( char **, char * ); -int allow_user_form ( char ** , char * ); -int allow_user_printer ( char **, char * ); -int allowed ( char *, char **, char ** ); -int deny_form_printer ( char **, char * ); -int deny_user_form ( char ** , char * ); -int deny_user_printer ( char **, char * ); -int dumpaccess ( char *, char *, char *, char ***, char *** ); -int is_form_allowed_printer ( char *, char * ); -int is_user_admin ( void ); -int is_user_allowed ( char *, char ** , char ** ); -int is_user_allowed_form ( char *, char * ); -int is_user_allowed_printer ( char *, char * ); -int load_formprinter_access ( char *, char ***, char *** ); -int load_paperprinter_access(char *, char ***, char ***); -int load_userform_access ( char *, char ***, char *** ); -int load_userprinter_access ( char *, char ***, char *** ); -int loadaccess ( char *, char *, char *, char ***, char *** ); -int bangequ ( char * , char * ); -int bang_searchlist ( char * , char ** ); -int bang_dellist ( char *** , char * ); - -char * getaccessfile ( char *, char *, char *, char * ); - diff --git a/usr/src/cmd/lp/lib/class/llib-llpcls b/usr/src/cmd/lp/lib/class/llib-llpcls deleted file mode 100644 index fea59cd737..0000000000 --- a/usr/src/cmd/lp/lib/class/llib-llpcls +++ /dev/null @@ -1,44 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright (c) 1998 by Sun Microsystems, Inc. - * All rights reserved. - */ - -/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ -/* All Rights Reserved */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -typedef struct CLASS { - char *name; /* name of class (redundant) */ - char **members; /* members of class */ -} CLASS; - -int putclass ( char *, CLASS * ); -int delclass ( char * ); - -void freeclass ( CLASS * ); - diff --git a/usr/src/cmd/lp/lib/filters/llib-llpflt b/usr/src/cmd/lp/lib/filters/llib-llpflt deleted file mode 100644 index 61db757567..0000000000 --- a/usr/src/cmd/lp/lib/filters/llib-llpflt +++ /dev/null @@ -1,120 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright (c) 1998 by Sun Microsystems, Inc. - * All rights reserved. - */ - -/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ -/* All Rights Reserved */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <stdio.h> - -typedef enum FILTERTYPE { - fl_none, - fl_fast, - fl_slow, - fl_both -} FILTERTYPE; - -typedef struct FILTER { - char * name; /* name of filter (redundant) */ - char * command; /* shell command (full path) */ - FILTERTYPE type; /* type of filter (fast/slow) */ - char ** printer_types; /* list of valid printer types */ - char ** printers; /* list of valid printers */ - char ** input_types; /* list of valid input types */ - char ** output_types; /* list of valid output types */ - char ** templates; /* list of option templates */ -} FILTER; - - - -typedef struct TYPE { - char * name; - unsigned short info; /* 1 iff "name" is in Terminfo */ -} TYPE; - - -typedef struct TEMPLATE { - char * keyword; - char * pattern; - char * re; - char * result; - int nbra; -} TEMPLATE; - -typedef struct _FILTER { - struct _FILTER * next; /* for linking several */ - char * name; - char * command; - char ** printers; - TYPE * printer_types; - TYPE * input_types; /* all possible choices */ - TYPE * output_types; /* all possible choices */ - TYPE * inputp; /* the one to be used */ - TYPE * outputp; /* the one to be used */ - TEMPLATE * templates; - FILTERTYPE type; - unsigned char mark, - level; -} _FILTER; - - -FILTER * getfilter ( char * ); - -_FILTER * search_filter ( char * ); - -FILTERTYPE insfilter ( char ** , char * , char * , char * , char * , char ** , unsigned short * ); -FILTERTYPE s_to_filtertype ( char * ); - -TEMPLATE s_to_template ( char * ); - -TEMPLATE * sl_to_templatel ( char ** ); - -TYPE s_to_type ( char * ); - -TYPE * sl_to_typel ( char ** ); - -char * template_to_s ( TEMPLATE ); -char * type_to_s ( TYPE ); - -char ** templatel_to_sl ( TEMPLATE * ); -char ** typel_to_sl ( TYPE * ); - -int open_filtertable ( char * , char * ); - -int get_and_load ( void ); -int putfilter ( char * , FILTER * ); -int delfilter ( char * ); -int loadfilters ( char * ); - -void freetempl ( TEMPLATE * ); -void freefilter ( FILTER * ); -void free_filter ( _FILTER * ); -void trash_filters ( void ); -void close_filtertable ( FILE * ); diff --git a/usr/src/cmd/lp/lib/forms/llib-llpfrm b/usr/src/cmd/lp/lib/forms/llib-llpfrm deleted file mode 100644 index 625d3e7be5..0000000000 --- a/usr/src/cmd/lp/lib/forms/llib-llpfrm +++ /dev/null @@ -1,62 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright (c) 1998 by Sun Microsystems, Inc. - * All rights reserved. - */ - -/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ -/* All Rights Reserved */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -#include "../../include/lp.h" - -typedef struct FORM { - SCALED plen; - SCALED pwid; - SCALED lpi; - SCALED cpi; - int np; - char * chset; - short mandatory; - char * rcolor; - char * comment; - char * conttype; - char * name; - char * paper; - short isDefault; -} FORM; - -#define err_hndlr int (*)( int , int , int ) - -int delform ( char * ); -int getform ( char * , FORM * , FALERT * , FILE ** ); -int putform ( char * , FORM * , FALERT * , FILE ** ); -int rdform ( char * , FORM * , int , err_hndlr , int * ); -int wrform ( char * , FORM * , int , err_hndlr , int * ); - -void freeform ( FORM * ); - diff --git a/usr/src/cmd/lp/lib/lp/llib-llp b/usr/src/cmd/lp/lib/lp/llib-llp deleted file mode 100644 index b1faa81b20..0000000000 --- a/usr/src/cmd/lp/lib/lp/llib-llp +++ /dev/null @@ -1,173 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ -/* All Rights Reserved */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -#include "errno.h" -#include "fcntl.h" -#include "sys/types.h" -#include "sys/stat.h" -#include "stdio.h" -#include "dirent.h" - -typedef struct SCALED { - float val; /* value of number, scaled according to "sc" */ - char sc; /* 'i' inches, 'c' centimeters, ' ' lines/cols */ -} SCALED; - -typedef struct FALERT { - char * shcmd; /* shell command used to perform the alert */ - int Q; /* # requests queued to activate alert */ - int W; /* alert is sent every "W" minutes */ -} FALERT; - -extern int open_locked(char *, char *, mode_t); -extern char *fdgets(char *, int, int); -extern int fdprintf(int, char *, ...); -extern int fdputs(char *, int); -extern int fdputc(char, int); - - -FILE *open_lpfile ( char * , char * , mode_t ); -int close_lpfile ( FILE * ); -int chown_lppath ( char * path ); -int mkdir_lpdir ( char * path , int mode ); -int rmfile ( char * path ); -int dumpstring ( char * path , char * str ); - -char * loadstring ( char * path ); -char * loadline ( char * path ); -char * sop_up_rest (int, char * endsop ); - -int addlist ( char *** , char * ); -int addstring ( char ** , char * ); -int appendlist ( char *** , char * ); -int dellist ( char *** , char * ); -int joinlist ( char *** , char ** ); -int lenlist ( char ** ); -int printlist ( FILE * , char ** ); -int fdprintlist(int , char ** ); -int searchlist ( char *, char ** ); -int searchlist_with_terminfo ( char * , char ** ); - -char ** duplist ( char ** ); -char ** getlist ( char * , char * , char * ); -char ** dashos ( char * ); -char ** wherelist ( char * , char ** ); - -char * sprintlist ( char ** ); -char * search_cslist ( char * , char ** ); - -void freelist ( char ** ); -void printlist_setup ( char * , char * , char * , char * ); -void printlist_unsetup ( void ); - - -void printsdn ( FILE * , SCALED ); -void fdprintsdn ( int , SCALED ); -void printsdn_setup ( char * , char * , char * ); -void printsdn_unsetup ( void ); - -SCALED _getsdn ( char * , char ** , int ); - -char * makepath ( char * , ... ); -char * getspooldir ( void ); -char * getrequestfile ( char * ); -char * getprinterfile ( char * , char * ); -char * getsystemfile ( char * , char * ); -char * getclassfile ( char * ); -char * getfilterfile ( char * ); -char * getformfile ( char * , char * ); - -int cs_strcmp ( char * , char * ); -int cs_strncmp ( char * , char * , int ); - -int syn_name ( char * ); -int syn_text ( char * ); -int syn_comment ( char * ); -int syn_machine_name ( char * ); -int syn_option ( char * ); - -int putalert ( char * , char * , FALERT * ); -int delalert ( char * , char * ); - -FALERT * getalert ( char * , char * ); - -void printalert ( FILE * , FALERT * , int ); - -int tidbit ( char * , char * , ... ); -void untidbit ( char * ); - -int _Access ( char * , int ); -int _Chdir ( char * ); -int _Chmod ( char * , int ); -int _Chown ( char * , int , int ); -int _Close ( int ); -int _Creat ( char * , int ); -int _Fcntl ( int , int , ... ); -int _Fstat ( int , struct stat * ); -int _Link ( char * , char * ); -int _Lstat ( char * , struct stat * ); -int _Mknod ( char * , int , int ); -int _Mkpipe ( char * , int , int ); -int _Open ( char * , int , ... /* mode_t */ ); -int _Read ( int , char * , unsigned int ); -int _Readlink ( char * , char * , unsigned int ); -int _Rename ( char * , char * ); -int _Symlink ( char * , char * ); -int _Stat ( char * , struct stat * ); -int _Unlink ( char * ); -int _Wait ( int * ); -int _Write ( int , char * , unsigned int ); - -void * _Malloc ( size_t , const char * , int ); -void * _Realloc ( void * , size_t , const char * , int ); -void * _Calloc ( size_t , size_t , const char * , int ); -char * _Strdup ( const char * , const char * , int ); -void _Free ( void * , const char * , int ); - - -int isterminfo ( char * ); -int isprinter ( char * ); -int isrequest ( char * ); -int isnumber ( char * ); - -char * getname ( void ); -char * makestr ( char * , ... ); -char * strip ( char * ); - -void sendmail ( char * , char * ); - -void (*lp_alloc_fail_handler)( void ); - -char * next_x ( char * , long * , unsigned int ); - diff --git a/usr/src/cmd/lp/lib/msgs/llib-llpmsg b/usr/src/cmd/lp/lib/msgs/llib-llpmsg deleted file mode 100644 index 84d1fa3b1c..0000000000 --- a/usr/src/cmd/lp/lib/msgs/llib-llpmsg +++ /dev/null @@ -1,116 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright (c) 1998 by Sun Microsystems, Inc. - * All rights reserved. - */ - -/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ -/* All Rights Reserved */ - -#pragma ident "%Z%%M% %I% %E% SMI" - - -# include <sys/types.h> -# include <poll.h> -# include <stdarg.h> -# include <stropts.h> - - -typedef struct strbuf strbuf_t; /* STREAMS buffer */ - -typedef struct mque -{ - struct mque *next; - struct strbuf *dat; -} MQUE; - -typedef struct -{ - short type; /* type of connection */ - int readfd; /* STREAM fd to read from */ - int writefd; /* STREAM fd to write to */ - int wait; /* number of systems waiting for */ - char *file; /* pipe name if type==MD_FIFO */ - short state; /* Current state of client */ - short admin; /* Non zero if admin */ - short event; /* Event returned from poll */ - MQUE * mque; /* backlogged message ptr */ - uid_t uid; /* Clients UID */ - gid_t gid; /* Clients GID */ - void (**on_discon)(); /* Clean up functions */ -} MESG; - -#define MSGMAX 2048 -typedef struct -{ - int full; - char save [MSGMAX], - *psave, - *psave_end; -} fifobuffer_t; - -MESG * mcreate ( char * ); -int mlisteninit ( MESG * ); -MESG * mlisten ( void ); -int mlistenadd ( MESG *, short ); -int mon_discon ( MESG *, void (*)()); -MESG * mlistenreset ( void ); -int mdestroy ( MESG * ); - -MESG * mconnect ( char *, int, int ); -int mgetm ( MESG *, int, ... ); -int mwrite ( MESG *, char * ); -int mputm ( MESG *, int, ... ); -int mread ( MESG *, char *, int ); -short msize ( char * ); -short mpeek ( MESG * ); -int mdisconnect ( MESG * ); - -void __mbfree ( void ); - -int mclose ( void ); -int mneeds ( void ); -int mopen ( void ); -int mrecv ( char *, int ); -int msend ( char * ); - -int Putmsg (MESG *, strbuf_t *, strbuf_t *, int); -int Getmsg (MESG *, strbuf_t *, strbuf_t *, int *); -int read3_2 (MESG * md, char *msgbuf, int size); -int write3_2 (MESG *, char *, int); -int read_fifo (int, char *, unsigned int); -int write_fifo (int, char *, unsigned int); -int ResetFifoBuffer (int); -fifobuffer_t *GetFifoBuffer (int); - -char * htos ( char *, unsigned short ); -char * ltos ( char *, unsigned long ); -unsigned long stol ( char * ); -unsigned short stoh ( char * ); -int _getmessage ( char *, short, va_list ); -int _putmessage ( char *, short, va_list ); -int getmessage ( char *, short, ... ); -int putmessage ( char *, short, ... ); diff --git a/usr/src/cmd/lp/lib/oam/llib-llpoam b/usr/src/cmd/lp/lib/oam/llib-llpoam deleted file mode 100644 index b2a06901ee..0000000000 --- a/usr/src/cmd/lp/lib/oam/llib-llpoam +++ /dev/null @@ -1,39 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright (c) 1998 by Sun Microsystems, Inc. - * All rights reserved. - */ - -/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ -/* All Rights Reserved */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -char *agettxt(long msg_id, char *buf, int buflen); - -void fmtmsg(char * label, int severity, char * text, char * action); - - diff --git a/usr/src/cmd/lp/lib/printers/llib-llpprt b/usr/src/cmd/lp/lib/printers/llib-llpprt deleted file mode 100644 index f71ee5ff18..0000000000 --- a/usr/src/cmd/lp/lib/printers/llib-llpprt +++ /dev/null @@ -1,99 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright (c) 1998 by Sun Microsystems, Inc. - * All rights reserved. - */ - -/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ -/* All Rights Reserved */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -#include "../../include/lp.h" - -typedef struct PRINTER { - char *name; /* name of printer (redundant) */ - unsigned short banner; /* banner page conditions */ - SCALED cpi; /* default character pitch */ - char **char_sets; /* list of okay char-sets/print-wheels */ - char **input_types; /* list of types acceptable to printer */ - char *device; /* printer port full path name */ - char *dial_info; /* system name or phone # for dial-up */ - char *fault_rec; /* printer fault recovery procedure */ - char *interface; /* interface program full path name */ - SCALED lpi; /* default line pitch */ - SCALED plen; /* default page length */ - unsigned short login; /* is/isn't a login terminal */ - char *printer_type; /* Terminfo look-up value (obsolete) */ - char *remote; /* remote machine!printer-name */ - char *speed; /* baud rate for connection */ - char *stty; /* space separated list of stty options */ - SCALED pwid; /* default page width */ - char *description; /* comment about printer */ - FALERT fault_alert; /* how to alert on printer fault */ - short daisy; /* 1/0 - printwheels/character-sets */ -#if defined(CAN_DO_MODULES) - char **modules; /* streams modules to push */ -#endif - char **printer_types; /* Terminfo look-up values */ - char **options; /* space separated list of undefined -o options */ - - /* - * Adding new members to this structure? Check out - * cmd/lpadmin/do_printer.c, where we initialize - * each new printer structure. - */ -} PRINTER; - -typedef struct PWHEEL { - char *name; /* name of print wheel */ - FALERT alert; /* how to alert when mount needed */ -} PWHEEL; - -extern unsigned long badprinter, - ignprinter; -PRINTER * getprinter ( char * ); - -PWHEEL * getpwheel ( char * ); - -char * getdefault ( void ); - -int putprinter ( char *, PRINTER *); -int delprinter ( char * ); -int putdefault ( char * ); -int deldefault ( void ); -int putpwheel ( char * , PWHEEL * ); -int delpwheel ( char * ); -int okprinter ( char * , PRINTER * , int ); - -unsigned long chkprinter (char *, char *, char *, char *, char *, char *); - -void freeprinter ( PRINTER * ); -void freepwheel ( PWHEEL * ); - -char * getpentry(char *, int); - - diff --git a/usr/src/cmd/lp/lib/requests/llib-llpreq b/usr/src/cmd/lp/lib/requests/llib-llpreq deleted file mode 100644 index ec8a5f0250..0000000000 --- a/usr/src/cmd/lp/lib/requests/llib-llpreq +++ /dev/null @@ -1,59 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright (c) 1998 by Sun Microsystems, Inc. - * All rights reserved. - */ - -/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ -/* All Rights Reserved */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <sys/types.h> - -typedef struct REQUEST { - short copies; /* number of copies of request to print */ - char *destination; /* printer or class name */ - char **file_list; /* list of files to print: req. content */ - char *form; /* preprinted form to print on */ - ushort actions; /* mail/write, immediate/hold/resume, raw */ - char *alert; /* program to run to alert user when done */ - char *options; /* print options; space separated list */ - short priority; /* priority level, 0-39, of the request */ - char *pages; /* list of pages to print (uniq. please!) */ - char *charset; /* character set to select or mount */ - char *modes; /* mode(s) of operation; space sep. list */ - char *title; /* optional title for banner page */ - char *input_type; /* type of content */ - char *user; /* user name of person submitting */ - ushort outcome; /* success/fauilure */ - ushort version; /* version of system sending job*/ -} REQUEST; - -REQUEST * getrequest ( char * ); -int putrequest ( char *, REQUEST * ); -void freerequest ( REQUEST * ); - diff --git a/usr/src/cmd/lp/lib/secure/llib-llpsec b/usr/src/cmd/lp/lib/secure/llib-llpsec deleted file mode 100644 index 796719ea7a..0000000000 --- a/usr/src/cmd/lp/lib/secure/llib-llpsec +++ /dev/null @@ -1,52 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright (c) 1998 by Sun Microsystems, Inc. - * All rights reserved. - */ - -/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ -/* All Rights Reserved */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -#include "sys/types.h" - -typedef struct SECURE { - uid_t uid; - gid_t gid; - off_t size; - time_t date; - char *system; - char *user; - char *req_id; -} SECURE; - - -SECURE * getsecure ( char * ); -int putsecure ( char *, SECURE * ); -int rmsecure (char *); -void freesecure ( SECURE * ); - diff --git a/usr/src/cmd/lp/lib/users/llib-llpusr b/usr/src/cmd/lp/lib/users/llib-llpusr deleted file mode 100644 index 86a18b8b1c..0000000000 --- a/usr/src/cmd/lp/lib/users/llib-llpusr +++ /dev/null @@ -1,59 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright (c) 1998 by Sun Microsystems, Inc. - * All rights reserved. - */ - -/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ -/* All Rights Reserved */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -#include "stdio.h" - -typedef struct -{ - short priority_limit; -} -USER; - -int putuser ( char * , USER * ); -int deluser ( char * ); -int getdfltpri ( void ); -void trashusers ( void ); - -USER * getuser ( char *); - -#define PRI_MAX 39 -#define PRI_MIN 0 - -struct user_priority -{ - short deflt; /* priority to use when not specified */ - short deflt_limit; /* priority limit for users not - otherwise specified */ - char **users[PRI_MAX - PRI_MIN + 1]; -}; diff --git a/usr/src/cmd/picl/plugins/lib/picld_pluginutil/llib-lpicld_pluginutil b/usr/src/cmd/picl/plugins/lib/picld_pluginutil/llib-lpicld_pluginutil deleted file mode 100644 index 393c896161..0000000000 --- a/usr/src/cmd/picl/plugins/lib/picld_pluginutil/llib-lpicld_pluginutil +++ /dev/null @@ -1,37 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -/* - * Copyright (c) 1999-2000 by Sun Microsystems, Inc. - * All rights reserved. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <picl.h> -#include <picltree.h> -#include "picld_pluginutil.h" - -int picld_pluginutil_parse_config_file(picl_nodehdl_t nh, - const char *filename); diff --git a/usr/src/cmd/sendmail/libmilter/llib-lmilter b/usr/src/cmd/sendmail/libmilter/llib-lmilter deleted file mode 100644 index 0d56627c3e..0000000000 --- a/usr/src/cmd/sendmail/libmilter/llib-lmilter +++ /dev/null @@ -1,32 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include "libmilter.h" diff --git a/usr/src/cmd/zdb/zdb.c b/usr/src/cmd/zdb/zdb.c index b591cc89a2..489b3db63c 100644 --- a/usr/src/cmd/zdb/zdb.c +++ b/usr/src/cmd/zdb/zdb.c @@ -2107,14 +2107,15 @@ static object_viewer_t *object_viewer[DMU_OT_NUMTYPES + 1] = { }; static void -dump_object(objset_t *os, uint64_t object, int verbosity, int *print_header) +dump_object(objset_t *os, uint64_t object, int verbosity, int *print_header, + uint64_t *dnode_slots_used) { dmu_buf_t *db = NULL; dmu_object_info_t doi; dnode_t *dn; void *bonus = NULL; size_t bsize = 0; - char iblk[32], dblk[32], lsize[32], asize[32], fill[32]; + char iblk[32], dblk[32], lsize[32], asize[32], fill[32], dnsize[32]; char bonus_size[32]; char aux[50]; int error; @@ -2127,9 +2128,9 @@ dump_object(objset_t *os, uint64_t object, int verbosity, int *print_header) CTASSERT(sizeof (bonus_size) >= NN_NUMBUF_SZ); if (*print_header) { - (void) printf("\n%10s %3s %5s %5s %5s %5s %6s %s\n", - "Object", "lvl", "iblk", "dblk", "dsize", "lsize", - "%full", "type"); + (void) printf("\n%10s %3s %5s %5s %5s %6s %5s %6s %s\n", + "Object", "lvl", "iblk", "dblk", "dsize", "dnsize", + "lsize", "%full", "type"); *print_header = 0; } @@ -2146,11 +2147,15 @@ dump_object(objset_t *os, uint64_t object, int verbosity, int *print_header) } dmu_object_info_from_dnode(dn, &doi); + if (dnode_slots_used != NULL) + *dnode_slots_used = doi.doi_dnodesize / DNODE_MIN_SIZE; + zdb_nicenum(doi.doi_metadata_block_size, iblk, sizeof (iblk)); zdb_nicenum(doi.doi_data_block_size, dblk, sizeof (dblk)); zdb_nicenum(doi.doi_max_offset, lsize, sizeof (lsize)); zdb_nicenum(doi.doi_physical_blocks_512 << 9, asize, sizeof (asize)); zdb_nicenum(doi.doi_bonus_size, bonus_size, sizeof (bonus_size)); + zdb_nicenum(doi.doi_dnodesize, dnsize, sizeof (dnsize)); (void) sprintf(fill, "%6.2f", 100.0 * doi.doi_fill_count * doi.doi_data_block_size / (object == 0 ? DNODES_PER_BLOCK : 1) / doi.doi_max_offset); @@ -2167,13 +2172,14 @@ dump_object(objset_t *os, uint64_t object, int verbosity, int *print_header) ZDB_COMPRESS_NAME(doi.doi_compress)); } - (void) printf("%10lld %3u %5s %5s %5s %5s %6s %s%s\n", - (u_longlong_t)object, doi.doi_indirection, iblk, dblk, - asize, lsize, fill, ZDB_OT_NAME(doi.doi_type), aux); + (void) printf("%10" PRIu64 + " %3u %5s %5s %5s %5s %5s %6s %s%s\n", + object, doi.doi_indirection, iblk, dblk, + asize, dnsize, lsize, fill, ZDB_OT_NAME(doi.doi_type), aux); if (doi.doi_bonus_type != DMU_OT_NONE && verbosity > 3) { - (void) printf("%10s %3s %5s %5s %5s %5s %6s %s\n", - "", "", "", "", "", bonus_size, "bonus", + (void) printf("%10s %3s %5s %5s %5s %5s %5s %6s %s\n", + "", "", "", "", "", "", bonus_size, "bonus", ZDB_OT_NAME(doi.doi_bonus_type)); } @@ -2277,6 +2283,9 @@ dump_dir(objset_t *os) int print_header = 1; unsigned i; int error; + uint64_t total_slots_used = 0; + uint64_t max_slot_used = 0; + uint64_t dnode_slots; /* make sure nicenum has enough space */ CTASSERT(sizeof (numbuf) >= NN_NUMBUF_SZ); @@ -2321,7 +2330,7 @@ dump_dir(objset_t *os) if (zopt_objects != 0) { for (i = 0; i < zopt_objects; i++) dump_object(os, zopt_object[i], verbosity, - &print_header); + &print_header, NULL); (void) printf("\n"); return; } @@ -2346,24 +2355,39 @@ dump_dir(objset_t *os) if (BP_IS_HOLE(os->os_rootbp)) return; - dump_object(os, 0, verbosity, &print_header); + dump_object(os, 0, verbosity, &print_header, NULL); object_count = 0; if (DMU_USERUSED_DNODE(os) != NULL && DMU_USERUSED_DNODE(os)->dn_type != 0) { - dump_object(os, DMU_USERUSED_OBJECT, verbosity, &print_header); - dump_object(os, DMU_GROUPUSED_OBJECT, verbosity, &print_header); + dump_object(os, DMU_USERUSED_OBJECT, verbosity, &print_header, + NULL); + dump_object(os, DMU_GROUPUSED_OBJECT, verbosity, &print_header, + NULL); } object = 0; while ((error = dmu_object_next(os, &object, B_FALSE, 0)) == 0) { - dump_object(os, object, verbosity, &print_header); + dump_object(os, object, verbosity, &print_header, &dnode_slots); object_count++; + total_slots_used += dnode_slots; + max_slot_used = object + dnode_slots - 1; } ASSERT3U(object_count, ==, usedobjs); (void) printf("\n"); + (void) printf(" Dnode slots:\n"); + (void) printf("\tTotal used: %10llu\n", + (u_longlong_t)total_slots_used); + (void) printf("\tMax used: %10llu\n", + (u_longlong_t)max_slot_used); + (void) printf("\tPercent empty: %10lf\n", + (double)(max_slot_used - total_slots_used)*100 / + (double)max_slot_used); + + (void) printf("\n"); + if (error != ESRCH) { (void) fprintf(stderr, "dmu_object_next() = %d\n", error); abort(); @@ -2552,7 +2576,7 @@ dump_path_impl(objset_t *os, uint64_t obj, char *name) return (dump_path_impl(os, child_obj, s + 1)); /*FALLTHROUGH*/ case DMU_OT_PLAIN_FILE_CONTENTS: - dump_object(os, child_obj, dump_opt['v'], &header); + dump_object(os, child_obj, dump_opt['v'], &header, NULL); return (0); default: (void) fprintf(stderr, "object %llu has non-file/directory " diff --git a/usr/src/cmd/zdb/zdb_il.c b/usr/src/cmd/zdb/zdb_il.c index a2ebe5857e..9daf9a7000 100644 --- a/usr/src/cmd/zdb/zdb_il.c +++ b/usr/src/cmd/zdb/zdb_il.c @@ -84,13 +84,15 @@ zil_prt_rec_create(zilog_t *zilog, int txtype, void *arg) } (void) printf("%s%s", tab_prefix, ctime(&crtime)); - (void) printf("%sdoid %llu, foid %llu, mode %llo\n", tab_prefix, - (u_longlong_t)lr->lr_doid, (u_longlong_t)lr->lr_foid, - (longlong_t)lr->lr_mode); - (void) printf("%suid %llu, gid %llu, gen %llu, rdev 0x%llx\n", - tab_prefix, - (u_longlong_t)lr->lr_uid, (u_longlong_t)lr->lr_gid, - (u_longlong_t)lr->lr_gen, (u_longlong_t)lr->lr_rdev); + (void) printf("%sdoid %" PRIu64 ", foid %" PRIu64 ", slots %" PRIu64 + ", mode %" PRIo64 "\n", + tab_prefix, lr->lr_doid, + LR_FOID_GET_OBJ(lr->lr_foid), + LR_FOID_GET_SLOTS(lr->lr_foid), + lr->lr_mode); + (void) printf("%suid %" PRIu64 ", gid %" PRIu64 ", gen %" PRIu64 + ", rdev %#" PRIx64 "\n", + tab_prefix, lr->lr_uid, lr->lr_gid, lr->lr_gen, lr->lr_rdev); } /* ARGSUSED */ diff --git a/usr/src/cmd/zstreamdump/zstreamdump.c b/usr/src/cmd/zstreamdump/zstreamdump.c index 17adbecd79..987f4fdf12 100644 --- a/usr/src/cmd/zstreamdump/zstreamdump.c +++ b/usr/src/cmd/zstreamdump/zstreamdump.c @@ -415,13 +415,15 @@ main(int argc, char *argv[]) drro->drr_toguid = BSWAP_64(drro->drr_toguid); } if (verbose) { - (void) printf("OBJECT object = %llu type = %u " - "bonustype = %u blksz = %u bonuslen = %u\n", - (u_longlong_t)drro->drr_object, + (void) printf("OBJECT object = %" PRIu64 + " type = %u bonustype = %u blksz = %u" + " bonuslen = %u dn_slots = %u\n", + drro->drr_object, drro->drr_type, drro->drr_bonustype, drro->drr_blksz, - drro->drr_bonuslen); + drro->drr_bonuslen, + drro->drr_dn_slots); } if (drro->drr_bonuslen > 0) { (void) ssread(buf, diff --git a/usr/src/cmd/ztest/ztest.c b/usr/src/cmd/ztest/ztest.c index 8db1103272..9198928d55 100644 --- a/usr/src/cmd/ztest/ztest.c +++ b/usr/src/cmd/ztest/ztest.c @@ -194,6 +194,7 @@ extern uint64_t zfs_deadman_synctime_ms; extern int metaslab_preload_limit; extern boolean_t zfs_compressed_arc_enabled; extern boolean_t zfs_abd_scatter_enabled; +extern int dmu_object_alloc_chunk_shift; extern boolean_t zfs_force_some_double_word_sm_entries; static ztest_shared_opts_t *ztest_shared_opts; @@ -224,6 +225,7 @@ typedef struct ztest_block_tag { uint64_t bt_magic; uint64_t bt_objset; uint64_t bt_object; + uint64_t bt_dnodesize; uint64_t bt_offset; uint64_t bt_gen; uint64_t bt_txg; @@ -274,6 +276,7 @@ typedef struct ztest_od { dmu_object_type_t od_crtype; uint64_t od_blocksize; uint64_t od_crblocksize; + uint64_t od_crdnodesize; uint64_t od_gen; uint64_t od_crgen; char od_name[ZFS_MAX_DATASET_NAME_LEN]; @@ -320,6 +323,7 @@ static ztest_shared_callstate_t *ztest_shared_callstate; ztest_func_t ztest_dmu_read_write; ztest_func_t ztest_dmu_write_parallel; ztest_func_t ztest_dmu_object_alloc_free; +ztest_func_t ztest_dmu_object_next_chunk; ztest_func_t ztest_dmu_commit_callbacks; ztest_func_t ztest_zap; ztest_func_t ztest_zap_parallel; @@ -349,6 +353,7 @@ ztest_func_t ztest_device_removal; ztest_func_t ztest_remap_blocks; ztest_func_t ztest_spa_checkpoint_create_discard; ztest_func_t ztest_initialize; +ztest_func_t ztest_verify_dnode_bt; uint64_t zopt_always = 0ULL * NANOSEC; /* all the time */ uint64_t zopt_incessant = 1ULL * NANOSEC / 10; /* every 1/10 second */ @@ -360,6 +365,7 @@ ztest_info_t ztest_info[] = { { ztest_dmu_read_write, 1, &zopt_always }, { ztest_dmu_write_parallel, 10, &zopt_always }, { ztest_dmu_object_alloc_free, 1, &zopt_always }, + { ztest_dmu_object_next_chunk, 1, &zopt_sometimes }, { ztest_dmu_commit_callbacks, 1, &zopt_always }, { ztest_zap, 30, &zopt_always }, { ztest_zap_parallel, 100, &zopt_always }, @@ -392,7 +398,8 @@ ztest_info_t ztest_info[] = { { ztest_device_removal, 1, &zopt_sometimes }, { ztest_remap_blocks, 1, &zopt_sometimes }, { ztest_spa_checkpoint_create_discard, 1, &zopt_rarely }, - { ztest_initialize, 1, &zopt_sometimes } + { ztest_initialize, 1, &zopt_sometimes }, + { ztest_verify_dnode_bt, 1, &zopt_sometimes } }; #define ZTEST_FUNCS (sizeof (ztest_info) / sizeof (ztest_info_t)) @@ -438,8 +445,8 @@ static spa_t *ztest_spa = NULL; static ztest_ds_t *ztest_ds; static kmutex_t ztest_vdev_lock; -static kmutex_t ztest_checkpoint_lock; static boolean_t ztest_device_removal_active = B_FALSE; +static kmutex_t ztest_checkpoint_lock; /* * The ztest_name_lock protects the pool and dataset namespace used by @@ -1009,6 +1016,36 @@ ztest_random_blocksize(void) } static int +ztest_random_dnodesize(void) +{ + int slots; + int max_slots = spa_maxdnodesize(ztest_spa) >> DNODE_SHIFT; + + if (max_slots == DNODE_MIN_SLOTS) + return (DNODE_MIN_SIZE); + + /* + * Weight the random distribution more heavily toward smaller + * dnode sizes since that is more likely to reflect real-world + * usage. + */ + ASSERT3U(max_slots, >, 4); + switch (ztest_random(10)) { + case 0: + slots = 5 + ztest_random(max_slots - 4); + break; + case 1 ... 4: + slots = 2 + ztest_random(3); + break; + default: + slots = 1; + break; + } + + return (slots << DNODE_SHIFT); +} + +static int ztest_random_ibshift(void) { return (DN_MIN_INDBLKSHIFT + @@ -1285,11 +1322,13 @@ ztest_pattern_match(void *buf, uint64_t size, uint64_t value) static void ztest_bt_generate(ztest_block_tag_t *bt, objset_t *os, uint64_t object, - uint64_t offset, uint64_t gen, uint64_t txg, uint64_t crtxg) + uint64_t dnodesize, uint64_t offset, uint64_t gen, uint64_t txg, + uint64_t crtxg) { bt->bt_magic = BT_MAGIC; bt->bt_objset = dmu_objset_id(os); bt->bt_object = object; + bt->bt_dnodesize = dnodesize; bt->bt_offset = offset; bt->bt_gen = gen; bt->bt_txg = txg; @@ -1298,11 +1337,13 @@ ztest_bt_generate(ztest_block_tag_t *bt, objset_t *os, uint64_t object, static void ztest_bt_verify(ztest_block_tag_t *bt, objset_t *os, uint64_t object, - uint64_t offset, uint64_t gen, uint64_t txg, uint64_t crtxg) + uint64_t dnodesize, uint64_t offset, uint64_t gen, uint64_t txg, + uint64_t crtxg) { ASSERT3U(bt->bt_magic, ==, BT_MAGIC); ASSERT3U(bt->bt_objset, ==, dmu_objset_id(os)); ASSERT3U(bt->bt_object, ==, object); + ASSERT3U(bt->bt_dnodesize, ==, dnodesize); ASSERT3U(bt->bt_offset, ==, offset); ASSERT3U(bt->bt_gen, <=, gen); ASSERT3U(bt->bt_txg, <=, txg); @@ -1324,6 +1365,52 @@ ztest_bt_bonus(dmu_buf_t *db) } /* + * Generate a token to fill up unused bonus buffer space. Try to make + * it unique to the object, generation, and offset to verify that data + * is not getting overwritten by data from other dnodes. + */ +#define ZTEST_BONUS_FILL_TOKEN(obj, ds, gen, offset) \ + (((ds) << 48) | ((gen) << 32) | ((obj) << 8) | (offset)) + +/* + * Fill up the unused bonus buffer region before the block tag with a + * verifiable pattern. Filling the whole bonus area with non-zero data + * helps ensure that all dnode traversal code properly skips the + * interior regions of large dnodes. + */ +void +ztest_fill_unused_bonus(dmu_buf_t *db, void *end, uint64_t obj, + objset_t *os, uint64_t gen) +{ + uint64_t *bonusp; + + ASSERT(IS_P2ALIGNED((char *)end - (char *)db->db_data, 8)); + + for (bonusp = db->db_data; bonusp < (uint64_t *)end; bonusp++) { + uint64_t token = ZTEST_BONUS_FILL_TOKEN(obj, dmu_objset_id(os), + gen, bonusp - (uint64_t *)db->db_data); + *bonusp = token; + } +} + +/* + * Verify that the unused area of a bonus buffer is filled with the + * expected tokens. + */ +void +ztest_verify_unused_bonus(dmu_buf_t *db, void *end, uint64_t obj, + objset_t *os, uint64_t gen) +{ + uint64_t *bonusp; + + for (bonusp = db->db_data; bonusp < (uint64_t *)end; bonusp++) { + uint64_t token = ZTEST_BONUS_FILL_TOKEN(obj, dmu_objset_id(os), + gen, bonusp - (uint64_t *)db->db_data); + VERIFY3U(*bonusp, ==, token); + } +} + +/* * ZIL logging ops */ @@ -1331,7 +1418,7 @@ ztest_bt_bonus(dmu_buf_t *db) #define lrz_blocksize lr_uid #define lrz_ibshift lr_gid #define lrz_bonustype lr_rdev -#define lrz_bonuslen lr_crtime[1] +#define lrz_dnodesize lr_crtime[1] static void ztest_log_create(ztest_ds_t *zd, dmu_tx_t *tx, lr_create_t *lr) @@ -1447,6 +1534,7 @@ ztest_replay_create(void *arg1, void *arg2, boolean_t byteswap) dmu_tx_t *tx; uint64_t txg; int error = 0; + int bonuslen; if (byteswap) byteswap_uint64_array(lr, sizeof (*lr)); @@ -1469,26 +1557,27 @@ ztest_replay_create(void *arg1, void *arg2, boolean_t byteswap) return (ENOSPC); ASSERT(dmu_objset_zil(os)->zl_replay == !!lr->lr_foid); + bonuslen = DN_BONUS_SIZE(lr->lrz_dnodesize); if (lr->lrz_type == DMU_OT_ZAP_OTHER) { if (lr->lr_foid == 0) { - lr->lr_foid = zap_create(os, + lr->lr_foid = zap_create_dnsize(os, lr->lrz_type, lr->lrz_bonustype, - lr->lrz_bonuslen, tx); + bonuslen, lr->lrz_dnodesize, tx); } else { - error = zap_create_claim(os, lr->lr_foid, + error = zap_create_claim_dnsize(os, lr->lr_foid, lr->lrz_type, lr->lrz_bonustype, - lr->lrz_bonuslen, tx); + bonuslen, lr->lrz_dnodesize, tx); } } else { if (lr->lr_foid == 0) { - lr->lr_foid = dmu_object_alloc(os, + lr->lr_foid = dmu_object_alloc_dnsize(os, lr->lrz_type, 0, lr->lrz_bonustype, - lr->lrz_bonuslen, tx); + bonuslen, lr->lrz_dnodesize, tx); } else { - error = dmu_object_claim(os, lr->lr_foid, + error = dmu_object_claim_dnsize(os, lr->lr_foid, lr->lrz_type, 0, lr->lrz_bonustype, - lr->lrz_bonuslen, tx); + bonuslen, lr->lrz_dnodesize, tx); } } @@ -1508,7 +1597,9 @@ ztest_replay_create(void *arg1, void *arg2, boolean_t byteswap) VERIFY3U(0, ==, dmu_bonus_hold(os, lr->lr_foid, FTAG, &db)); bbt = ztest_bt_bonus(db); dmu_buf_will_dirty(db, tx); - ztest_bt_generate(bbt, os, lr->lr_foid, -1ULL, lr->lr_gen, txg, txg); + ztest_bt_generate(bbt, os, lr->lr_foid, lr->lrz_dnodesize, -1ULL, + lr->lr_gen, txg, txg); + ztest_fill_unused_bonus(db, bbt, lr->lr_foid, os, lr->lr_gen); dmu_buf_rele(db, FTAG); VERIFY3U(0, ==, zap_add(os, lr->lr_doid, name, sizeof (uint64_t), 1, @@ -1658,7 +1749,7 @@ ztest_replay_write(void *arg1, void *arg2, boolean_t byteswap) VERIFY(dmu_read(os, lr->lr_foid, offset, sizeof (rbt), &rbt, prefetch) == 0); if (rbt.bt_magic == BT_MAGIC) { - ztest_bt_verify(&rbt, os, lr->lr_foid, + ztest_bt_verify(&rbt, os, lr->lr_foid, 0, offset, gen, txg, crtxg); } } @@ -1670,7 +1761,7 @@ ztest_replay_write(void *arg1, void *arg2, boolean_t byteswap) * as it was when the write was generated. */ if (zd->zd_zilog->zl_replay) { - ztest_bt_verify(bt, os, lr->lr_foid, offset, + ztest_bt_verify(bt, os, lr->lr_foid, 0, offset, MAX(gen, bt->bt_gen), MAX(txg, lrtxg), bt->bt_crtxg); } @@ -1679,7 +1770,8 @@ ztest_replay_write(void *arg1, void *arg2, boolean_t byteswap) * Set the bt's gen/txg to the bonus buffer's gen/txg * so that all of the usual ASSERTs will work. */ - ztest_bt_generate(bt, os, lr->lr_foid, offset, gen, txg, crtxg); + ztest_bt_generate(bt, os, lr->lr_foid, 0, offset, gen, txg, + crtxg); } if (abuf == NULL) { @@ -1751,7 +1843,7 @@ ztest_replay_setattr(void *arg1, void *arg2, boolean_t byteswap) dmu_tx_t *tx; dmu_buf_t *db; ztest_block_tag_t *bbt; - uint64_t txg, lrtxg, crtxg; + uint64_t txg, lrtxg, crtxg, dnodesize; if (byteswap) byteswap_uint64_array(lr, sizeof (*lr)); @@ -1774,6 +1866,7 @@ ztest_replay_setattr(void *arg1, void *arg2, boolean_t byteswap) ASSERT3U(bbt->bt_magic, ==, BT_MAGIC); crtxg = bbt->bt_crtxg; lrtxg = lr->lr_common.lrc_txg; + dnodesize = bbt->bt_dnodesize; if (zd->zd_zilog->zl_replay) { ASSERT(lr->lr_size != 0); @@ -1792,7 +1885,7 @@ ztest_replay_setattr(void *arg1, void *arg2, boolean_t byteswap) /* * Verify that the current bonus buffer is not newer than our txg. */ - ztest_bt_verify(bbt, os, lr->lr_foid, -1ULL, lr->lr_mode, + ztest_bt_verify(bbt, os, lr->lr_foid, dnodesize, -1ULL, lr->lr_mode, MAX(txg, lrtxg), crtxg); dmu_buf_will_dirty(db, tx); @@ -1802,7 +1895,9 @@ ztest_replay_setattr(void *arg1, void *arg2, boolean_t byteswap) VERIFY0(dmu_set_bonus(db, lr->lr_size, tx)); bbt = ztest_bt_bonus(db); - ztest_bt_generate(bbt, os, lr->lr_foid, -1ULL, lr->lr_mode, txg, crtxg); + ztest_bt_generate(bbt, os, lr->lr_foid, dnodesize, -1ULL, lr->lr_mode, + txg, crtxg); + ztest_fill_unused_bonus(db, bbt, lr->lr_foid, os, bbt->bt_gen); dmu_buf_rele(db, FTAG); @@ -2033,7 +2128,7 @@ ztest_create(ztest_ds_t *zd, ztest_od_t *od, int count) lr->lrz_blocksize = od->od_crblocksize; lr->lrz_ibshift = ztest_random_ibshift(); lr->lrz_bonustype = DMU_OT_UINT64_OTHER; - lr->lrz_bonuslen = dmu_bonus_max(); + lr->lrz_dnodesize = od->od_crdnodesize; lr->lr_gen = od->od_crgen; lr->lr_crtime[0] = time(NULL); @@ -2212,7 +2307,8 @@ ztest_io(ztest_ds_t *zd, uint64_t object, uint64_t offset) switch (io_type) { case ZTEST_IO_WRITE_TAG: - ztest_bt_generate(&wbt, zd->zd_os, object, offset, 0, 0, 0); + ztest_bt_generate(&wbt, zd->zd_os, object, doi.doi_dnodesize, + offset, 0, 0, 0); (void) ztest_write(zd, object, offset, sizeof (wbt), &wbt); break; @@ -2273,13 +2369,15 @@ ztest_io(ztest_ds_t *zd, uint64_t object, uint64_t offset) */ static void ztest_od_init(ztest_od_t *od, uint64_t id, char *tag, uint64_t index, - dmu_object_type_t type, uint64_t blocksize, uint64_t gen) + dmu_object_type_t type, uint64_t blocksize, uint64_t dnodesize, + uint64_t gen) { od->od_dir = ZTEST_DIROBJ; od->od_object = 0; od->od_crtype = type; od->od_crblocksize = blocksize ? blocksize : ztest_random_blocksize(); + od->od_crdnodesize = dnodesize ? dnodesize : ztest_random_dnodesize(); od->od_crgen = gen; od->od_type = DMU_OT_NONE; @@ -3724,8 +3822,10 @@ ztest_dmu_object_alloc_free(ztest_ds_t *zd, uint64_t id) ztest_od_t od[4]; int batchsize = sizeof (od) / sizeof (od[0]); - for (int b = 0; b < batchsize; b++) - ztest_od_init(&od[b], id, FTAG, b, DMU_OT_UINT64_OTHER, 0, 0); + for (int b = 0; b < batchsize; b++) { + ztest_od_init(&od[b], id, FTAG, b, DMU_OT_UINT64_OTHER, + 0, 0, 0); + } /* * Destroy the previous batch of objects, create a new batch, @@ -3740,6 +3840,26 @@ ztest_dmu_object_alloc_free(ztest_ds_t *zd, uint64_t id) } /* + * Rewind the global allocator to verify object allocation backfilling. + */ +void +ztest_dmu_object_next_chunk(ztest_ds_t *zd, uint64_t id) +{ + objset_t *os = zd->zd_os; + int dnodes_per_chunk = 1 << dmu_object_alloc_chunk_shift; + uint64_t object; + + /* + * Rewind the global allocator randomly back to a lower object number + * to force backfilling and reclamation of recently freed dnodes. + */ + mutex_enter(&os->os_obj_lock); + object = ztest_random(os->os_obj_next_chunk); + os->os_obj_next_chunk = P2ALIGN(object, dnodes_per_chunk); + mutex_exit(&os->os_obj_lock); +} + +/* * Verify that dmu_{read,write} work as expected. */ void @@ -3785,8 +3905,10 @@ ztest_dmu_read_write(ztest_ds_t *zd, uint64_t id) /* * Read the directory info. If it's the first time, set things up. */ - ztest_od_init(&od[0], id, FTAG, 0, DMU_OT_UINT64_OTHER, 0, chunksize); - ztest_od_init(&od[1], id, FTAG, 1, DMU_OT_UINT64_OTHER, 0, chunksize); + ztest_od_init(&od[0], id, FTAG, 0, DMU_OT_UINT64_OTHER, 0, 0, + chunksize); + ztest_od_init(&od[1], id, FTAG, 1, DMU_OT_UINT64_OTHER, 0, 0, + chunksize); if (ztest_object_init(zd, od, sizeof (od), B_FALSE) != 0) return; @@ -4055,8 +4177,10 @@ ztest_dmu_read_write_zcopy(ztest_ds_t *zd, uint64_t id) /* * Read the directory info. If it's the first time, set things up. */ - ztest_od_init(&od[0], id, FTAG, 0, DMU_OT_UINT64_OTHER, blocksize, 0); - ztest_od_init(&od[1], id, FTAG, 1, DMU_OT_UINT64_OTHER, 0, chunksize); + ztest_od_init(&od[0], id, FTAG, 0, DMU_OT_UINT64_OTHER, blocksize, + 0, 0); + ztest_od_init(&od[1], id, FTAG, 1, DMU_OT_UINT64_OTHER, 0, 0, + chunksize); if (ztest_object_init(zd, od, sizeof (od), B_FALSE) != 0) return; @@ -4257,7 +4381,8 @@ ztest_dmu_write_parallel(ztest_ds_t *zd, uint64_t id) * to verify that parallel writes to an object -- even to the * same blocks within the object -- doesn't cause any trouble. */ - ztest_od_init(&od[0], ID_PARALLEL, FTAG, 0, DMU_OT_UINT64_OTHER, 0, 0); + ztest_od_init(&od[0], ID_PARALLEL, FTAG, 0, DMU_OT_UINT64_OTHER, + 0, 0, 0); if (ztest_object_init(zd, od, sizeof (od), B_FALSE) != 0) return; @@ -4276,7 +4401,8 @@ ztest_dmu_prealloc(ztest_ds_t *zd, uint64_t id) uint64_t blocksize = ztest_random_blocksize(); void *data; - ztest_od_init(&od[0], id, FTAG, 0, DMU_OT_UINT64_OTHER, blocksize, 0); + ztest_od_init(&od[0], id, FTAG, 0, DMU_OT_UINT64_OTHER, blocksize, + 0, 0); if (ztest_object_init(zd, od, sizeof (od), !ztest_random(2)) != 0) return; @@ -4322,7 +4448,7 @@ ztest_zap(ztest_ds_t *zd, uint64_t id) int error; char *hc[2] = { "s.acl.h", ".s.open.h.hyLZlg" }; - ztest_od_init(&od[0], id, FTAG, 0, DMU_OT_ZAP_OTHER, 0, 0); + ztest_od_init(&od[0], id, FTAG, 0, DMU_OT_ZAP_OTHER, 0, 0, 0); if (ztest_object_init(zd, od, sizeof (od), !ztest_random(2)) != 0) return; @@ -4454,7 +4580,7 @@ ztest_fzap(ztest_ds_t *zd, uint64_t id) ztest_od_t od[1]; uint64_t object, txg; - ztest_od_init(&od[0], id, FTAG, 0, DMU_OT_ZAP_OTHER, 0, 0); + ztest_od_init(&od[0], id, FTAG, 0, DMU_OT_ZAP_OTHER, 0, 0, 0); if (ztest_object_init(zd, od, sizeof (od), !ztest_random(2)) != 0) return; @@ -4500,7 +4626,8 @@ ztest_zap_parallel(ztest_ds_t *zd, uint64_t id) char name[20], string_value[20]; void *data; - ztest_od_init(&od[0], ID_PARALLEL, FTAG, micro, DMU_OT_ZAP_OTHER, 0, 0); + ztest_od_init(&od[0], ID_PARALLEL, FTAG, micro, DMU_OT_ZAP_OTHER, + 0, 0, 0); if (ztest_object_init(zd, od, sizeof (od), B_FALSE) != 0) return; @@ -4688,7 +4815,7 @@ ztest_dmu_commit_callbacks(ztest_ds_t *zd, uint64_t id) uint64_t old_txg, txg; int i, error; - ztest_od_init(&od[0], id, FTAG, 0, DMU_OT_UINT64_OTHER, 0, 0); + ztest_od_init(&od[0], id, FTAG, 0, DMU_OT_UINT64_OTHER, 0, 0, 0); if (ztest_object_init(zd, od, sizeof (od), B_FALSE) != 0) return; @@ -4802,6 +4929,41 @@ ztest_dmu_commit_callbacks(ztest_ds_t *zd, uint64_t id) dmu_tx_commit(tx); } +/* + * Visit each object in the dataset. Verify that its properties + * are consistent what was stored in the block tag when it was created, + * and that its unused bonus buffer space has not been overwritten. + */ +void +ztest_verify_dnode_bt(ztest_ds_t *zd, uint64_t id) +{ + objset_t *os = zd->zd_os; + uint64_t obj; + int err = 0; + + for (obj = 0; err == 0; err = dmu_object_next(os, &obj, FALSE, 0)) { + ztest_block_tag_t *bt = NULL; + dmu_object_info_t doi; + dmu_buf_t *db; + + if (dmu_bonus_hold(os, obj, FTAG, &db) != 0) + continue; + + dmu_object_info_from_db(db, &doi); + if (doi.doi_bonus_size >= sizeof (*bt)) + bt = ztest_bt_bonus(db); + + if (bt && bt->bt_magic == BT_MAGIC) { + ztest_bt_verify(bt, os, obj, doi.doi_dnodesize, + bt->bt_offset, bt->bt_gen, bt->bt_txg, + bt->bt_crtxg); + ztest_verify_unused_bonus(db, bt, obj, os, bt->bt_gen); + } + + dmu_buf_rele(db, FTAG); + } +} + /* ARGSUSED */ void ztest_dsl_prop_get_set(ztest_ds_t *zd, uint64_t id) @@ -5286,7 +5448,8 @@ ztest_ddt_repair(ztest_ds_t *zd, uint64_t id) blocksize = ztest_random_blocksize(); blocksize = MIN(blocksize, 2048); /* because we write so many */ - ztest_od_init(&od[0], id, FTAG, 0, DMU_OT_UINT64_OTHER, blocksize, 0); + ztest_od_init(&od[0], id, FTAG, 0, DMU_OT_UINT64_OTHER, blocksize, + 0, 0); if (ztest_object_init(zd, od, sizeof (od), B_FALSE) != 0) return; @@ -6158,7 +6321,7 @@ ztest_freeze(void) numloops++ < ztest_opts.zo_maxloops && metaslab_class_get_alloc(spa_normal_class(spa)) < capacity) { ztest_od_t od; - ztest_od_init(&od, 0, FTAG, 0, DMU_OT_UINT64_OTHER, 0, 0); + ztest_od_init(&od, 0, FTAG, 0, DMU_OT_UINT64_OTHER, 0, 0, 0); VERIFY0(ztest_object_init(zd, &od, sizeof (od), B_FALSE)); ztest_io(zd, od.od_object, ztest_random(ZTEST_RANGE_LOCKS) << SPA_MAXBLOCKSHIFT); diff --git a/usr/src/common/zfs/zfeature_common.c b/usr/src/common/zfs/zfeature_common.c index 1d56bb6e3f..b1760b6898 100644 --- a/usr/src/common/zfs/zfeature_common.c +++ b/usr/src/common/zfs/zfeature_common.c @@ -260,6 +260,17 @@ zpool_feature_init(void) "Support for blocks larger than 128KB.", ZFEATURE_FLAG_PER_DATASET, large_blocks_deps); + { + static const spa_feature_t large_dnode_deps[] = { + SPA_FEATURE_EXTENSIBLE_DATASET, + SPA_FEATURE_NONE + }; + zfeature_register(SPA_FEATURE_LARGE_DNODE, + "org.zfsonlinux:large_dnode", "large_dnode", + "Variable on-disk size of dnodes.", + ZFEATURE_FLAG_PER_DATASET, large_dnode_deps); + } + static const spa_feature_t sha512_deps[] = { SPA_FEATURE_EXTENSIBLE_DATASET, SPA_FEATURE_NONE diff --git a/usr/src/common/zfs/zfeature_common.h b/usr/src/common/zfs/zfeature_common.h index a852f07018..3376b9921b 100644 --- a/usr/src/common/zfs/zfeature_common.h +++ b/usr/src/common/zfs/zfeature_common.h @@ -53,6 +53,7 @@ typedef enum spa_feature { SPA_FEATURE_BOOKMARKS, SPA_FEATURE_FS_SS_LIMIT, SPA_FEATURE_LARGE_BLOCKS, + SPA_FEATURE_LARGE_DNODE, SPA_FEATURE_SHA512, SPA_FEATURE_SKEIN, SPA_FEATURE_EDONR, diff --git a/usr/src/common/zfs/zfs_prop.c b/usr/src/common/zfs/zfs_prop.c index 80d5ce73b0..9e3692600c 100644 --- a/usr/src/common/zfs/zfs_prop.c +++ b/usr/src/common/zfs/zfs_prop.c @@ -210,6 +210,17 @@ zfs_prop_init(void) { NULL } }; + static zprop_index_t dnsize_table[] = { + { "legacy", ZFS_DNSIZE_LEGACY }, + { "auto", ZFS_DNSIZE_AUTO }, + { "1k", ZFS_DNSIZE_1K }, + { "2k", ZFS_DNSIZE_2K }, + { "4k", ZFS_DNSIZE_4K }, + { "8k", ZFS_DNSIZE_8K }, + { "16k", ZFS_DNSIZE_16K }, + { NULL } + }; + static zprop_index_t redundant_metadata_table[] = { { "all", ZFS_REDUNDANT_METADATA_ALL }, { "most", ZFS_REDUNDANT_METADATA_MOST }, @@ -266,6 +277,10 @@ zfs_prop_init(void) PROP_INHERIT, ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME, "latency | throughput", "LOGBIAS", logbias_table); + zprop_register_index(ZFS_PROP_DNODESIZE, "dnodesize", + ZFS_DNSIZE_LEGACY, PROP_INHERIT, ZFS_TYPE_FILESYSTEM, + "legacy | auto | 1k | 2k | 4k | 8k | 16k", "DNSIZE", dnsize_table); + /* inherit index (boolean) properties */ zprop_register_index(ZFS_PROP_ATIME, "atime", 1, PROP_INHERIT, ZFS_TYPE_FILESYSTEM, "on | off", "ATIME", boolean_table); diff --git a/usr/src/common/zfs/zpool_prop.c b/usr/src/common/zfs/zpool_prop.c index 0a69a51207..cbbd299185 100644 --- a/usr/src/common/zfs/zpool_prop.c +++ b/usr/src/common/zfs/zpool_prop.c @@ -138,6 +138,8 @@ zpool_prop_init(void) PROP_TYPE_NUMBER, PROP_READONLY, ZFS_TYPE_POOL, "MAXBLOCKSIZE"); zprop_register_hidden(ZPOOL_PROP_TNAME, "tname", PROP_TYPE_STRING, PROP_ONETIME, ZFS_TYPE_POOL, "TNAME"); + zprop_register_hidden(ZPOOL_PROP_MAXDNODESIZE, "maxdnodesize", + PROP_TYPE_NUMBER, PROP_READONLY, ZFS_TYPE_POOL, "MAXDNODESIZE"); } /* diff --git a/usr/src/data/terminfo/terminfo.src b/usr/src/data/terminfo/terminfo.src index bd98d6cbee..919a1dbf8e 100644 --- a/usr/src/data/terminfo/terminfo.src +++ b/usr/src/data/terminfo/terminfo.src @@ -5296,7 +5296,7 @@ sun-type4|Sun Workstation console with type 4 keyboard, # cbt=\E[Z # dim=\E[2m # blink=\E[5m -# It supports bold, but not underline -TD (2009-09-19) +# It supports bold -TD (2009-09-19) sun-color|Sun Microsystems Workstation console with color support (IA systems), colors#8, ncv#3, pairs#64, cub=\E[%p1%dD, cud=\E[%p1%dB, cuf=\E[%p1%dC, @@ -5304,7 +5304,7 @@ sun-color|Sun Microsystems Workstation console with color support (IA systems), setaf=\E[3%p1%dm, setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m, setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m, - smso=\E[1m, use=sun, + smso=\E[1m, smul=\E[4m,rmul=\E[24m,use=sun, #### Iris consoles # diff --git a/usr/src/lib/Makefile b/usr/src/lib/Makefile index e1823f78f3..a6877bb589 100644 --- a/usr/src/lib/Makefile +++ b/usr/src/lib/Makefile @@ -31,6 +31,7 @@ # Copyright (c) 2016, Chris Fraire <cfraire@me.com>. # Copyright 2017 RackTop Systems. # Copyirght 2018 Jason King +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # include ../Makefile.master @@ -530,7 +531,6 @@ clean := TARGET= clean clobber := TARGET= clobber install := TARGET= install install_h := TARGET= install_h -lint := TARGET= lint _dc := TARGET= _dc _msg := TARGET= _msg @@ -539,12 +539,12 @@ _msg := TARGET= _msg # # For the all and install targets, we clearly must respect library # dependencies so that the libraries link correctly. However, for -# the remaining targets (check, clean, clobber, install_h, lint, _dc +# the remaining targets (check, clean, clobber, install_h, _dc # and _msg), libraries do not have any dependencies on one another # and thus respecting dependencies just slows down the build. # As such, for these rules, we use pattern replacement to explicitly -# avoid triggering the dependency information. Note that for clean, -# clobber and lint, we must use $(NOWAIT_SUBDIRS) rather than +# avoid triggering the dependency information. Note that for clean and +# clobber, we must use $(NOWAIT_SUBDIRS) rather than # $(SUBDIRS), to prevent `.WAIT' from expanding to `.WAIT-nodepend'. # @@ -557,7 +557,9 @@ install_extra: @cd ../cmd/sgs; pwd; $(MAKE) install_lib @pwd -clean clobber lint: $(NOWAIT_SUBDIRS:%=%-nodepend) +clean clobber: $(NOWAIT_SUBDIRS:%=%-nodepend) + +lint: install_h check: $(HDRSUBDIRS:%=%-nodepend) diff --git a/usr/src/lib/Makefile.lib b/usr/src/lib/Makefile.lib index 82e3a22d41..686298e4e8 100644 --- a/usr/src/lib/Makefile.lib +++ b/usr/src/lib/Makefile.lib @@ -18,6 +18,7 @@ # # CDDL HEADER END # +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # Copyright 2015 Gary Mills # Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com> # Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved. @@ -70,9 +71,9 @@ HDRDIR= /__nonexistent_directory__ # If a component of the build needs to build an archive library # for its own internal purposes, it can define LIBS for itself # after including Makefile.lib, like this: -# LIBS = $(LIBRARY) +# LIBS = $(LIBRARY) # or: -# LIBS = $(LIBRARYCCC) +# LIBS = $(LIBRARYCCC) # Archive libraries must not be installed in the proto area. # LIBS= @@ -91,9 +92,6 @@ ROOTLIBDIR= $(ROOT)/usr/lib ROOTLIBDIR64= $(ROOT)/usr/lib/$(MACH64) ROOTFS_LIBDIR= $(ROOT)/lib ROOTFS_LIBDIR64= $(ROOT)/lib/$(MACH64) -ROOTLINTDIR= $(ROOTLIBDIR) -ROOTFS_LINTDIR= $(ROOTFS_LIBDIR) -ROOTFS_LINTDIR64= $(ROOTFS_LIBDIR64) ROOTHDRS= $(HDRS:%=$(ROOTHDRDIR)/%) HDRSRCS= $(HDRS:%=$(HDRDIR)/%) CHECKHDRS= $(HDRSRCS:%.h=%.check) @@ -109,9 +107,6 @@ ROOTLINKSCCC= $(ROOTLIBDIR)/$(LIBLINKSCCC) ROOTLINKSCCC64= $(ROOTLIBDIR64)/$(LIBLINKSCCC) ROOTFS_LINKSCCC= $(ROOTFS_LIBDIR)/$(LIBLINKSCCC) ROOTFS_LINKSCCC64= $(ROOTFS_LIBDIR64)/$(LIBLINKSCCC) -ROOTLINT= $(LINTSRC:%=$(ROOTLINTDIR)/%) -ROOTFS_LINT= $(LINTSRC:%=$(ROOTFS_LINTDIR)/%) -ROOTFS_LINT64= $(LINTSRC:%=$(ROOTFS_LINTDIR64)/%) # Demo rules DEMOFILES= @@ -121,11 +116,6 @@ ROOTDEMODIRS= ROOTDEMOFILES= $(DEMOFILES:%=$(ROOTDEMODIRBASE)/%) $(ROOTDEMODIRS) := DIRMODE = 755 -LINTLIB= llib-l$(LIBNAME).ln -LINTFLAGS= -uaxm -LINTFLAGS64= -uaxm -m64 -LINTSRC= $(LINTLIB:%.ln=%) -LINTOUT= lint.out ARFLAGS= r SONAME= $(DYNLIB) # For most libraries, we should be able to resolve all symbols at link time, @@ -217,7 +207,6 @@ $(PICS) := CFLAGS64 += $(CTF_FLAGS) $(PICS) := CTFCONVERT_POST = $(CTFCONVERT_O) $(DYNLIB) := CTFMERGE_POST = $(CTFMERGE_LIB) -$(LINTLIB):= LOG = -DLOGGING $(LIBRARY):= AROBJS = $(OBJS) $(LIBRARY):= DIR = objs $(DYNLIB):= DIR = pics @@ -233,7 +222,7 @@ $(DYNLIBCCC):= DYNFLAGS = $(HSONAMECCC) $(ZTEXT) $(ZDEFS) \ $(BDIRECT) $(NORUNPATH) -# build rule for "portable" source +# build rule for "portable" source objs/%.o pics/%.o: %.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) @@ -248,15 +237,6 @@ objs/%.o pics/%.o: %.cc TEXT_DOMAIN= SUNW_OST_OSLIB # -# For library source code, we expect that some symbols may not be used or -# may *appear* to be able to rescoped to static; shut lint up. Never add -# a flag here unless you're *sure* that all libraries need to be linted -# with it. -# -LINTCHECKFLAGS = -m -erroff=E_NAME_DEF_NOT_USED2 -LINTCHECKFLAGS += -erroff=E_NAME_DECL_NOT_USED_DEF2 - -# # Target Architecture # TARGETMACH= $(MACH) diff --git a/usr/src/lib/fm/libdiagcode/common/llib-ldiagcode b/usr/src/lib/fm/libdiagcode/common/llib-ldiagcode deleted file mode 100644 index cd6b28f864..0000000000 --- a/usr/src/lib/fm/libdiagcode/common/llib-ldiagcode +++ /dev/null @@ -1,32 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <fm/diagcode.h> diff --git a/usr/src/lib/fm/libdiskstatus/common/llib-ldiskstatus b/usr/src/lib/fm/libdiskstatus/common/llib-ldiskstatus deleted file mode 100644 index a20222355f..0000000000 --- a/usr/src/lib/fm/libdiskstatus/common/llib-ldiskstatus +++ /dev/null @@ -1,31 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <libdiskstatus.h> diff --git a/usr/src/lib/fm/libfmd_adm/common/llib-lfmd_adm b/usr/src/lib/fm/libfmd_adm/common/llib-lfmd_adm deleted file mode 100644 index a1124f3abb..0000000000 --- a/usr/src/lib/fm/libfmd_adm/common/llib-lfmd_adm +++ /dev/null @@ -1,32 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <fm/fmd_adm.h> diff --git a/usr/src/lib/fm/libfmd_agent/common/llib-lfmd_agent b/usr/src/lib/fm/libfmd_agent/common/llib-lfmd_agent deleted file mode 100644 index 83891359e6..0000000000 --- a/usr/src/lib/fm/libfmd_agent/common/llib-lfmd_agent +++ /dev/null @@ -1,29 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <fm/fmd_agent.h> diff --git a/usr/src/lib/fm/libfmd_log/common/llib-lfmd_log b/usr/src/lib/fm/libfmd_log/common/llib-lfmd_log deleted file mode 100644 index 93ed21790c..0000000000 --- a/usr/src/lib/fm/libfmd_log/common/llib-lfmd_log +++ /dev/null @@ -1,32 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <fm/fmd_log.h> diff --git a/usr/src/lib/fm/libfmd_msg/common/llib-lfmd_msg b/usr/src/lib/fm/libfmd_msg/common/llib-lfmd_msg deleted file mode 100644 index c7609ca9f7..0000000000 --- a/usr/src/lib/fm/libfmd_msg/common/llib-lfmd_msg +++ /dev/null @@ -1,29 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ diff --git a/usr/src/lib/fm/libfmd_snmp/common/llib-lfmd_snmp b/usr/src/lib/fm/libfmd_snmp/common/llib-lfmd_snmp deleted file mode 100644 index abcf460a60..0000000000 --- a/usr/src/lib/fm/libfmd_snmp/common/llib-lfmd_snmp +++ /dev/null @@ -1,32 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <fm/fmd_snmp.h> diff --git a/usr/src/lib/fm/libfmevent/common/llib-lfmevent b/usr/src/lib/fm/libfmevent/common/llib-lfmevent deleted file mode 100644 index 44c20c3d72..0000000000 --- a/usr/src/lib/fm/libfmevent/common/llib-lfmevent +++ /dev/null @@ -1,30 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright 2009 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <fm/libfmevent.h> diff --git a/usr/src/lib/fm/libfmnotify/common/llib-lfmnotify b/usr/src/lib/fm/libfmnotify/common/llib-lfmnotify deleted file mode 100644 index 230bb3efd8..0000000000 --- a/usr/src/lib/fm/libfmnotify/common/llib-lfmnotify +++ /dev/null @@ -1,27 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. - */ - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ diff --git a/usr/src/lib/fm/libldom/sparc/llib-lldom b/usr/src/lib/fm/libldom/sparc/llib-lldom deleted file mode 100644 index 166e155f5b..0000000000 --- a/usr/src/lib/fm/libldom/sparc/llib-lldom +++ /dev/null @@ -1,31 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <sys/fm/ldom.h> diff --git a/usr/src/lib/fm/libmdesc/common/llib-lmdesc b/usr/src/lib/fm/libmdesc/common/llib-lmdesc deleted file mode 100644 index 8d876f05b9..0000000000 --- a/usr/src/lib/fm/libmdesc/common/llib-lmdesc +++ /dev/null @@ -1,32 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <sys/mdesc.h> diff --git a/usr/src/lib/fm/libseslog/common/llib-lseslog b/usr/src/lib/fm/libseslog/common/llib-lseslog deleted file mode 100644 index 430d5db938..0000000000 --- a/usr/src/lib/fm/libseslog/common/llib-lseslog +++ /dev/null @@ -1,30 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. - */ - - - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - - diff --git a/usr/src/lib/fm/topo/libtopo/common/llib-ltopo b/usr/src/lib/fm/topo/libtopo/common/llib-ltopo deleted file mode 100644 index b6b2228c63..0000000000 --- a/usr/src/lib/fm/topo/libtopo/common/llib-ltopo +++ /dev/null @@ -1,32 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <fm/libtopo.h> diff --git a/usr/src/lib/hal/libhal-storage/common/llib-lhal-storage b/usr/src/lib/hal/libhal-storage/common/llib-lhal-storage deleted file mode 100644 index 93af701653..0000000000 --- a/usr/src/lib/hal/libhal-storage/common/llib-lhal-storage +++ /dev/null @@ -1,30 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <hal/libhal-storage.h> diff --git a/usr/src/lib/hal/libhal/common/llib-lhal b/usr/src/lib/hal/libhal/common/llib-lhal deleted file mode 100644 index d89da6716b..0000000000 --- a/usr/src/lib/hal/libhal/common/llib-lhal +++ /dev/null @@ -1,30 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <hal/libhal.h> diff --git a/usr/src/lib/hbaapi/common/llib-lHBAAPI b/usr/src/lib/hbaapi/common/llib-lHBAAPI deleted file mode 100644 index 8358109a34..0000000000 --- a/usr/src/lib/hbaapi/common/llib-lHBAAPI +++ /dev/null @@ -1,31 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <hbaapi.h> -#include <hbaapi-sun.h> diff --git a/usr/src/lib/libadm/common/llib-ladm b/usr/src/lib/libadm/common/llib-ladm deleted file mode 100644 index e9f241e590..0000000000 --- a/usr/src/lib/libadm/common/llib-ladm +++ /dev/null @@ -1,35 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <sys/types.h> -#include <sys/vtoc.h> -#include <devmgmt.h> -#include "devtab.h" -#include "libadm.h" diff --git a/usr/src/lib/libads/common/llib-lads b/usr/src/lib/libads/common/llib-lads deleted file mode 100644 index 7cdc5c1188..0000000000 --- a/usr/src/lib/libads/common/llib-lads +++ /dev/null @@ -1,31 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - * - * Copyright 2014 Nexenta Systems, Inc. All rights reserved. - */ - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include "dsgetdc.h" diff --git a/usr/src/lib/libadt_jni/common/llib-ladt_jni b/usr/src/lib/libadt_jni/common/llib-ladt_jni deleted file mode 100644 index 0709b8d091..0000000000 --- a/usr/src/lib/libadt_jni/common/llib-ladt_jni +++ /dev/null @@ -1,41 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright (c) 2001 by Sun Microsystems, Inc. - * All rights reserved. - */ -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <jni.h> - -/* - * No public interfaces are defined by libadt_jni.so. - * See usr/lib/audit/com/sun/Audit.jar for the contract private - * Java interface this library supports. - */ - -JNIEXPORT jbyteArray JNICALL -Java_com_sun_audit_AuditSession_startSession(JNIEnv *env, jobject cls, - jbyteArray jimport, jlong flags); diff --git a/usr/src/lib/libadutils/common/llib-ladutils b/usr/src/lib/libadutils/common/llib-ladutils deleted file mode 100644 index e0f09dfe25..0000000000 --- a/usr/src/lib/libadutils/common/llib-ladutils +++ /dev/null @@ -1,29 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include "adutils_impl.h" diff --git a/usr/src/lib/libaio/common/llib-laio b/usr/src/lib/libaio/common/llib-laio deleted file mode 100644 index 02d00ba1db..0000000000 --- a/usr/src/lib/libaio/common/llib-laio +++ /dev/null @@ -1,45 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <sys/asynch.h> - -int aioread(int fd, caddr_t buf, int bufsz, off_t offset, int whence, - aio_result_t *resultp); -int aiowrite(int fd, caddr_t buf, int bufsz, off_t offset, int whence, - aio_result_t *resultp); -#if !defined(_LP64) -int aioread64(int fd, caddr_t buf, int bufsz, off64_t offset, int whence, - aio_result_t *resultp); -int aiowrite64(int fd, caddr_t buf, int bufsz, off64_t offset, int whence, - aio_result_t *resultp); -#endif /* !_LP64 */ -int aiocancel(aio_result_t *resultp); -aio_result_t *aiowait(struct timeval *uwait); diff --git a/usr/src/lib/libast/common/llib-last b/usr/src/lib/libast/common/llib-last deleted file mode 100644 index 58a6963d54..0000000000 --- a/usr/src/lib/libast/common/llib-last +++ /dev/null @@ -1,126 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - * - * lib/libast/common/llib-last - * - */ - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#define _FTWALK_H 1 - -#include <align.h> -#include <ast.h> -#include <ast_botch.h> -#include <ast_ccode.h> -#include <ast_common.h> -#include <ast_dir.h> -#include <ast_dirent.h> -#include <ast_fcntl.h> -#include <ast_float.h> -#include <ast_fs.h> -#include <ast_getopt.h> -#include <ast_iconv.h> -#include <ast_lib.h> -#include <ast_limits.h> -#include <ast_map.h> -#include <ast_mmap.h> -#include <ast_mode.h> -#include <ast_ndbm.h> -#include <ast_nl_types.h> -#include <ast_param.h> -#include <ast_standards.h> -#include <ast_std.h> -#include <ast_stdio.h> -#include <ast_sys.h> -#include <ast_time.h> -#include <ast_tty.h> -#include <ast_version.h> -#include <ast_vfork.h> -#include <ast_wait.h> -#include <ast_wchar.h> -#include <bytesex.h> -#include <ccode.h> -#include <cdt.h> -#include <debug.h> -#include <dirent.h> -#include <dt.h> -#include <endian.h> -#include <error.h> -#include <find.h> -#include <fnmatch.h> -#include <fnv.h> -#include <fs3d.h> -#include <fts.h> -#include <ftw.h> -#include <ftwalk.h> -#include <getopt.h> -#include <glob.h> -#include <hash.h> -#include <hashkey.h> -#include <hashpart.h> -#include <iconv.h> -#include <ip6.h> -#include <lc.h> -#include <ls.h> -#include <magic.h> -#include <magicid.h> -#include <mc.h> -#include <mime.h> -#include <mnt.h> -#include <modecanon.h> -#include <modex.h> -#include <namval.h> -#include <nl_types.h> -#include <option.h> -#include <preroot.h> -#include <proc.h> -#include <prototyped.h> -#include <re_comp.h> -#include <recfmt.h> -#include <regex.h> -#include <sfdisc.h> -#include <sfio.h> -#include <sfio_s.h> -#include <sfio_t.h> -#include <sig.h> -#include <stack.h> -#include <stak.h> -#include <stdio.h> -#include <stk.h> -#include <swap.h> -#include <tar.h> -#include <times.h> -#include <tm.h> -#include <tmx.h> -#include <tok.h> -#include <tv.h> -#include <usage.h> -#include <vdb.h> -#include <vecargs.h> -#include <vmalloc.h> -#include <wait.h> -#include <wchar.h> -#include <wordexp.h> diff --git a/usr/src/lib/libavl/llib-lavl b/usr/src/lib/libavl/llib-lavl deleted file mode 100644 index 57bd4a2e63..0000000000 --- a/usr/src/lib/libavl/llib-lavl +++ /dev/null @@ -1,36 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/*LINTLIBRARY*/ -/*PROTOLIB1*/ -/* - * - * Copyright 2003 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - * - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <sys/types.h> -#include <sys/param.h> -#include <sys/debug.h> -#include <sys/avl.h> diff --git a/usr/src/lib/libbe/common/llib-lbe b/usr/src/lib/libbe/common/llib-lbe deleted file mode 100644 index 2330b0a0dd..0000000000 --- a/usr/src/lib/libbe/common/llib-lbe +++ /dev/null @@ -1,29 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. - */ - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <libbe.h> -#include <libbe_priv.h> diff --git a/usr/src/lib/libbrand/common/llib-lbrand b/usr/src/lib/libbrand/common/llib-lbrand deleted file mode 100644 index b5b1c81d1a..0000000000 --- a/usr/src/lib/libbrand/common/llib-lbrand +++ /dev/null @@ -1,31 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - - #pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - - #include <libbrand.h> diff --git a/usr/src/lib/libbsdmalloc/common/llib-lbsdmalloc b/usr/src/lib/libbsdmalloc/common/llib-lbsdmalloc deleted file mode 100644 index 0a93ff4c09..0000000000 --- a/usr/src/lib/libbsdmalloc/common/llib-lbsdmalloc +++ /dev/null @@ -1,36 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright (c) 1997 by Sun Microsystems, Inc. - * All rights reserved. - */ -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <sys/types.h> -#include <unistd.h> - -char *malloc(unsigned nbytes); -int free(char *cp); -char *realloc(char *cp, unsigned nbytes); diff --git a/usr/src/lib/libbsm/common/llib-lbsm b/usr/src/lib/libbsm/common/llib-lbsm deleted file mode 100644 index ece270a6ed..0000000000 --- a/usr/src/lib/libbsm/common/llib-lbsm +++ /dev/null @@ -1,38 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. - */ - -#include <bsm/devices.h> -#include <bsm/devalloc.h> -#include <bsm/audit.h> -#include <bsm/libbsm.h> -#include <bsm/audit_record.h> -#include <bsm/audit_uevents.h> -#include <bsm/adt.h> -#include <bsm/adt_event.h> -#include <bsm/audit_private.h> -#include <audit_plugin.h> -#include <audit_scf.h> diff --git a/usr/src/lib/libc/port/llib-lc b/usr/src/lib/libc/port/llib-lc deleted file mode 100644 index 5c0d397cbb..0000000000 --- a/usr/src/lib/libc/port/llib-lc +++ /dev/null @@ -1,1863 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright (c) 1991, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright 2018 Nexenta Systems, Inc. - * Copyright 2013 OmniTI Computer Consulting, Inc. All rights reserved. - * Copyright (c) 2013 Gary Mills - * Copyright 2014 Garrett D'Amore <garrett@damore.org> - * Copyright 2015 Joyent, Inc. - * Copyright 2015 Circonus, Inc. All rights reserved. - * Copyright 2015 Joyent, Inc. - */ - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#define __EXTENSIONS__ - -#include <aio.h> -#include <alloca.h> -#include <attr.h> -#include <atomic.h> -#include <ctype.h> -#include <deflt.h> -#include <dirent.h> -#include <dlfcn.h> -#include <door.h> -#include <err.h> -#include <sys/errno.h> -#include <euc.h> -#include <fcntl.h> -#include <float.h> -#include <fmtmsg.h> -#include <fnmatch.h> -#include <fts.h> -#include <ftw.h> -#include <glob.h> -#include <getwidth.h> -#include <grp.h> -#include <iconv.h> -#include <langinfo.h> -#include <libgen.h> -#include <libw.h> -#include <locale.h> -#include <memory.h> -#include <mon.h> -#include <mqueue.h> -#include <nan.h> -#include <ndbm.h> -#include <limits.h> -#include <nl_types.h> -#include <poll.h> -#include <project.h> -#include <priv.h> -#include <pwd.h> -#include <rctl.h> -#include <regex.h> -#include <rpcsvc/ypclnt.h> -#include <sched.h> -#include <search.h> -#include <semaphore.h> -#include <setjmp.h> -#include <shadow.h> -#include <siginfo.h> -#include <signal.h> -#include <stdarg.h> -#include <ucred.h> -#include <sys/ucred.h> -#include <unistd.h> -#include <ulimit.h> -#include <utime.h> -#include <stddef.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <stropts.h> -#include <synch.h> -#include <sys/acctctl.h> -#include <sys/acl.h> -#include <sys/asynch.h> -#include <sys/byteorder.h> -#include <sys/cladm.h> -#include <sys/corectl.h> -#include <sys/dl.h> -#include <sys/epoll.h> -#include <sys/exacct.h> -#include <sys/fcntl.h> -#include <sys/file.h> -#include <sys/fs/namenode.h> -#include <sys/instance.h> -#include <sys/ipc.h> -#include <sys/lwp.h> -#include <sys/mkdev.h> -#include <sys/mman.h> -#include <sys/mnttab.h> -#include <sys/mount.h> -#include <sys/msg.h> -#include <sys/param.h> -#include <sys/priocntl.h> -#include <sys/procset.h> -#include <sys/processor.h> -#include <sys/pset.h> -#include <sys/rctl_impl.h> -#include <sys/sem.h> -#include <sys/shm.h> -#include <sys/sid.h> -#include <sys/signal.h> -#include <sys/stat.h> -#include <sys/statvfs.h> -#include <sys/strlog.h> -#include <sys/stropts.h> -#include <sys/syscall.h> -#include <sys/sysconfig.h> -#include <sys/syslog.h> -#include <sys/systeminfo.h> -#include <sys/task.h> -#include <sys/termio.h> -#include <sys/termios.h> -#include <sys/u8_textprep.h> -#include <sys/time.h> -#include <sys/timeb.h> -#include <sys/times.h> -#include <sys/types.h> -#include <sys/uadmin.h> -#include <sys/utsname.h> -#include <sys/vfstab.h> -#include <sys/sendfile.h> -#include <sys/zone.h> -#include <termio.h> -#include <time.h> -#include <tzfile.h> -#include <ucontext.h> -#include <utmpx.h> -#include <values.h> -#include <wait.h> -#include <wchar.h> -#include <wctype.h> -#include <widec.h> -#include <wordexp.h> -#include <thread.h> -#include <pthread.h> -#include <schedctl.h> -#include <zone.h> -#include <port.h> -#include <spawn.h> -#include <inttypes.h> -#include <getopt.h> -#include <stdio_ext.h> -#if defined(__i386) -#include <sys/sysi86.h> -#endif -#if defined(__amd64) -#include <stack_unwind.h> -#endif -#include <xlocale.h> -#include <netinet/in.h> -#include <arpa/inet.h> - -/* - * This really comes from the crt*.s startup modules. - */ -char **environ; - -/* - * This is a GNU/Linux/BSD compatibility interface, - * not declared in any header file. - */ -const char *__progname; - -/* - * POSIX versions of standard libc routines; these aren't extracted - * from the headers above since we cannot #define _POSIX_C_SOURCE. - */ -int __posix_readdir_r(DIR * _RESTRICT_KYWD, struct dirent * _RESTRICT_KYWD, - struct dirent ** _RESTRICT_KYWD); -int __posix_getgrgid_r(gid_t, struct group *, char *, size_t, struct group **); -int __posix_getgrnam_r(const char *, struct group *, char *, size_t, - struct group **); -int __posix_getpwuid_r(uid_t, struct passwd *, char *, size_t, - struct passwd **); -int __posix_getpwnam_r(const char *, struct passwd *, char *, size_t, - struct passwd **); -int __posix_sigwait(const sigset_t * _RESTRICT_KYWD, int * _RESTRICT_KYWD); -char *__posix_asctime_r(const struct tm *_RESTRICT_KYWD, char *_RESTRICT_KYWD); -char *__posix_ctime_r(const time_t *, char *); -int __posix_ttyname_r(int, char *, size_t); -int __posix_getlogin_r(char *, int); -int __posix_getloginx_r(char *, int); - -/* - * XPG4 versions of standard libc routines; these aren't extracted - * from the headers above since we cannot #define _XPG4_2. - */ -int __xpg4_putmsg(int, const struct strbuf *, const struct strbuf *, int); -int __xpg4_putpmsg(int, const struct strbuf *, const struct strbuf *, int, int); - -/* - * These aren't extracted from the headers above because: - * - We cannot #define _STRPTIME_DONTZERO - * - We cannot #define _XPG5 - */ -char *__strptime_dontzero(const char *, const char *, struct tm *); -long __sysconf_xpg5(int); -wchar_t *__wcstok_xpg5(wchar_t *_RESTRICT_KYWD, - const wchar_t *_RESTRICT_KYWD, wchar_t **_RESTRICT_KYWD); -size_t __wcsftime_xpg5(wchar_t *_RESTRICT_KYWD, size_t, - const wchar_t *_RESTRICT_KYWD, const struct tm *_RESTRICT_KYWD); -wint_t __fgetwc_xpg5(__FILE *); -wint_t __getwc_xpg5(__FILE *); -wint_t __getwchar_xpg5(void); -wint_t __fputwc_xpg5(wint_t, __FILE *); -wint_t __putwc_xpg5(wint_t, __FILE *); -wint_t __putwchar_xpg5(wint_t); -wchar_t *__fgetws_xpg5(wchar_t *_RESTRICT_KYWD, int, __FILE *_RESTRICT_KYWD); -int __fputws_xpg5(const wchar_t *_RESTRICT_KYWD, __FILE *_RESTRICT_KYWD); -wint_t __ungetwc_xpg5(wint_t, __FILE *); - -/* - * /usr/src/lib/libc/port/gen routines - */ - -/* _ctype.c */ - -/* _loc_data.c */ - -/* _locale.c */ - -/* _set_tab.c */ -int _set_tab(const char *loc, int cat); - -/* _xftw.c */ -int _xftw(int ver, const char *path, int (*fn)(), int depth); - -/* a64l.c */ -long a64l(const char *); - -/* abort.c */ -void abort(void); - -/* abs.c */ -int abs(int arg); -long labs(long int arg); - -/* assert.c */ -void _assert(const char *assertion, const char *filename, int line_num); -void __assert_c99(const char *assertion, const char *filename, int line_num, - const char *funcname); - -/* atexit.c */ -int atexit(void(*func)()); -void _exithandle(void); - -/* atof.c */ -double atof(const char *p); - -/* atoi.c */ -int atoi(const char *p); - -/* atol.c */ -long atol(const char *p); - -/* basename.c */ -char *basename(char *s); - -/* bcmp.c */ -int bcmp(const void *s1, const void *s2, size_t len); - -/* bcopy.c */ -void bcopy(const void *s1, void *s2, size_t len); - -/* bsearch.c */ -void *bsearch(const void *ky, const void *bs, size_t nel, - size_t width, int (*compar)()); - -/* bzero.c */ -void bzero(void *sp, size_t len); - -/* calloc.c */ -void *calloc(size_t num, size_t size); - -/* catclose.c */ -int catclose(nl_catd catd); - -/* catgets.c */ -char *catgets(nl_catd catd, int set_num, int msg_num, const char *s); - -/* catopen.c */ -nl_catd catopen(const char *name, int mode); - -/* cfgetispeed.c */ -speed_t cfgetispeed(const struct termios *termios_p); - -/* cfgetospeed.c */ -speed_t cfgetospeed(const struct termios *termios_p); - -/* cfree.c */ -void cfree(void *p, size_t num, size_t size); - -/* cfsetispeed.c */ -int cfsetispeed(struct termios *termios_p, speed_t speed); - -/* cfsetospeed.c */ -int cfsetospeed(struct termios *termios_p, speed_t speed); - -/* cftime.c */ -int cftime(char *buf, char *format, const time_t *t); -int ascftime(char *buf, const char *format, const struct tm *tm); - -/* clock.c */ -clock_t clock(void); - -/* closedir.c */ -int closedir(DIR *dirp); - -/* confstr.c */ -size_t confstr(int name, char *buf, size_t length); - -/* crypt.c */ -void setkey(const char *key); -void encrypt(char *block, int fake); -char *crypt(const char *key, const char *salt); - -/* csetlen.c */ -int csetlen(int cset); -int csetcol(int cset); - -/* ctime.c */ -char *ctime(const time_t *t); -char *ctime_r(const time_t *, char *buf, int); -char *asctime(const struct tm *t); -char *asctime_r(const struct tm *, char *, int); - -/* ctypefcns.c */ -int isalpha(int c); -int isupper(int c); -int islower(int c); -int isdigit(int c); -int isxdigit(int c); -int isalnum(int c); -int isspace(int c); -int ispunct(int c); -int isprint(int c); -int isgraph(int c); -int iscntrl(int c); -int isascii(int c); -int _toupper(int c); -int _tolower(int c); -int toascii(int c); - -/* daemon.c */ -int daemon(int nochdir, int noclose); - -/* directio.c */ -int directio(int filedes, int advice); - -/* dirname.c */ -char *dirname(char *s); - -/* div.c */ -div_t div(int numer, int denom); -ldiv_t ldiv(long int numer, long int denom); - -/* drand48.c */ -double drand48(void); -double erand48(unsigned short *xsubi); -long krand48(unsigned short *xsubi, unsigned int m); -long lrand48(void); -long mrand48(void); -void srand48(long seedval); -unsigned short *seed48(unsigned short seed16v[3]); -void lcong48(unsigned short param[7]); -long nrand48(unsigned short *xsubi); -long jrand48(unsigned short *xsubi); - -/* dup.c */ -int dup(int fildes); -int dup2(int fildes, int fildes2); -int dup3(int fildes, int fildes2, int flags); - -/* ecvt.c */ -char *ecvt(double value, int ndigit, int *_RESTRICT_KYWD decpt, - int *_RESTRICT_KYWDsign); -char *fcvt(double value, int ndigit, int *_RESTRICT_KYWD decpt, - int *_RESTRICT_KYWD sign); - -/* endian.c */ -uint16_t htole16(uint16_t); -uint32_t htole32(uint32_t); -uint64_t htole64(uint64_t); -uint16_t letoh16(uint16_t); -uint32_t letoh32(uint32_t); -uint64_t letoh64(uint64_t); -uint16_t le16toh(uint16_t); -uint32_t le32toh(uint32_t); -uint64_t le64toh(uint64_t); -uint16_t htobe16(uint16_t); -uint32_t htobe32(uint32_t); -uint64_t htobe64(uint64_t); -uint16_t betoh16(uint16_t); -uint32_t betoh32(uint32_t); -uint64_t betoh64(uint64_t); -uint16_t be16toh(uint16_t); -uint32_t be32toh(uint32_t); -uint64_t be64toh(uint64_t); - -/* err.c */ -void _errfp(FILE *, int, const char *, ...); -void _verrfp(FILE *, int, const char *, va_list); -void _errxfp(FILE *, int, const char *, ...); -void _verrxfp(FILE *, int, const char *, va_list); -void _warnfp(FILE *, const char *, ...); -void _vwarnfp(FILE *, const char *, va_list); -void _warnxfp(FILE *, const char *, ...); -void _vwarnxfp(FILE *, const char *, va_list); - -/* errlst.c */ - -/* euclen.c */ -int euccol(const unsigned char *s); -int euclen(const unsigned char *s); -int eucscol(const unsigned char *s); - -/* execvp.c */ -/* VARARGS1 */ -int execlp(const char *, const char *, ...); -int execvp(const char *name, char *const *argv); - -/* fattach.c */ -int fattach(int fildes, const char *path); - -/* fdetach.c */ -int fdetach(const char *path); - -/* ffs.c */ -int ffs(int field); - -/* flock.c */ -int flock(int filedes, int operation); - -/* fmtmsg.c */ -int addseverity(int value, const char *string); -int fmtmsg(long class, const char *label, int severity, const char *text, - const char *action, const char *tag); - -/* freezero.c */ -void freezero(void *, size_t); - -/* ftime.c */ -int ftime(struct timeb *tp); - -/* ftok.c */ -key_t ftok(const char *path, int id); - -/* fts.c */ -FTSENT *fts_children(FTS *, int); -int fts_close(FTS *); -FTS *fts_open(char * const *, int, int (*)(const FTSENT **, const FTSENT **)); -FTSENT *fts_read(FTS *); -int fts_set(FTS *, FTSENT *, int); - -/* gcvt.c */ -char *gcvt(double number, int ndigit, char *buf); - -/* getcwd.c */ -char *getcwd(char *str, size_t size); - -/* getdate.c */ -struct tm *getdate(const char *expression); -#ifdef getdate_err -#undef getdate_err -#endif -int getdate_err; - -/* getdate_data.c */ - -/* getdate_gd.c */ - -/* getdtblsize.c */ -int getdtablesize(void); - -/* getenv.c */ -char *getenv(const char *name); - -/* getexecname.c */ -const char *getexecname(void); - -/* getgrnam.c */ -struct group *getgrnam(const char *name); -struct group *getgrgid(gid_t gid); -struct group *fgetgrent_r(FILE *, struct group *, char *, int); -struct group *getgrent_r(struct group *, char *, int); -struct group *getgrgid_r(gid_t, struct group *, char *, int); -struct group *getgrnam_r(const char *, struct group *, char *, int); - -/* gethostid.c */ -long gethostid(void); - -/* gethz.c */ -int gethz(void); - -/* getisax.c */ -uint_t getisax(uint32_t *, uint_t); - -/* getlogin.c */ -char *getloginx(void); -char *getloginx_r(char *, int); -#ifdef getlogin -#undef getlogin -#endif /* getlogin */ -char *getlogin(void); -#ifdef getlogin_r -#undef getlogin_r -#endif /* getlogin_r */ -char *getlogin_r(char *, int); - -/* getmntent.c */ -int getmntany(FILE *fd, struct mnttab *mgetp, struct mnttab *mrefp); -int getmntent(FILE *fd, struct mnttab *mp); - -/* getnetgrent.c */ -int setnetgrent(const char *grp); -int endnetgrent(void); -int getnetgrent(char **machinep, char **namep, char **domainp); - -/* getopt.c */ -int getopt(int argc, char *const *argv, const char *opts); - -/* getopt_long.c */ -int getopt_clip(int argc, char *const *argv, const char *optstring, - const struct option *long_options, int *long_index); -int getopt_long(int argc, char *const *argv, const char *optstring, - const struct option *long_options, int *long_index); -int getopt_long_only(int argc, char *const *argv, const char *optstring, - const struct option *long_options, int *long_index); - -/* getpagesize.c */ -int getpagesize(void); - -/* getpw.c */ -int getpw(uid_t uid, char *buf); - -/* getpwnam.c */ -struct passwd *getpwnam(const char *name); -struct passwd *getpwuid(uid_t uid); -struct passwd *fgetpwent_r(FILE *, struct passwd *, char *, int); -struct passwd *getpwent_r(struct passwd *, char *, int); -struct passwd *getpwnam_r(const char *, struct passwd *, char *, int); -struct passwd *getpwuid_r(uid_t, struct passwd *, char *, int); - -/* getrusage.c */ -int getrusage(int who, struct rusage *rusage); - -/* gettimeofday.c */ -int gettimeofday(struct timeval *_RESTRICT_KYWD tp, void *_RESTRICT_KYWD); - -/* getspent.c */ -void setspent(void); -void endspent(void); -struct spwd *getspent(void); -struct spwd *getspent_r(struct spwd *, char *, int); -struct spwd *fgetspent(FILE *f); -struct spwd *fgetspent_r(FILE *, struct spwd *, char *, int); -struct spwd *getspnam(const char *name); -struct spwd *getspnam_r(const char *, struct spwd *, char *, int); -int putspent(const struct spwd *p, FILE *f); - -/* getspent_r.c */ -int str2spwd(const char *, int, void *, char *, int); - -/* getsubopt.c */ -int getsubopt(char **optionsp, char *const *tokens, char **valuep); - -/* gettxt.c */ -char *gettxt(const char *msg_id, const char *dflt_str); - -/* getusershell.c */ -char *getusershell(void); -void endusershell(void); -void setusershell(void); - -/* getut.c */ -struct utmp *getutent(void); -struct utmp *getutid(const struct utmp *entry); -struct utmp *getutline(const struct utmp *entry); -struct utmp *pututline(const struct utmp *entry); -void setutent(void); -void endutent(void); -int utmpname(const char *newfile); -void updwtmp(const char *file, struct utmp *ut); -void getutmp(const struct utmpx *utx, struct utmp *ut); -void getutmpx(const struct utmp *ut, struct utmpx *utx); -struct utmp *makeut(struct utmp *utmp); - -/* getutx.c */ -struct utmpx *getutxent(void); -struct utmpx *getutxid(const struct utmpx *entry); -struct utmpx *getutxline(const struct utmpx *entry); -struct utmpx *pututxline(const struct utmpx *entry); -void setutxent(void); -void endutxent(void); -int utmpxname(const char *newfile); -void updwtmpx(const char *filex, struct utmpx *utx); -struct utmpx *makeutx(const struct utmpx *utmp); -struct utmpx *modutx(const struct utmpx *utp); - -/* getvfsent.c */ -int getvfsspec(FILE *fd, struct vfstab *vp, char *special); -int getvfsfile(FILE *fd, struct vfstab *vp, char *mountp); -int getvfsany(FILE *fd, struct vfstab *vgetp, struct vfstab *vrefp); -int getvfsent(FILE *fd, struct vfstab *vp); - -/* getwd.c */ -char *getwd(char *pathname); - -/* getwidth.c */ -void getwidth(eucwidth_t *eucstruct); - -/* hsearch.c */ -int hcreate(size_t size); -void hdestroy(void); -ENTRY *hsearch(ENTRY item, ACTION action); - -/* iconv.c */ -size_t iconv(iconv_t cd, const char **_RESTRICT_KYWD inbuf, - size_t *_RESTRICT_KYWD inbytesleft, char **_RESTRICT_KYWD outbuf, - size_t *_RESTRICT_KYWD outbytesleft); -int iconv_close(iconv_t cd); -iconv_t iconv_open(const char *tocode, const char *fromcode); - -/* imaxabs.c */ -intmax_t imaxabs(intmax_t j); - -/* imaxdiv.c */ -imaxdiv_t imaxdiv(intmax_t numer, intmax_t denom); - -/* index.c */ -char *index(const char *sp, int c); - -/* initgroups.c */ -int initgroups(const char *uname, gid_t agroup); - -/* innetgr.c */ -int innetgr(const char *group, const char *machine, const char *name, - const char *domain); - -/* insque.c */ -void insque(void *elem, void *pred); -void remque(void *elem); - -/* isaexec.c */ -int isaexec(const char *, char *const *, char *const *); - -/* isastream.c */ -int isastream(int fd); - -/* isatty.c */ -int isatty(int f); - -/* killpg.c */ -int killpg(pid_t pgrp, int sig); - -/* l64a.c */ -char *l64a(long lg); - -/* lckpwdf.c */ -int lckpwdf(void); -int ulckpwdf(void); - -/* lfind.c */ -void * lfind(const void *ky, const void *bs, size_t *nelp, - size_t width, int (*compar)()); - -/* localeconv.c */ -struct lconv *localeconv(void); - -/* lsearch.c */ -void * lsearch(const void *ky, void *bs, size_t *nelp, - size_t width, int (*compar)()); - -/* madvise.c */ -int madvise(caddr_t addr, size_t len, int advice); - -/* malloc.c */ -void *malloc(size_t size); -void *realloc(void *old, size_t size); -void free(void *old); - -/* mbstowcs.c */ -size_t mbstowcs(wchar_t *_RESTRICT_KYWD pwcs, const char *_RESTRICT_KYWD s, - size_t n); - -/* mbtowc.c */ -int mbtowc(wchar_t *_RESTRICT_KYWD wchar, const char *_RESTRICT_KYWD s, - size_t n); -int mblen(const char *s, size_t n); - -/* memalign.c */ -void *memalign(size_t align, size_t nbytes); - -/* memccpy.c */ -void *memccpy(void *_RESTRICT_KYWDs, const void *_RESTRICT_KYWD s0, int c, - size_t n); - -/* memchr.c */ -void *memchr(const void *sptr, int c1, size_t n); - -/* memcmp.c */ -int memcmp(const void *s1, const void *s2, size_t n); - -/* memcpy.c */ -void *memcpy(void *_RESTRICT_KYWD s, const void *_RESTRICT_KYWD s0, size_t n); - -/* memmove.c */ -void *memmove(void *s, const void *s0, size_t n); - -/* memset.c */ -void *memset(void *sp1, int c, size_t n); - -/* mkdev.c */ -dev_t __makedev(const int version, const major_t majdev, - const minor_t mindev); -major_t __major(const int version, const dev_t devnum); -minor_t __minor(const int version, const dev_t devnum); - -/* mkfifo.c */ -int mkfifo(const char *path, mode_t mode); - -/* mktemp.c */ -char *mktemp(char *as); - -/* mlock.c */ -int mlock(caddr_t addr, size_t len); - -/* mlockall.c */ -int mlockall(int flags); - -/* mon.c */ -void monitor(int (*alowpc)(), int (*ahighpc)(), WORD *buffer, - size_t bufsize, size_t nfunc); - -/* msync.c */ -int msync(caddr_t addr, size_t len, int flags); - -/* munlock.c */ -int munlock(caddr_t addr, size_t len); - -/* munlockall.c */ -int munlockall(void); - -/* ndbm.c */ -void dbm_setdefwrite(DBM *db); -int dbm_flush(DBM *db); -int dbm_flushpag(DBM *db); -DBM *dbm_open(const char *file, int flags, mode_t mode); -void dbm_close(DBM *db); -int dbm_close_status(DBM *db); -datum dbm_fetch(DBM *db, datum key); -int dbm_delete(DBM *db, datum key); -int dbm_store(DBM *db, datum key, datum dat, int replace); -datum dbm_firstkey(DBM *db); -datum dbm_nextkey(DBM *db); -datum dbm_do_nextkey(DBM *db, datum inkey); - -/* new_list.c */ - -/* nftw.c */ -int nftw(const char *path, int (*fn)(), int depth, int flags); - -/* nl_langinfo.c */ -char *nl_langinfo(nl_item item); - -/* opendir.c */ -DIR *opendir(const char *filename); - -/* opt_data.c */ - -/* perror.c */ -void perror(const char *s); - -/* pipe.c */ -int pipe(int *fds); - -/* psiginfo.c */ -void psiginfo(const siginfo_t *sip, const char *s); - -/* psignal.c */ -void psignal(int sig, const char *s); - -/* pt.c */ -char *ptsname(int fd); -int unlockpt(int fd); -int grantpt(int fd); - -/* putenv.c */ -int putenv(char *change); -int setenv(const char *envname, const char *envval, int overwrite); -int unsetenv(const char *name); - -/* putpwent.c */ -int putpwent(const struct passwd *p, FILE *f); - -/* qsort.c */ -void qsort(void *base, size_t n, size_t size, int (*compar)()); - -/* raise.c */ -int raise(int sig); - -/* rand.c */ -void srand(unsigned x); -int rand(void); -int rand_r(unsigned int *); - -/* random.c */ -void srandom(unsigned x); -char *initstate(unsigned seed, char *arg_state, size_t n); -char *setstate(const char *arg_state); -long random(void); - -/* rctlops.c */ -int rctl_walk(int (*callback)(const char *, void *), void *walk_data); -hrtime_t rctlblk_get_firing_time(rctlblk_t *rblk); -uint_t rctlblk_get_global_action(rctlblk_t *rblk); -uint_t rctlblk_get_global_flags(rctlblk_t *rblk); -uint_t rctlblk_get_local_action(rctlblk_t *rblk, int *signalp); -uint_t rctlblk_get_local_flags(rctlblk_t *rblk); -id_t rctlblk_get_recipient_pid(rctlblk_t *rblk); -rctl_priv_t rctlblk_get_privilege(rctlblk_t *rblk); -rctl_qty_t rctlblk_get_value(rctlblk_t *rblk); -void rctlblk_set_local_action(rctlblk_t *rblk, uint_t action, int signal); -void rctlblk_set_local_flags(rctlblk_t *rblk, uint_t flags); -void rctlblk_set_privilege(rctlblk_t *rblk, rctl_priv_t priv); -void rctlblk_set_value(rctlblk_t *rblk, rctl_qty_t val); -size_t rctlblk_size(void); - -/* readdir.c */ -struct dirent *readdir(DIR *dirp); - -/* reallocarray.c */ -void *reallocarray(void *, size_t, size_t); - -/* recallocarray.c */ -void *recallocarray(void *, size_t, size_t, size_t); - -/* realpath.c */ -char *realpath(const char *_RESTRICT_KYWD raw, char *_RESTRICT_KYWD canon); - -/* regexpr.c */ -char *re_comp(const char *sp); -int re_exec(const char *p1); - -/* rindex.c */ -char *rindex(const char *sp, int c); - -/* rename.c */ -int remove(const char *filename); -int rename(const char *old, const char *new); - -/* rewinddir.c */ -#undef rewinddir -void rewinddir(DIR *dirp); - -/* scandir.c */ -int alphasort(const struct dirent **, const struct dirent **); -int scandir(const char *dirname, struct dirent *(*namelist[]), - int (*select)(const struct dirent *), - int (*dcomp)(const struct dirent **, const struct dirent **)); - -/* scrwidth.c */ -int scrwidth(wchar_t c); - -/* seekdir.c */ -void seekdir(DIR *dirp, long loc); - -/* select.c */ -int pselect(int nfds, - fd_set *_RESTRICT_KYWD readfds, - fd_set *_RESTRICT_KYWD writefds, - fd_set *_RESTRICT_KYWD errorfds, - const struct timespec *_RESTRICT_KYWD timeout, - const sigset_t *_RESTRICT_KYWD sigmask); -int select(int nfds, - fd_set *_RESTRICT_KYWD readfds, - fd_set *_RESTRICT_KYWD writefds, - fd_set *_RESTRICT_KYWD errorfds, - struct timeval *_RESTRICT_KYWD timeout); - -/* setlocale.c */ -char *setlocale(int cat, const char *loc); - -/* setpriority.c */ -int getpriority(int which, id_t who); -int setpriority(int which, id_t who, int prio); - -/* settimeofday.c */ -int settimeofday(struct timeval *tp, void *); - -/* sigflag.c */ -int sigflag(int sig, int flag, int on); - -/* siglist.c */ - -/* sigsend.c */ -int sigsend(idtype_t idtype, id_t id, int sig); - -/* sigsetops.c */ -int sigfillset(sigset_t *set); -int sigemptyset(sigset_t *set); -int sigaddset(sigset_t *set, int sig); -int sigdelset(sigset_t *set, int sig); -int sigismember(const sigset_t *set, int sig); - -/* scalls.c */ -unsigned sleep(unsigned sleep_tm); - -/* ssignal.c */ -int (*ssignal(int sig, int (*fn)())) (); -int gsignal(int sig); - -/* str2id.c */ - -/* str2sig.c */ -int str2sig(const char *s, int *sigp); -int sig2str(int i, char *s); - -/* strcat.c */ -char *strcat(char *_RESTRICT_KYWD s1, const char *_RESTRICT_KYWD s2); - -/* strchr.c */ -char *strchr(const char *sp, int c); - -/* strcmp.c */ -int strcmp(const char *s1, const char *s2); - -/* strcpy.c */ -char *strcpy(char *_RESTRICT_KYWD s1, const char *_RESTRICT_KYWD s2); - -/* strcspn.c */ -size_t strcspn(const char *string, const char *charset); - -/* strdup.c */ -char *strdup(const char *s1); - -/* strerror.c */ -char *strerror(int errnum); -int strerror_r(int errnum, char *strerrbuf, size_t buflen); - -/* strftime.c */ -size_t strftime(char *_RESTRICT_KYWD s, size_t maxsize, - const char *_RESTRICT_KYWD format, - const struct tm *_RESTRICT_KYWD tm); - -/* strlen.c */ -size_t strlen(const char *s); - -/* strncat.c */ -char *strncat(char *_RESTRICT_KYWD s1, const char *_RESTRICT_KYWD s2, size_t n); - -/* strncmp.c */ -int strncmp(const char *s1, const char *s2, size_t n); - -/* strncpy.c */ -char *strncpy(char *_RESTRICT_KYWD s1, const char *_RESTRICT_KYWD s2, size_t n); - -/* strpbrk.c */ -char *strpbrk(const char *string, const char *brkset); - -/* strrchr.c */ -char *strrchr(const char *sp, int c); - -/* strsep.c */ -char *strsep(char **stringp, const char *delim); - -/* strspn.c */ -size_t strspn(const char *string, const char *charset); - -/* strstr.c */ -char *strstr(const char *as1, const char *as2); - -/* strtod.c */ -double strtod(const char *_RESTRICT_KYWD cp, char **_RESTRICT_KYWD ptr); -float strtof(const char *_RESTRICT_KYWD cp, char **_RESTRICT_KYWD ptr); -long double strtold(const char *_RESTRICT_KYWD cp, char **_RESTRICT_KYWD ptr); - -/* strtoimax.c */ -intmax_t strtoimax(const char *_RESTRICT_KYWD nptr, - char **_RESTRICT_KYWD endptr, int base); - -/* strtok.c */ -char *strtok(char *_RESTRICT_KYWD string, const char *_RESTRICT_KYWD sepset); -char *strtok_r(char *_RESTRICT_KYWD, const char *_RESTRICT_KYWD, - char **_RESTRICT_KYWD); - -/* strtol.c */ -long strtol(const char *_RESTRICT_KYWD str, char **_RESTRICT_KYWD nptr, - int base); - -/* strtonum.c */ -long long strtonum(const char *, long long, long long, const char **); - -/* strtoul.c */ -unsigned long strtoul(const char *_RESTRICT_KYWD str, - char **_RESTRICT_KYWD nptr, int base); - -/* strtoumax.c */ -uintmax_t strtoumax(const char *_RESTRICT_KYWD nptr, - char **_RESTRICT_KYWD endptr, int base); - -/* strxfrm.c */ -size_t strxfrm(char *_RESTRICT_KYWD s1, const char *_RESTRICT_KYWD s2, - size_t n); -int strcoll(const char *s1, const char *s2); - -/* swab.c */ -void swab(const char *_RESTRICT_KYWD from, char *_RESTRICT_KYWD to, ssize_t n); - -/* swapctl.c */ -int swapctl(int cmd, void *arg); - -/* sysconf.c */ -long sysconf(int name); - -/* syslog.c */ -/* VARARGS2 */ -void syslog(int pri, const char *fmt, ...); -void vsyslog(int pri, const char *fmt, va_list ap); -void openlog(const char *ident, int logstat, int logfac); -void closelog(void); -int setlogmask(int pmask); - -/* tcdrain.c */ -int tcdrain(int fildes); - -/* tcflow.c */ -int tcflow(int fildes, int action); - -/* tcflush.c */ -int tcflush(int fildes, int queue_selector); - -/* tcgetattr.c */ -int tcgetattr(int fildes, struct termios *termios_p); - -/* tcgetpgrp.c */ -pid_t tcgetpgrp(int fd); - -/* tcgetsid.c */ -pid_t tcgetsid(int fd); - -/* tcsendbreak.c */ -int tcsendbreak(int fildes, int duration); - -/* tcsetattr.c */ -int tcsetattr(int fildes, int optional_actions, - const struct termios *termios_p); - -/* tcsetpgrp.c */ -int tcsetpgrp(int fd, pid_t pgrp); - -/* tell.c */ -long tell(int f); - -/* telldir.c */ -long telldir(DIR *dirp); - -/* tfind.c */ -void *tfind(const void *ky, void *const *rtp, int (*compar)()); - -/* time_comm.c */ -struct tm *localtime(const time_t *timep); -struct tm *localtime_r(const time_t *_RESTRICT_KYWD, struct tm *_RESTRICT_KYWD); -struct tm *gmtime(const time_t *clock); -struct tm *gmtime_r(const time_t *_RESTRICT_KYWD, struct tm *_RESTRICT_KYWD); -double difftime(time_t time1, time_t time0); -time_t mktime(struct tm *timeptr); -void _ltzset(time_t tim); -void tzset(void); - -/* time_data.c */ - -/* time_gdata.c */ - -/* tolower.c */ -int tolower(int c); - -/* toupper.c */ -int toupper(int c); - -/* truncate.c */ -int ftruncate(int fildes, off_t len); -int truncate(const char *path, off_t len); - -/* tsearch.c */ -void *tsearch(const void *ky, void **rtp, int (*compar)()); -void *tdelete(const void *ky, void **rtp, int (*compar)()); -void twalk(const void *rt, void (*action)()); - -/* ttyname.c */ -char *ttyname(int f); -char *_ttyname_dev(dev_t rdev, char *buffer, size_t buflen); -char *ttyname_r(int, char *, int); - -/* ttyslot.c */ -int ttyslot(void); - -/* ualarm.c */ -unsigned ualarm(unsigned usecs, unsigned reload); - -/* ulimit.c */ -/* VARARGS1 */ -long ulimit(int cmd, ...); - -/* scalls.c */ -int usleep(unsigned n); - -/* valloc.c */ -void *valloc(size_t size); - -/* waitpid.c */ -pid_t wait(int *stat_loc); -pid_t waitpid(pid_t pid, int *stat_loc, int options); -pid_t wait3(int *status, int options, struct rusage *rp); -pid_t wait4(pid_t pid, int *status, int options, struct rusage *rusage); - -/* wcstombs.c */ -size_t wcstombs(char *_RESTRICT_KYWD s, const wchar_t *_RESTRICT_KYWD pwcs, - size_t n); - -/* wctomb.c */ -int wctomb(char *s, wchar_t wchar); - -/* wdata.c */ - -/* wisprint.c */ -int wisprint(wchar_t c); - -/* xgetwidth.c */ -void _xgetwidth(void); - -/* - * /usr/src/lib/libc/port/intl routines - */ - -/* gettext.c */ -char *bindtextdomain(const char *domain, const char *binding); -char *dcgettext(const char *domain, const char *msg_id, const int category); -char *dgettext(const char *domain, const char *msg_id); -char *gettext(const char *msg_id); -char *textdomain(const char *domain); - -/* - * /usr/src/lib/libc/port/print routines - */ - -/* fprintf.c */ -/* VARARGS2 */ -int fprintf(FILE *_RESTRICT_KYWD iop, const char *_RESTRICT_KYWD format, ...); - -/* printf.c */ -/* VARARGS1 */ -int printf(const char *_RESTRICT_KYWD format, ...); - -/* snprintf.c */ -/* VARARGS2 */ -int snprintf(char *_RESTRICT_KYWD string, size_t n, - const char *_RESTRICT_KYWD format, ...); - -/* sprintf.c */ -/* VARARGS2 */ -int sprintf(char *_RESTRICT_KYWD string, - const char *_RESTRICT_KYWD format, ...); - -/* vfprintf.c */ -/* VARARGS2 */ -int vfprintf(FILE *_RESTRICT_KYWD iop, const char *_RESTRICT_KYWD format, - va_list); - -/* vprintf.c */ -/* VARARGS1 */ -int vprintf(const char *_RESTRICT_KYWD format, va_list); - -/* vsnprintf.c */ -/* VARARGS2 */ -int vsnprintf(char *_RESTRICT_KYWD string, size_t n, - const char *_RESTRICT_KYWD format, va_list); - -/* vsprintf.c */ -/* VARARGS2 */ -int vsprintf(char *_RESTRICT_KYWD string, const char *_RESTRICT_KYWD format, - va_list); - -/* - * /usr/src/lib/libc/port/regex routines - */ - -/* glob.c */ -extern int glob(const char *restrict pattern, int flags, - int(*errfunc)(const char *epath, int eerrno), glob_t *restrict pglob); -extern void globfree(glob_t *pglob); - -/* regex.c */ -char *regex(const char *regexp, const char *stringp, ...); -#ifdef __loc1 -#undef __loc1 -#endif -char *__loc1; - -/* regcmp.c */ -char *regcmp(const char *regexp, ...); -#ifdef __i_size -#undef __i_size -#endif -int __i_size; - -/* - * /usr/src/lib/libc/port/stdio routines - */ - -/* _filbuf.c */ -int _filbuf(FILE *iop); - -/* _flsbuf.c */ -int _flsbuf(int ch, FILE *iop); - -/* _wrtchk.c */ -int _wrtchk(FILE *iop); - -/* clearerr.c */ -void clearerr(FILE *iop); - -/* ctermid.c */ -char *ctermid(char *s); -char *ctermid_r(char *s); - -/* cuserid.c */ -char *cuserid(char *s); - -/* data.c */ - -/* doscan.c */ -int _doscan(FILE *iop, const char *fmt, va_list va_alist); - -/* fdopen.c */ -FILE *fdopen(int fd, const char *type); - -/* feof.c */ -int feof(FILE *iop); - -/* ferror.c */ -int ferror(FILE *iop); - -/* fgetc.c */ -int fgetc(FILE *iop); - -/* fgets.c */ -char *fgets(char *_RESTRICT_KYWD buf, int size, FILE *_RESTRICT_KYWD iop); - -/* fileno.c */ -int _fileno(FILE *iop); - -/* flush.c */ -void _cleanup(void); -FILE *_findiop(void); -typedef unsigned char Uchar; -void _setbufend(FILE *iop, Uchar *end); -Uchar *_realbufend(FILE *iop); -void _bufsync(FILE *iop, Uchar *bufend); -int _xflsbuf(FILE *iop); -int fflush(FILE *iop); -int fclose(FILE *iop); - -/* fopen.c */ -FILE *fopen(const char *_RESTRICT_KYWD name, const char *_RESTRICT_KYWD type); -FILE *freopen(const char *_RESTRICT_KYWD name, const char *_RESTRICT_KYWD type, - FILE *_RESTRICT_KYWD iop); - -/* fpos.c */ -int fgetpos(FILE *_RESTRICT_KYWD stream, fpos_t *_RESTRICT_KYWD pos); -int fsetpos(FILE *stream, const fpos_t *pos); - -/* fputc.c */ -int fputc(int ch, FILE *iop); - -/* fputs.c */ -int fputs(const char *_RESTRICT_KYWD ptr, FILE *_RESTRICT_KYWD iop); - -/* fread.c */ -size_t fread(void *_RESTRICT_KYWD ptr, size_t size, size_t count, - FILE *_RESTRICT_KYWD iop); - -/* fseek.c */ -int fseek(FILE *iop, long offset, int ptrname); - -/* ftell.c */ -long ftell(FILE *iop); - -/* fwrite.c */ -size_t fwrite(const void *_RESTRICT_KYWD ptr1, size_t size, size_t count, - FILE *_RESTRICT_KYWD iop); - -/* getc.c */ -int getc(FILE *iop); - -/* getchar.c */ -int getchar(void); - -/* getpass.c */ -char *getpass(const char *prompt); - -/* getpass.c */ -char *getpassphrase(const char *prompt); - -/* gets.c */ -char *gets(char *buf); - -/* getw.c */ -int getw(FILE *stream); - -/* popen.c */ -FILE *popen(const char *cmd, const char *mode); -int pclose(FILE *ptr); - -/* putc.c */ -int putc(int ch, FILE *iop); - -/* putchar.c */ -int putchar(int ch); - -/* puts.c */ -int puts(const char *ptr); - -/* putw.c */ -int putw(int w, FILE *stream); - -/* rewind.c */ -void rewind(FILE *iop); - -/* scanf.c */ -/* VARARGS1 */ -int scanf(const char *_RESTRICT_KYWD fmt, ...); - -/* VARARGS2 */ -int fscanf(FILE *_RESTRICT_KYWD iop, const char *_RESTRICT_KYWD fmt, ...); - -/* VARARGS2 */ -int sscanf(const char *_RESTRICT_KYWD str, const char *_RESTRICT_KYWD fmt, ...); - -/* setbuf.c */ -void setbuf(FILE *_RESTRICT_KYWD iop, char *_RESTRICT_KYWD abuf); - -/* setvbuf.c */ -int setvbuf(FILE *_RESTRICT_KYWD iop, char *_RESTRICT_KYWD abuf, int type, - size_t size); - -/* system.c */ -int system(const char *s); - -/* tempnam.c */ -char *tempnam(const char *dir, const char *pfx); - -/* tmpfile.c */ -FILE *tmpfile(void); - -/* tmpnam.c */ -char *tmpnam(char *s); -char *tmpnam_r(char *); - -/* ungetc.c */ -int ungetc(int c, FILE *iop); - -/* - * /usr/src/lib/libc/port/sys routines - */ - -/* exacctsys.c */ -size_t getacct(idtype_t idtype, id_t id, void *buf, size_t bufsize); -int putacct(idtype_t idtype, id_t id, void *buf, size_t bufsize, int flags); -int wracct(idtype_t idtype, id_t id, int flags); - -/* execl.c */ -/* VARARGS1 */ -int execl(const char *name, const char *, ...); - -/* execle.c */ -int execle(const char *, const char *file, ...); - -/* execv.c */ -int execv(const char *file, char *const *argv); - -/* lockf.c */ -int lockf(int fildes, int function, off_t size); - -/* meminfosys.c */ -int meminfo(const uint64_t *inaddr, int addr_count, const uint_t *info_req, - int info_count, uint64_t *outdata, uint_t *validity); - -/* msgsys.c */ -int msgget(key_t key, int msgflg); -int msgctl(int msqid, int cmd, struct msqid_ds *buf); -ssize_t msgrcv(int msqid, void *msgp, size_t msgsz, long msgtyp, int msgflg); -int msgsnd(int msqid, const void *msgp, size_t msgsz, int msgflg); - -/* nfssys.c */ -/* -int exportfs(char *dir, struct export *ep); -int nfs_getfh(char *path, fhandle_t *fhp); -int nfssvc(int fd); -*/ - -/* psetsys.c */ -int pset_create(psetid_t *npset); -int pset_destroy(psetid_t pset); -int pset_assign(psetid_t pset, processorid_t cpu, psetid_t *opset); -int pset_assign_forced(psetid_t pset, processorid_t cpu, psetid_t *opset); -int pset_info(psetid_t pset, int *type, u_int *numcpus, processorid_t *cpulist); -int pset_bind(psetid_t pset, idtype_t idtype, id_t id, psetid_t *opset); -int pset_bind_lwp(psetid_t pset, id_t id, pid_t, psetid_t *opset); - -/* rctlsys.c */ -int getrctl(const char *name, rctlblk_t *old_rblk, rctlblk_t *new_rblk, - int flags); -int setrctl(const char *name, rctlblk_t *old_rblk, rctlblk_t *new_rblk, - int flags); -/* (private functions) */ -int setprojrctl(const char *name, rctlblk_t *new_rblk, size_t size, int flags); -int rctlctl(const char *, rctlblk_t *, int); -size_t rctllist(char *, size_t); - -/* semsys.c */ -int semctl(int semid, int semnum, int cmd, ...); -int semget(key_t key, int nsems, int semflg); -int semop(int semid, struct sembuf *sops, size_t nsops); - -/* shmsys.c */ -void *shmat(int shmid, const void *shmaddr, int shmflg); -int shmctl(int shmid, int cmd, struct shmid_ds *buf); -#if defined(_XOPEN_SOURCE) && (_XOPEN_VERSION - 0 == 4) -int shmdt(const void *); -#else -int shmdt(char *); -#endif /* defined(_XOPEN_SOURCE) && (_XOPEN_VERSION - 0 == 4) */ -int shmget(key_t key, size_t size, int shmflg); - -/* tasksys.c */ -taskid_t settaskid(projid_t project, uint_t flags); -taskid_t gettaskid(void); -projid_t getprojid(void); - -/* - * /usr/src/lib/libc/port/widec routines - */ - -/* fgetws.c */ -wchar_t *fgetws(wchar_t *_RESTRICT_KYWD ptr, int size, - FILE *_RESTRICT_KYWD iop); - -/* fputwc.c */ -wint_t fputwc(wint_t wc, FILE *iop); -wint_t putwc(wint_t wc, FILE *iop); - -/* fputws.c */ -int fputws(const wchar_t *_RESTRICT_KYWD ptr, FILE *_RESTRICT_KYWD iop); - -/* getwchar.c */ -wint_t getwchar(void); - -/* getwidth.c */ -void getwidth(eucwidth_t *eucstruct); - -/* getws.c */ -wchar_t *getws(wchar_t *ptr); - -/* iswctype.c */ -int iswctype(wint_t wc, wctype_t charclass); -int iswalpha(wint_t c); -int iswupper(wint_t c); -int iswlower(wint_t c); -int iswdigit(wint_t c); -int iswxdigit(wint_t c); -int iswalnum(wint_t c); -int iswspace(wint_t c); -int iswpunct(wint_t c); -int iswprint(wint_t c); -int iswgraph(wint_t c); -int iswcntrl(wint_t c); -int isphonogram(wint_t c); -int isideogram(wint_t c); -int isenglish(wint_t c); -int isnumber(wint_t c); -int isspecial(wint_t c); - -/* libwcollate.c */ - -/* putwchar.c */ -wint_t putwchar(wint_t c); - -/* putws.c */ -int putws(const wchar_t *ptr); - -/* scrwidth.c */ - -/* strtows.c */ -wchar_t *strtows(wchar_t *s1, char *s2); -char *wstostr(char *s1, wchar_t *s2); - -/* trwctype.c */ -wint_t towupper(wint_t c); -wint_t towlower(wint_t c); - -/* ungetwc.c */ -wint_t ungetwc(wint_t wc, FILE *iop); - -/* wcollate.c */ -size_t wcsxfrm(wchar_t *_RESTRICT_KYWD s1, const wchar_t *_RESTRICT_KYWD s2, - size_t n); -int wcscoll(const wchar_t *s1, const wchar_t *s2); - -/* wcsftime.c */ -#if !defined(__amd64) /* XX64 - fix me */ -size_t wcsftime(wchar_t *wcs, size_t maxsize, - const char *format, const struct tm *timeptr); -#endif /* __amd64 */ - -/* wcstring.c */ -wint_t fgetwc(FILE *iop); -wint_t getwc(FILE *iop); -int wcwidth(wchar_t wc); -int wcswidth(const wchar_t *pwcs, size_t n); - -/* wcswcs.c */ -wchar_t *wcswcs(const wchar_t *ws1, const wchar_t *ws2); - -/* wcsxfrm.c - empty file! */ - -/* wcsxfrm.xpg4.c */ - -/* wisprint.c */ -int wisprint(wchar_t c); - -/* wscasecmp.c */ -int wscasecmp(const wchar_t *s1, const wchar_t *s2); - -/* wscat.c */ -wchar_t *wcscat(wchar_t *_RESTRICT_KYWD s1, const wchar_t *_RESTRICT_KYWD s2); -wchar_t *wscat(wchar_t *s1, const wchar_t *s2); - -/* wschr.c */ -wchar_t *wcschr(const wchar_t *sp, wchar_t c); -wchar_t *wschr(const wchar_t *sp, wchar_t c); - -/* wscmp.c */ -int wcscmp(const wchar_t *s1, const wchar_t *s2); -int wscmp(const wchar_t *s1, const wchar_t *s2); - -/* wscol.c */ -int wscol(const wchar_t *s1); - -/* wscpy.c */ -wchar_t *wcscpy(wchar_t *_RESTRICT_KYWD s1, const wchar_t *_RESTRICT_KYWD s2); -wchar_t *wscpy(wchar_t *s1, const wchar_t *s2); - -/* wscspn.c */ -size_t wcscspn(const wchar_t *string, const wchar_t *charset); -size_t wscspn(const wchar_t *string, const wchar_t *charset); - -/* wsdup.c */ -wchar_t *wsdup(const wchar_t *s1); - -/* wslen.c */ -size_t wcslen(const wchar_t *s); -size_t wslen(const wchar_t *s); - -/* wsncasecmp.c */ -int wsncasecmp(const wchar_t *s1, const wchar_t *s2, size_t n); - -/* wsncat.c */ -wchar_t *wcsncat(wchar_t *_RESTRICT_KYWD s1, const wchar_t *_RESTRICT_KYWD s2, - size_t n); -wchar_t *wsncat(wchar_t *s1, const wchar_t *s2, size_t n); - -/* wsncmp.c */ -int wcsncmp(const wchar_t *s1, const wchar_t *s2, size_t n); -int wsncmp(const wchar_t *s1, const wchar_t *s2, size_t n); - -/* wsncpy.c */ -wchar_t *wcsncpy(wchar_t *_RESTRICT_KYWD s1, const wchar_t *_RESTRICT_KYWD s2, - size_t n); -wchar_t *wsncpy(wchar_t *s1, const wchar_t *s2, size_t n); - -/* wspbrk.c */ -wchar_t *wcspbrk(const wchar_t *string, const wchar_t *brkset); -wchar_t *wspbrk(const wchar_t *string, const wchar_t *brkset); - -/* wsprintf.c */ -int wsprintf(wchar_t *wstring, const char *format, ...); - -/* wsrchr.c */ -wchar_t *wcsrchr(const wchar_t *sp, wchar_t c); -wchar_t *wsrchr(const wchar_t *sp, wchar_t c); - -/* wsscanf.c */ -int wsscanf(wchar_t *s, const char *format, ...); - -/* wssize.c */ - -/* wsspn.c */ -size_t wcsspn(const wchar_t *string, const wchar_t *charset); -size_t wsspn(const wchar_t *string, const wchar_t *charset); - -/* wstod.c */ -double wcstod(const wchar_t *_RESTRICT_KYWD cp, wchar_t **_RESTRICT_KYWD ptr); -float wcstof(const wchar_t *_RESTRICT_KYWD cp, wchar_t **_RESTRICT_KYWD ptr); -long double wcstold(const wchar_t *_RESTRICT_KYWD cp, - wchar_t **_RESTRICT_KYWD ptr); -double wstod(const wchar_t *cp, wchar_t **ptr); - -/* wstok.c */ -#if !defined(__amd64) /* XX64 - fix me */ -wchar_t *wcstok(wchar_t *string, const wchar_t *sepset); -wchar_t *wstok(wchar_t *string, const wchar_t *sepset); -#endif /* __amd64 */ - -/* wcstol.c */ -long wcstol(const wchar_t *_RESTRICT_KYWD str, wchar_t **_RESTRICT_KYWD ptr, - int base); -long long wcstoll(const wchar_t *_RESTRICT_KYWD str, - wchar_t **_RESTRICT_KYWD ptr, int base); - -/* wcstoul.c */ -unsigned long wcstoul(const wchar_t *_RESTRICT_KYWD str, - wchar_t **_RESTRICT_KYWD ptr, int base); -unsigned long long wcstoull(const wchar_t *_RESTRICT_KYWD str, - wchar_t **_RESTRICT_KYWD ptr, int base); - -/* wcstoimax.c */ -intmax_t wcstoimax(const wchar_t *_RESTRICT_KYWD nptr, - wchar_t **_RESTRICT_KYWD endptr, int base); -uintmax_t wcstoumax(const wchar_t *_RESTRICT_KYWD nptr, - wchar_t **_RESTRICT_KYWD endptr, int base); - -/* wstol.c */ -long wstol(const wchar_t *str, wchar_t **ptr, int base); - -/* wstoll.c */ -long long wstoll(const wchar_t *str, wchar_t **ptr, int base); -long long watoll(const wchar_t *p); - -/* wsxfrm.c */ -size_t wsxfrm(wchar_t *s1, const wchar_t *s2, size_t n); -int wscoll(const wchar_t *s1, const wchar_t *s2); - -/* - * /usr/src/lib/libc/port/gen/event_port.c - */ -int port_dispatch(int port, int flags, int source, int events, uintptr_t object, - void *user); - -/* - * /usr/src/lib/libc/$MACH/gen routines - */ - -/* alloca.s */ - -void *__builtin_alloca(size_t); - -/* - * modctl(int arg, ...) and utssys(...) are not available from a header - * file, but our utilities which make use of it should be able to be - * lint clean. - */ -int modctl(int arg, ...); -int utssys(void *buf, int arg, int type, void *outbp); - - -typedef float single; -typedef unsigned extended[3]; -typedef long double quadruple; -typedef unsigned fp_exception_field_type; - -typedef char decimal_string[512]; - -enum fp_class_type { - fp_zero = 0, - fp_subnormal = 1, - fp_normal = 2, - fp_infinity = 3, - fp_quiet = 4, - fp_signaling = 5 -}; - -enum fp_direction_type { - fp_nearest = 0, - fp_tozero = 1, - fp_positive = 2, - fp_negative = 3 -}; - -typedef struct { - enum fp_class_type fpclass; - int sign; - int exponent; - decimal_string ds; - int more; - int ndigits; -} decimal_record; - -enum decimal_form { - fixed_form, - floating_form -}; - -typedef struct { - enum fp_direction_type rd; - enum decimal_form df; - int ndigits; -} decimal_mode; - -enum decimal_string_form { - invalid_form, - whitespace_form, - fixed_int_form, - fixed_intdot_form, - fixed_dotfrac_form, - fixed_intdotfrac_form, - floating_int_form, - floating_intdot_form, - floating_dotfrac_form, - floating_intdotfrac_form, - inf_form, - infinity_form, - nan_form, - nanstring_form -}; - -typedef int sigfpe_code_type; - -typedef void (*sigfpe_handler_type)(); - -extern sigfpe_handler_type sigfpe(sigfpe_code_type, sigfpe_handler_type); - -extern void single_to_decimal(single *, decimal_mode *, decimal_record *, - fp_exception_field_type *); - -extern void double_to_decimal(double *, decimal_mode *, decimal_record *, - fp_exception_field_type *); -extern void extended_to_decimal(extended *, decimal_mode *, - decimal_record *, fp_exception_field_type *); -extern void quadruple_to_decimal(quadruple *, decimal_mode *, - decimal_record *, fp_exception_field_type *); -extern void decimal_to_single(single *, decimal_mode *, decimal_record *, - fp_exception_field_type *); -extern void decimal_to_double(double *, decimal_mode *, decimal_record *, - fp_exception_field_type *); -extern void decimal_to_extended(extended *, decimal_mode *, - decimal_record *, fp_exception_field_type *); -extern void decimal_to_quadruple(quadruple *, decimal_mode *, - decimal_record *, fp_exception_field_type *); -extern void string_to_decimal(char **, int, int, decimal_record *, - enum decimal_string_form *, char **); -extern void func_to_decimal(char **, int, int, decimal_record *, - enum decimal_string_form *, char **, - int (*)(void), int *, int (*)(int)); -extern void file_to_decimal(char **, int, int, decimal_record *, - enum decimal_string_form *, char **, - FILE *, int *); -extern char *seconvert(single *, int, int *, int *, char *); -extern char *sfconvert(single *, int, int *, int *, char *); -extern char *sgconvert(single *, int, int, char *); -extern char *econvert(double, int, int *, int *, char *); -extern char *fconvert(double, int, int *, int *, char *); -extern char *gconvert(double, int, int, char *); -extern char *qeconvert(quadruple *, int, int *, int *, char *); -extern char *qfconvert(quadruple *, int, int *, int *, char *); -extern char *qgconvert(quadruple *, int, int, char *); - -extern void __assert(const char *, const char *, int); - -extern int setjmp(jmp_buf); -extern void longjmp(jmp_buf, int); -extern int sigsetjmp(sigjmp_buf, int); -extern void siglongjmp(sigjmp_buf, int); - -int uname(struct utsname *); -int _uname(struct utsname *); - -int errno; -int *___errno() -{ return (&errno); } - -extern int getloadavg(double [], int); - -extern long pcsample(uintptr_t [], long); - -int fstat(int, struct stat *); -int stat(const char *_RESTRICT_KYWD, struct stat *_RESTRICT_KYWD); -int lstat(const char *_RESTRICT_KYWD, struct stat *_RESTRICT_KYWD); -int mknod(const char *, mode_t, dev_t); - -extern int __init_daemon_priv(int, uid_t uid, gid_t gid, ...); -extern void __fini_daemon_priv(const char *, ...); -extern int __init_suid_priv(int, ...); -extern int __priv_bracket(priv_op_t); -extern void __priv_relinquish(void); -extern const char * __priv_getsetbynum(const void *, int); -extern char * __priv_set_to_str(void *, const priv_set_t *, char, int); - -/* private interface to get the groups list for a certain user */ -int _getgroupsbymember(const char *, gid_t[], int, int); - -/* private interface for use only by java */ -volatile sc_shared_t *volatile *_thr_schedctl(void); - -/* private interface to unmount all autofs mounts */ -int _autofssys(enum autofssys_op, void *); - -/* label.c */ -extern int is_system_labeled(void); - -extern int uconv_u16tou32(const uint16_t *, size_t *, uint32_t *, size_t *, - int); -extern int uconv_u16tou8(const uint16_t *, size_t *, uchar_t *, size_t *, int); -extern int uconv_u32tou16(const uint32_t *, size_t *, uint16_t *, size_t *, - int); -extern int uconv_u32tou8(const uint32_t *, size_t *, uchar_t *, size_t *, int); -extern int uconv_u8tou16(const uchar_t *, size_t *, uint16_t *, size_t *, int); -extern int uconv_u8tou32(const uchar_t *, size_t *, uint32_t *, size_t *, int); -extern int u8_validate(char *, size_t, char **, int, int *); -extern int u8_strcmp(const char *, const char *, size_t, int, size_t, int *); -extern size_t u8_textprep_str(char *, size_t *, char *, size_t *, int, size_t, - int *); - -/* private locale interfaces */ -wint_t __nextwctype(wint_t, wctype_t); -int __iswrune(wint_t); - -/* inet_ntop.c */ -const char *inet_ntop(int af, const void *src, char *dst, socklen_t size); - -/* inet_pton.c */ -int inet_pton(int af, const char *src, void *dst); - -/* inet_ntoa.c */ -char *inet_ntoa_r(struct in_addr in, char b[]); -char *inet_ntoa(struct in_addr in); -in_addr_t inet_addr(const char *cp); -in_addr_t inet_netof(struct in_addr in); diff --git a/usr/src/lib/libc_db/common/llib-lc_db b/usr/src/lib/libc_db/common/llib-lc_db deleted file mode 100644 index 18325a87e5..0000000000 --- a/usr/src/lib/libc_db/common/llib-lc_db +++ /dev/null @@ -1,31 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright (c) 1999 by Sun Microsystems, Inc. - * All rights reserved. - */ -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <thread_db.h> diff --git a/usr/src/lib/libcfgadm/common/llib-lcfgadm b/usr/src/lib/libcfgadm/common/llib-lcfgadm deleted file mode 100644 index 57cccd5802..0000000000 --- a/usr/src/lib/libcfgadm/common/llib-lcfgadm +++ /dev/null @@ -1,178 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -/* - * Copyright 1998-1999, 2002 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <sys/param.h> -#include <config_admin.h> - -cfga_err_t -config_change_state( - cfga_cmd_t state_change_cmd, - int num_ap_ids, - char * const *ap_ids, - const char *options, - struct cfga_confirm *confp, - struct cfga_msg *msgp, - char **errstring, - cfga_flags_t flags); - -cfga_err_t -config_private_func( - const char *function, - int num_ap_ids, - char * const *ap_ids, - const char *options, - struct cfga_confirm *confp, - struct cfga_msg *msgp, - char **errstring, - cfga_flags_t flags); - -cfga_err_t -config_test( - int num_ap_ids, - char * const *ap_ids, - const char *options, - struct cfga_msg *msgp, - char **errstring, - cfga_flags_t flags); - -cfga_err_t -config_stat( - int num_ap_ids, - char * const *ap_ids, - struct cfga_stat_data *buf, - const char *options, - char **errstring); - -cfga_err_t -config_list( - struct cfga_stat_data **ap_di_list, - int *nlist, - const char *options, - char **errstring); - -cfga_err_t -config_list_ext( - int num_ap_ids, - char *const *ap_ids, - struct cfga_list_data **ap_id_list, - int *nlist, - const char* options, - const char *listopts, - char **errstring, - cfga_flags_t flags); - -cfga_err_t -config_help( - int num_ap_ids, - char * const *ap_ids, - struct cfga_msg *msgp, - const char *options, - cfga_flags_t flags); - -const char * -config_strerror( - cfga_err_t cfgerrnum); - -int -config_ap_id_cmp( - const cfga_ap_log_id_t ap_id1, - const cfga_ap_log_id_t ap_id2); - -void -config_unload_libs(); - -#ifdef CFGA_PLUGIN_LIB - -cfga_err_t -cfga_change_state( - cfga_cmd_t, - const char *, - const char *, - struct cfga_confirm *, - struct cfga_msg *, - char **, - cfga_flags_t); - -cfga_err_t -cfga_private_func( - const char *, - const char *, - const char *, - struct cfga_confirm *, - struct cfga_msg *, - char **, - cfga_flags_t); - -cfga_err_t -cfga_test( - const char *, - const char *, - struct cfga_msg *, - char **, - cfga_flags_t); - -cfga_err_t -cfga_stat( - const char *, - struct cfga_stat_data *, - const char *, - char **); - -cfga_err_t -cfga_list( - const char *, - struct cfga_stat_data **, - int *, - const char *, - char **); - -cfga_err_t -cfga_list_ext( - const char *, - struct cfga_list_data **, - int *, - const char *, - const char *, - char **, - cfga_flags_t); - -cfga_err_t -cfga_help( - struct cfga_msg *, - const char *, - cfga_flags_t); - -int -cfga_ap_id_cmp( - const cfga_ap_log_id_t, - const cfga_ap_log_id_t); - -#endif diff --git a/usr/src/lib/libcmd/common/llib-lcmd b/usr/src/lib/libcmd/common/llib-lcmd deleted file mode 100644 index f87a732fa8..0000000000 --- a/usr/src/lib/libcmd/common/llib-lcmd +++ /dev/null @@ -1,33 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - * - * lib/libcmd/common/llib-lcmd - * - */ - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <cmd.h> -#include <cmdext.h> diff --git a/usr/src/lib/libcmdutils/common/llib-lcmdutils b/usr/src/lib/libcmdutils/common/llib-lcmdutils deleted file mode 100644 index 4236d96186..0000000000 --- a/usr/src/lib/libcmdutils/common/llib-lcmdutils +++ /dev/null @@ -1,34 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/*LINTLIBRARY*/ -/*PROTOLIB1*/ -/* - * Copyright 2003 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <sys/avl.h> -#include <sys/types.h> -#include <stdlib.h> -#include <libcmdutils.h> diff --git a/usr/src/lib/libcommputil/common/llib-lcommputil b/usr/src/lib/libcommputil/common/llib-lcommputil deleted file mode 100644 index 834e4c80ac..0000000000 --- a/usr/src/lib/libcommputil/common/llib-lcommputil +++ /dev/null @@ -1,31 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ -/* PROTOLIB1 */ -#include <sdp.h> diff --git a/usr/src/lib/libcontract/common/llib-lcontract b/usr/src/lib/libcontract/common/llib-lcontract deleted file mode 100644 index a93b64367e..0000000000 --- a/usr/src/lib/libcontract/common/llib-lcontract +++ /dev/null @@ -1,33 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <libcontract.h> -#include <libcontract_priv.h> diff --git a/usr/src/lib/libcpc/common/llib-lcpc b/usr/src/lib/libcpc/common/llib-lcpc deleted file mode 100644 index 1650d06f7e..0000000000 --- a/usr/src/lib/libcpc/common/llib-lcpc +++ /dev/null @@ -1,32 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -/* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -#include "libcpc.h" diff --git a/usr/src/lib/libcrypt/common/llib-lcrypt b/usr/src/lib/libcrypt/common/llib-lcrypt deleted file mode 100644 index 5063b0a32e..0000000000 --- a/usr/src/lib/libcrypt/common/llib-lcrypt +++ /dev/null @@ -1,83 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright (c) 1997, 2000 by Sun Microsystems, Inc. - * All rights reserved. - */ -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <stdio.h> -#include <sys/types.h> -#include <des/softdes.h> -#include <des/desdata.h> -#include <sys/des.h> - -/* - * usr/src/lib/libcrypt - */ - -/* crypt.c */ -void setkey(const char *key); -void encrypt(char *block, int edflag); -char *crypt(const char *pw, const char *salt); - -/* cryptio.c */ -int _run_setkey(int p[2], const char *keyparam); -int run_setkey(int p[2], const char *keyparam); -int _run_crypt(long offset, char *buffer, unsigned int count, int p[2]); -int run_crypt(long offset, char *buffer, unsigned int count, int p[2]); -int _makekey(int b[2]); -int makekey(int b[2]); -int crypt_close_nolock(int p[2]); -int _crypt_close(int p[2]); -int crypt_close(int p[2]); - -/* des.c */ -int cbc_crypt(char *key, char *buf, size_t len, unsigned int mode, char *ivec); -int ecb_crypt(char *key, char *buf, size_t len, unsigned int mode); - -/* des_crypt.c */ -void _des_setkey(const char *key); -void des_setkey(const char *key); -void _des_encrypt(char *block, int edflag); -void des_encrypt(char *block, int edflag); -char *des_crypt(const char *pw, const char *salt); - -/* des_decrypt.c */ -void _des_decrypt1(char *block, char *L, char *IP, char *R, char *preS, - char *E, char KS[][48], char S[][64], char *f, - char *tempL, char *P, char *FP); - -/* des_encrypt.c */ -void des_encrypt1(char *block, char *L, char *IP, char *R, char *preS, - char *E, char KS[][48], char S[][64], char *f, - char *tempL, char *P, char *FP); -void _des_encrypt1(char *block, char *L, char *IP, char *R, char *preS, - char *E, char KS[][48], char S[][64], char *f, - char *tempL, char *P, char *FP); - -/* des_soft.c */ -void des_setparity(char *p); -int __des_crypt(char *buf, unsigned len, struct desparams *desp); diff --git a/usr/src/lib/libcryptoutil/common/llib-lcryptoutil b/usr/src/lib/libcryptoutil/common/llib-lcryptoutil deleted file mode 100644 index 6f2f6bf5db..0000000000 --- a/usr/src/lib/libcryptoutil/common/llib-lcryptoutil +++ /dev/null @@ -1,32 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2002-2003 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <cryptoutil.h> diff --git a/usr/src/lib/libctf/common/llib-lctf b/usr/src/lib/libctf/common/llib-lctf deleted file mode 100644 index 53310dec3c..0000000000 --- a/usr/src/lib/libctf/common/llib-lctf +++ /dev/null @@ -1,32 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright (c) 2001 by Sun Microsystems, Inc. - * All rights reserved. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <libctf.h> diff --git a/usr/src/lib/libcurses/screen/llib-lcurses b/usr/src/lib/libcurses/screen/llib-lcurses deleted file mode 100644 index b1a0272a34..0000000000 --- a/usr/src/lib/libcurses/screen/llib-lcurses +++ /dev/null @@ -1,1352 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <stdio.h> -#include <sys/types.h> -#include <stdarg.h> -#include <curses.h> -#include "term.h" -#include "print.h" - -/* - * usr/src/lib/libcurses/screen - */ - -/* V2.__sscans.c */ -int __sscans(WINDOW *win, char *fmt, ...); - -/* V2._sprintw.c */ -int _sprintw(WINDOW *win, char *fmt, ...); - -/* V2.makenew.c */ -WINDOW *makenew(int num_lines, int num_cols, int begy, int begx); - -/* V3.m_addch.c */ -int m_addch(int c); - -/* V3.m_addstr.c */ -int m_addstr(char *str); - -/* V3.m_clear.c */ -int m_clear(void); - -/* V3.m_erase.c */ -int m_erase(void); - -/* V3.m_initscr.c */ -WINDOW *m_initscr(void); - -/* V3.m_move.c */ -int m_move(int x, int y); - -/* V3.m_newterm.c */ -SCREEN *m_newterm(char *type, FILE *outfptr, FILE *infptr); - -/* V3.m_refresh.c */ -int m_refresh(void); - -/* V3.upd_old_y.c */ -void _update_old_y_area(WINDOW *win, int nlines, int ncols, int start_line, - int start_col); - -/* _addch.c */ -int addch(chtype ch); - -/* _addchnstr.c */ -int addchnstr(chtype *s, int n); - -/* _addchstr.c */ -int addchstr(chtype *s); - -/* _addnstr.c */ -int addnstr(char *s, int n); - -/* _addnwstr.c */ -int addnwstr(wchar_t *s, int n); - -/* _addstr.c */ -int addstr(char *s); - -/* _addwch.c */ -int addwch(chtype ch); - -/* _addwchnstr.c */ -int addwchnstr(chtype *str, int n); - -/* _addwchstr.c */ -int addwchstr(chtype *str); - -/* _addwstr.c */ -int addwstr(wchar_t *ws); - -/* _attroff.c */ -int attroff(chtype at); - -/* _attron.c */ -int attron(chtype at); - -/* _attrset.c */ -int attrset(chtype at); - -/* _beep.c */ -int beep(void); - -/* _bkgd.c */ -int bkgd(chtype c); - -/* _bkgdset.c */ -void bkgdset(chtype c); - -/* _border.c */ -int border(chtype ls, chtype rs, chtype ts, chtype bs, chtype tl, chtype tr, - chtype bl, chtype br); - -/* _clear.c */ -int clear(void); - -/* _clrtobot.c */ -int clrtobot(void); - -/* _clrtoeol.c */ -int clrtoeol(void); - -/* _crmode.c */ -#undef crmode -int crmode(void); - -/* _del_curterm.c */ -int del_curterm(TERMINAL *terminal); - -/* _delch.c */ -int delch(void); - -/* _deleteln.c */ -int deleteln(void); - -/* _echo.c */ -int echo(void); - -/* _echochar.c */ -int echochar(chtype ch); - -/* _echowchar.c */ -int echowchar(chtype ch); - -/* _erase.c */ -int erase(void); - -/* _fixterm.c */ -int fixterm(void); - -/* _flash.c */ -int flash(void); - -/* _garbagdlins.c */ -int garbagedlines(WINDOW *win, int start, int finish); - -/* _garbagedwin.c */ -int garbagedwin(WINDOW *win); - -/* _getch.c */ -int getch(void); - -/* _getnwstr.c */ -int getnwstr(wchar_t *ws, int n); - -/* _getstr.c */ -int getstr(char *str); - -/* _getwch.c */ -int getwch(void); - -/* _getwstr.c */ -int getwstr(wchar_t *ws); - -/* _halfdelay.c */ -int halfdelay(int tens); - -/* _hline.c */ -int hline(chtype horch, int num_chars); - -/* _inch.c */ -chtype inch(void); - -/* _inchnstr.c */ -int inchnstr(chtype *s, int n); - -/* _inchstr.c */ -int inchstr(chtype *s); - -/* _innstr.c */ -int innstr(char *s, int n); - -/* _innwstr.c */ -int innwstr(wchar_t *ws, int n); - -/* _insch.c */ -int insch(chtype c); - -/* _insdelln.c */ -int insdelln(int id); - -/* _insertln.c */ -int insertln(void); - -/* _insnstr.c */ -int insnstr(char *s, int n); - -/* _insnwstr.c */ -int insnwstr(wchar_t *ws, int n); - -/* _insstr.c */ -int insstr(char *s); - -/* _instr.c */ -int instr(char *s); - -/* _inswch.c */ -int inswch(chtype c); - -/* _inswstr.c */ -int inswstr(wchar_t *ws); - -/* _intrflush.c */ -int intrflush(WINDOW *win, int flag); - -/* _inwch.c */ -chtype inwch(void); - -/* _inwchnstr.c */ -int inwchnstr(chtype *str, int n); - -/* _inwchstr.c */ -int inwchstr(chtype *str); - -/* _inwstr.c */ -int inwstr(wchar_t *ws); - -/* _meta.c */ -int meta(WINDOW *win, int flag); - -/* _move.c */ -int move(int y, int x); - -/* _mvaddch.c */ -int mvaddch(int y, int x, chtype ch); - -/* _mvaddchnstr.c */ -int mvaddchnstr(int y, int x, chtype *s, int n); - -/* _mvaddchstr.c */ -int mvaddchstr(int y, int x, chtype *s); - -/* _mvaddnstr.c */ -int mvaddnstr(int y, int x, char *s, int n); - -/* _mvaddnwstr.c */ -int mvaddnwstr(int y, int x, wchar_t *ws, int n); - -/* _mvaddstr.c */ -int mvaddstr(int y, int x, char *str); - -/* _mvaddwch.c */ -int mvaddwch(int y, int x, chtype ch); - -/* _mvaddwchnstr.c */ -int mvaddwchnstr(int y, int x, chtype *str, int n); - -/* _mvaddwchstr.c */ -int mvaddwchstr(int y, int x, chtype *s); - -/* _mvaddwstr.c */ -int mvaddwstr(int y, int x, wchar_t *ws); - -/* _mvdelch.c */ -int mvdelch(int y, int x); - -/* _mvgetch.c */ -int mvgetch(int y, int x); - -/* _mvgetnwstr.c */ -int mvgetnwstr(int y, int x, wchar_t *ws, int n); - -/* _mvgetstr.c */ -int mvgetstr(int y, int x, char *str); - -/* _mvgetwch.c */ -int mvgetwch(int y, int x); - -/* _mvgetwstr.c */ -int mvgetwstr(int y, int x, wchar_t *ws); - -/* _mvhline.c */ -int mvhline(int y, int x, chtype ch, int n); - -/* _mvinch.c */ -chtype mvinch(int y, int x); - -/* _mvinchnstr.c */ -int mvinchnstr(int y, int x, chtype *str, int n); - -/* _mvinchstr.c */ -int mvinchstr(int y, int x, chtype *str); - -/* _mvinnstr.c */ -int mvinnstr(int y, int x, char *s, int n); - -/* _mvinnwstr.c */ -int mvinnwstr(int y, int x, wchar_t *ws, int n); - -/* _mvinsch.c */ -int mvinsch(int y, int x, chtype ch); - -/* _mvinsnstr.c */ -int mvinsnstr(int y, int x, char *s, int n); - -/* _mvinsnwstr.c */ -int mvinsnwstr(int y, int x, wchar_t *ws, int n); - -/* _mvinsstr.c */ -int mvinsstr(int y, int x, char *s); - -/* _mvinstr.c */ -int mvinstr(int y, int x, char *s); - -/* _mvinswch.c */ -int mvinswch(int y, int x, chtype ch); - -/* _mvinswstr.c */ -int mvinswstr(int y, int x, wchar_t *ws); - -/* _mvinwch.c */ -chtype mvinwch(int y, int x); - -/* _mvinwchnstr.c */ -int mvinwchnstr(int y, int x, chtype *str, int n); - -/* _mvinwchstr.c */ -int mvinwchstr(int y, int x, chtype *str); - -/* _mvinwstr.c */ -int mvinwstr(int y, int x, wchar_t *ws); - -/* _mvvline.c */ -int mvvline(int y, int x, chtype c, int n); - -/* _mvwaddch.c */ -int mvwaddch(WINDOW *win, int y, int x, chtype ch); - -/* _mvwaddchnst.c */ -int mvwaddchnstr(WINDOW *win, int y, int x, chtype *ch, int n); - -/* _mvwaddchstr.c */ -int mvwaddchstr(WINDOW *win, int y, int x, chtype *ch); - -/* _mvwaddnstr.c */ -int mvwaddnstr(WINDOW *win, int y, int x, char *c, int n); - -/* _mvwaddnwstr.c */ -int mvwaddnwstr(WINDOW *win, int y, int x, wchar_t *wc, int n); - -/* _mvwaddstr.c */ -int mvwaddstr(WINDOW *win, int y, int x, char *str); - -/* _mvwaddwch.c */ -int mvwaddwch(WINDOW *win, int y, int x, chtype ch); - -/* _mvwaddwchnstr.c */ -int mvwaddwchnstr(WINDOW *win, int y, int x, chtype *str, int n); - -/* _mvwaddwchstr.c */ -int mvwaddwchstr(WINDOW *win, int y, int x, chtype *str); - -/* _mvwaddwstr.c */ -int mvwaddwstr(WINDOW *win, int y, int x, wchar_t *wc); - -/* _mvwdelch.c */ -int mvwdelch(WINDOW *win, int y, int x); - -/* _mvwgetch.c */ -int mvwgetch(WINDOW *win, int y, int x); - -/* _mvwgetnwstr.c */ -int mvwgetnwstr(WINDOW *win, int y, int x, wchar_t *ws, int n); - -/* _mvwgetstr.c */ -int mvwgetstr(WINDOW *win, int y, int x, char *str); - -/* _mvwgetwch.c */ -int mvwgetwch(WINDOW *win, int y, int x); - -/* _mvwgetwstr.c */ -int mvwgetwstr(WINDOW *win, int y, int x, wchar_t *ws); - -/* _mvwhline.c */ -int mvwhline(WINDOW *win, int y, int x, chtype c, int n); - -/* _mvwinch.c */ -chtype mvwinch(WINDOW *win, int y, int x); - -/* _mvwinchnst.c */ -int mvwinchnstr(WINDOW *win, int y, int x, chtype *s, int n); - -/* _mvwinchstr.c */ -int mvwinchstr(WINDOW *win, int y, int x, chtype *str); - -/* _mvwinnstr.c */ -int mvwinnstr(WINDOW *win, int y, int x, char *str, int n); - -/* _mvwinnwstr.c */ -int mvwinnwstr(WINDOW *win, int y, int x, wchar_t *ws, int n); - -/* _mvwinsch.c */ -int mvwinsch(WINDOW *win, int y, int x, chtype c); - -/* _mvwinsnstr.c */ -int mvwinsnstr(WINDOW *win, int y, int x, char *str, int n); - -/* _mvwinsnwstr.c */ -int mvwinsnwstr(WINDOW *win, int y, int x, wchar_t *ws, int n); - -/* _mvwinsstr.c */ -int mvwinsstr(WINDOW *win, int y, int x, char *str); - -/* _mvwinstr.c */ -int mvwinstr(WINDOW *win, int y, int x, char *str); - -/* _mvwinswch.c */ -int mvwinswch(WINDOW *win, int y, int x, chtype c); - -/* _mvwinswstr.c */ -int mvwinswstr(WINDOW *win, int y, int x, wchar_t *ws); - -/* _mvwinwch.c */ -chtype mvwinwch(WINDOW *win, int y, int x); - -/* _mvwinwchnstr.c */ -int mvwinwchnstr(WINDOW *win, int y, int x, chtype *str, int n); - -/* _mvwinwchstr.c */ -int mvwinwchstr(WINDOW *win, int y, int x, chtype *str); - -/* _mvwinwstr.c */ -int mvwinwstr(WINDOW *win, int y, int x, wchar_t *ws); - -/* _mvwvline.c */ -int mvwvline(WINDOW *win, int y, int x, chtype c, int n); - -/* _nl.c */ -int nl(void); - -/* _nocrmode.c */ -#undef nocrmode -int nocrmode(void); - -/* _noecho.c */ -int noecho(void); - -/* _nonl.c */ -int nonl(void); - -/* _noqiflush.c */ -void noqiflush(void); - -/* _overlay.c */ -int overlay(WINDOW *src, WINDOW *dst); - -/* _overwrite.c */ -int overwrite(WINDOW *src, WINDOW *dst); - -/* _qiflush.c */ -void qiflush(void); - -/* _refresh.c */ -int refresh(void); - -/* _resetterm.c */ -int resetterm(void); - -/* _saveterm.c */ -int saveterm(void); - -/* _scr_init.c */ -int scr_init(char *file); - -/* _scr_restore.c */ -int scr_restore(char *file); - -/* _scr_set.c */ -int scr_set(char *file); - -/* _scrl.c */ -int scrl(int n); - -/* _scroll.c */ -int scroll(WINDOW *win); - -/* _set_curterm.c */ -TERMINAL *set_curterm(TERMINAL *newterminal); - -/* _set_term.c */ -SCREEN *set_term(SCREEN *screen); - -/* _setscrreg.c */ -int setscrreg(int t, int b); - -/* _slk_init.c */ -int slk_init(int f); - -/* _standend.c */ -int standend(void); - -/* _standout.c */ -int standout(void); - -/* _subpad.c */ -WINDOW *subpad(WINDOW *win, int l, int nc, int by, int bx); - -/* _timeout.c */ -void timeout(int tm); - -/* _touchline.c */ -int touchline(WINDOW *win, int y, int n); - -/* _unctrl.c */ -char *unctrl(int ch); - -/* _vline.c */ -int vline(chtype vertch, int num_chars); - -/* _waddchstr.c */ -int waddchstr(WINDOW *win, chtype *str); - -/* _waddstr.c */ -int waddstr(WINDOW *win, char *str); - -/* _waddwchstr.c */ -int waddwchstr(WINDOW *win, chtype *str); - -/* _waddwstr.c */ -int waddwstr(WINDOW *win, wchar_t *ws); - -/* _wclear.c */ -int wclear(WINDOW *win); - -/* _wdeleteln.c */ -int wdeleteln(WINDOW *win); - -/* _werase.c */ -int werase(WINDOW *win); - -/* _winsertln.c */ -int winsertln(WINDOW *win); - -/* _winsstr.c */ -int winsstr(WINDOW *win, char *str); - -/* _winswstr.c */ -int winswstr(WINDOW *win, wchar_t *ws); - -/* _winwchstr.c */ -int winwchstr(WINDOW *win, chtype *str); - -/* _wstandend.c */ -int wstandend(WINDOW *win); - -/* _wstandout.c */ -int wstandout(WINDOW *win); - -/* baudrate.c */ -int baudrate(void); - -/* can_change.c */ -bool can_change_color(void); - -/* cbreak.c */ -int cbreak(void); - -/* chkinput.c */ -int _chkinput(void); - -/* clearok.c */ -int clearok(WINDOW *win, bool bf); - -/* color_cont.c */ -int color_content(short color, short *r, short *g, short *b); - -/* copywin.c */ -int copywin(WINDOW *Srcwin, WINDOW *Dstwin, int minRowSrc, int minColSrc, - int minRowDst, int minColDst, int maxRowDst, - int maxColDst, int over_lay); - -/* curs_set.c */ -int curs_set(int visibility); - -/* curserr.c */ -void curserr(void); - -/* curses.c */ - -/* def_prog.c */ -int def_prog_mode(void); - -/* delay.c */ -int _delay(int delay, int (*outc)(char)); - -/* delay_out.c */ -int delay_output(int ms); - -/* delkey.c */ -int delkey(char *sends, int keyval); - -/* delkeymap.c */ -void delkeymap(TERMINAL *terminal); - -/* delscreen.c */ -void delscreen(SCREEN *screen); - -/* delterm.c */ -int delterm(TERMINAL *terminal); - -/* delwin.c */ -int delwin(WINDOW *win); - -/* derwin.c */ -WINDOW *derwin(WINDOW *win, int num_lines, int nc, int by, int bx); - -/* doupdate.c */ -int doupdate(void); - -/* draino.c */ -int draino(int ms); - -/* dupwin.c */ -WINDOW *dupwin(WINDOW *win); - -/* endwin.c */ -int isendwin(void); -int endwin(void); -int force_doupdate(void); - -/* erasechar.c */ -char erasechar(void); - -/* flushinp.c */ -int flushinp(void); - -/* getattrs.c */ -chtype getattrs(WINDOW *win); - -/* getbegyx.c */ -int getbegy(WINDOW *win); -int getbegx(WINDOW *win); - -/* getbkgd.c */ -chtype getbkgd(WINDOW *win); - -/* getmaxyx.c */ -int getmaxy(WINDOW *win); -int getmaxx(WINDOW *win); - -/* getparyx.c */ -int getpary(WINDOW *win); -int getparx(WINDOW *win); - -/* getsyx.c */ -int _getsyx(int *yp, int *xp); - -/* gettmode.c */ -int gettmode(void); - -/* getwin.c */ -WINDOW *getwin(FILE *filep); - -/* getyx.c */ -int getcury(WINDOW *win); -int getcurx(WINDOW *win); - -/* has_colors.c */ -bool has_colors(void); - -/* has_ic.c */ -int has_ic(void); - -/* has_il.c */ -int has_il(void); - -/* idcok.c */ -void idcok(WINDOW *win, bool bf); - -/* idlok.c */ -int idlok(WINDOW *win, bool bf); - -/* immedok.c */ -void immedok(WINDOW *win, bool bf); - -/* init_acs.c */ -int init_acs(void); - -/* init_color.c */ -int init_color(short color, short r, short g, short b); - -/* init_costs.c */ -void _init_costs(void); -int _countchar(void); - -/* init_pair.c */ -int init_pair(short pair, short f, short b); -void _init_HP_pair(short pair, short f, short b); - -/* is_wintou.c */ -int is_wintouched(WINDOW *win); - -/* is_linetou.c */ -int is_linetouched(WINDOW *win, int line); - -/* keyname.c */ -char *keyname(int key); - -/* keypad.c */ -int keypad(WINDOW *win, bool bf); - -/* killchar.c */ -char killchar(void); - -/* leaveok.c */ -int leaveok(WINDOW *win, bool bf); - -/* longname.c */ -char *longname(void); - -/* makenew.c */ -WINDOW *_makenew(int nlines, int ncols, int begy, int begx); - -/* mbaddch.c */ -int _mbclrch(WINDOW *win, int y, int x); -int _mbvalid(WINDOW *win); -int _mbaddch(WINDOW *win, chtype a, chtype b); - -/* mbcharlen.c */ -int mbcharlen(char *sp); - -/* mbdisplen.c */ -int mbdisplen(char *sp); - -/* mbgetwidth.c */ -void mbgetwidth(void); -int mbeucw(int c); -int mbscrw(int c); -int wcscrw(wchar_t wc); - -/* mbinch.c */ -char *wmbinch(WINDOW *win, int y, int x); - -/* mbinsshift.c */ -int _mbinsshift(WINDOW *win, int len); - -/* mbmove.c */ -int wmbmove(WINDOW *win, int y, int x); - -/* mbstowcs.c */ -size_t _curs_mbstowcs(wchar_t *pwcs, const char *s, size_t n); - -/* mbtowc.c */ -int _curs_mbtowc(wchar_t *wchar, const char *s, size_t n); - -/* mbtranslate.c */ -char *_strcode2byte(wchar_t *code, char *b, int n); -wchar_t *_strbyte2code(char *code, wchar_t *byte, int n); - -/* memSset.c */ -void memSset(chtype *s, chtype c, int n); - -/* meta.c */ -int _meta(int bf); - -/* mouse.c */ -int mouse_set(long mbe); -int mouse_on(long mbe); -int mouse_off(long mbe); -int request_mouse_pos(void); -void wmouse_position(WINDOW *win, int *x, int *y); -int map_button(unsigned long a); -unsigned long getmouse(void); -unsigned long getbmap(void); - -/* mvcur.c */ -int mvcur(int cury, int curx, int newy, int newx); - -/* mvderwin.c */ -int mvderwin(WINDOW *win, int pary, int parx); - -/* mvprintw.c */ -int mvprintw(int y, int x, ...); - -/* mvscanw.c */ -int mvscanw(int y, int x, ...); - -/* mvwin.c */ -int mvwin(WINDOW *win, int by, int bx); - -/* mvwprintw.c */ -int mvwprintw(WINDOW *win, int y, int x, ...); - -/* mvwscanw.c */ -int mvwscanw(WINDOW *win, int y, int x, ...); - -/* napms.c */ -int napms(int ms); - -/* newkey.c */ -int newkey(char *rcvchars, short keyval, bool macro); - -/* newpad.c */ -WINDOW *newpad(int l, int nc); - -/* newscreen.c */ -int filter(void); -SCREEN *newscreen(char *type, int lsize, int csize, int tabsize, FILE *outfptr, - FILE *infptr); - -/* newwin.c */ -WINDOW *newwin(int nlines, int ncols, int by, int bx); -int _image(WINDOW *win); - -/* nocbreak.c */ -int nocbreak(void); - -/* nodelay.c */ -int nodelay(WINDOW *win, bool bf); - -/* noraw.c */ -int noraw(void); - -/* notimeout.c */ -int notimeout(WINDOW *win, bool bf); - -/* outch.c */ -int _outch(char c); -int _outwch(chtype c); - -/* overlap.c */ -int _overlap(WINDOW *Srcwin, WINDOW *Dstwin, int Overlay); - -/* pair_cont.c */ -int pair_content(short pair, short *f, short *b); - -/* pechowchar.c */ -int pechowchar(WINDOW *pad, chtype ch); - -/* pnoutref.c */ -int pnoutrefresh(WINDOW *pad, int pby, int pbx, int sby, int sbx, - int sey, int sex); - -/* prefresh.c */ -int prefresh(WINDOW *pad, int pminy, int pminx, int sminy, int sminx, - int smaxy, int smaxx); -int _prefresh(int (*func)(WINDOW *), WINDOW *pad, int pminy, int pminx, - int sminy, int sminx, int smaxy, int smaxx); -int _padjust(WINDOW *pad, int pminy, int pminx, int sminy, int sminx, - int smaxy, int smaxx); - -/* printw.c */ -int printw(char *fmt, ...); - -/* putwin.c */ -int putwin(WINDOW *win, FILE *filep); - -/* quick_echo.c */ -int _quick_echo(WINDOW *win, chtype ch); - -/* raw.c */ -int raw(void); - -/* redrawwin.c */ -int redrawwin(WINDOW *win); - -/* reset_sh.c */ -int reset_shell_mode(void); - -/* resetty.c */ -int resetty(void); - -/* restart.c */ -int restartterm(char * term, int filenum, int *errret); - -/* ring.c */ -int _ring(bool bf); - -/* ripoffline.c */ -int ripoffline(int line, int (*init)(WINDOW *, int)); - -/* savetty.c */ -int savetty(void); - -/* scanw.c */ -int scanw(char *fmt, ...); - -/* scr_all.c */ -int _scr_all(char *file, int which); - -/* scr_dump.c */ -int scr_dump(char *file); - -/* scr_ll_dump.c */ -int scr_ll_dump(FILE *filep); - -/* scr_reset.c */ -int scr_reset(FILE *filep, int type); - -/* scrollok.c */ -int scrollok(WINDOW *win, bool bf); - -/* setcurscreen.c */ -SCREEN *setcurscreen(SCREEN *new); - -/* setcurterm.c */ -TERMINAL *setcurterm(TERMINAL *newterminal); - -/* setecho.c */ -int _setecho(int bf); - -/* setkeymap.c */ -int setkeymap(void); - -/* setnonl.c */ -int _setnonl(int bf); - -/* setqiflush.c */ -void _setqiflush(int yes); - -/* setsyx.c */ -int setsyx(int y, int x); - -/* setupterm.c */ -int setupterm(char *term, int filenum, int *errret); -void _blast_keys(TERMINAL *terminal); -int reset_prog_mode(void); -int def_shell_mode(void); - -/* slk_atroff.c */ -int slk_attroff(chtype a); - -/* slk_atron.c */ -int slk_attron(chtype a); - -/* slk_atrset.c */ -int slk_attrset(chtype a); - -/* slk_clear.c */ -int slk_clear(void); - -/* slk_label.c */ -char *slk_label(int n); - -/* slk_noutref.c */ -int slk_noutrefresh(void); - -/* slk_refresh.c */ -int slk_refresh(void); -int _slk_update(void); - -/* slk_restore.c */ -int slk_restore(void); - -/* slk_set.c */ -int slk_set(int n, char *lab, int f); - -/* slk_start.c */ -int slk_start(int ng, int *gp); - -/* slk_touch.c */ -int slk_touch(void); - -/* start_col.c */ -int start_color(void); - -/* subwin.c */ -WINDOW *subwin(WINDOW *win, int l, int nc, int by, int bx); - -/* syncok.c */ -int syncok(WINDOW *win, bool bf); - -/* tcsearch.c */ -int _tcsearch(char *cap, short offsets[], char *names[], int size, int n); - -/* termattrs.c */ -chtype termattrs(void); - -/* termcap.c */ -int tgetent(char *bp, char *name); -int tgetflag(char *tcstr); -int tgetnum(char *tcstr); -char *tgetstr(char *tcstr, char **area); - -/* termerr.c */ -void termerr(void); - -/* termname.c */ -char *termname(void); - -/* tgetch.c */ -int tgetch(int interpret); - -/* tgetwch.c */ -wchar_t tgetwch(int cntl); - -/* tgoto.c */ -char *tgoto(char *cap, int col, int row); - -/* tifget.c */ -int tifgetflag(char *tistr); -int tifgetnum(char *tistr); -char *tifgetstr(char *tistr); - -/* tifnames.c */ - -/* tiget.c */ -int tigetflag(char *tistr); -int tigetnum(char *tistr); -char *tigetstr(char *tistr); - -/* tinames.c */ - -/* tinputfd.c */ -void tinputfd(int fd); - -/* tnames.c */ - -/* touchwin.c */ -int touchwin(WINDOW *win); - -/* tparm.c */ -char *tparm(char *instring, long fp1, long fp2, long p3, long p4, long p5, - long p6, long p7, long p8, long p9); -char *_branchto(char *cp, char to); - -/* tputs.c */ -int tputs(char *cp, int affcnt, int (*outc)(char)); - -/* trace.c */ -int traceon(void); -int traceoff(void); - -/* tstp.c */ -void _tstp(int dummy); -void _ccleanup(int signo); - -/* ttimeout.c */ -int ttimeout(int delay); - -/* typeahead.c */ -int typeahead(int fd); - -/* unctrl.c */ - -/* ungetch.c */ -int ungetch(int ch); - -/* ungetwch.c */ -int ungetwch(wchar_t code); - -/* untouchwin.c */ -int untouchwin(WINDOW *win); - -/* use_env.c */ -void use_env(int bf); - -/* vidupdate.c */ -void vidupdate(chtype newmode, chtype oldmode, int (*outc)(char)); -int _change_video(chtype newmode, chtype oldmode, int (*outc)(char), - bool color_terminal); -void _change_color(short newcolor, short oldcolor, int (*outc)(char)); - -/* vsscanf.c */ -int _vsscanf(char *buf, char *fmt, va_list ap); - -/* vwprintw.c */ -int vwprintw(WINDOW *win, char *fmt, va_list ap); - -/* vwscanw.c */ -int vwscanw(WINDOW *win, char *fmt, va_list ap); - -/* waddchnstr.c */ -int waddchnstr(WINDOW *win, chtype *string, int ncols); - -/* waddnstr.c */ -int waddnstr(WINDOW *win, char *tstr, int i); - -/* waddnwstr.c */ -int waddnwstr(WINDOW *win, wchar_t *code, int n); - -/* waddwch.c */ -int waddwch(WINDOW *win, chtype c); - -/* waddwchnstr.c */ -int waddwchnstr(WINDOW *win, chtype *string, int ncols); - -/* wadjcurspos.c */ -int wadjcurspos(WINDOW *win); - -/* wbkgd.c */ -int wbkgd(WINDOW *win, chtype nbkgd); - -/* wbkgdset.c */ -void wbkgdset(WINDOW *win, chtype c); - -/* wborder.c */ -int wborder(WINDOW *win, chtype ls, chtype rs, chtype ts, chtype bs, - chtype tl, chtype tr, chtype bl, chtype br); - -/* wclrtobot.c */ -int wclrtobot(WINDOW *win); - -/* wclrtoeol.c */ -int wclrtoeol(WINDOW *win); - -/* wcstombs.c */ -size_t _curs_wcstombs(char *s, const wchar_t *pwcs, size_t n); - -/* wctomb.c */ -int _curs_wctomb(char *s, const wchar_t wchar); - -/* wdelch.c */ -int wdelch(WINDOW *win); - -/* wechowchar.c */ -int wechowchar(WINDOW *win, chtype ch); - -/* wgetch.c */ -int wgetch(WINDOW *win); - -/* wgetstr.c */ -int wgetstr(WINDOW *win, char *str); -int wgetnstr(WINDOW *win, char *str, int n); - -/* wgetwch.c */ -int wgetwch(WINDOW *win); - -/* wgetwstr.c */ -int wgetwstr(WINDOW *win, wchar_t *str); -int wgetnwstr(WINDOW *win, wchar_t *str, int n); - -/* whline.c */ -int whline(WINDOW *win, chtype ch, int num_chars); - -/* winch.c */ -chtype winch(WINDOW *win); - -/* winchnstr.c */ -int winchnstr(WINDOW *win, chtype *string, int ncols); - -/* winchstr.c */ -int winchstr(WINDOW *win, chtype *string); - -/* winnstr.c */ -int winnstr(WINDOW *win, char *string, int ncols); - -/* winnwstr.c */ -int winnwstr(WINDOW *win, wchar_t *wstr, int ncols); - -/* winsch.c */ -int winsch(WINDOW *win, chtype c); - -/* winsdelln.c */ -int winsdelln(WINDOW *win, int id); - -/* winsnstr.c */ -int winsnstr(WINDOW *win, char *tsp, int n); - -/* winsnwstr.c */ -int winsnwstr(WINDOW *win, wchar_t *code, int n); - -/* winstr.c */ -int winstr(WINDOW *win, char *str); - -/* winswch.c */ -int winswch(WINDOW *win, chtype c); - -/* winwch.c */ -chtype winwch(WINDOW *win); - -/* winwchnstr.c */ -int winwchnstr(WINDOW *win, chtype *string, int ncols); - -/* winwstr.c */ -int winwstr(WINDOW *win, wchar_t *wstr); - -/* wmove.c */ -int wmove(WINDOW *win, int y, int x); - -/* wmovenextch.c */ -int wmovenextch(WINDOW *win); - -/* wmoveprevch.c */ -int wmoveprevch(WINDOW *win); - -/* wnoutrefresh.c */ -int wnoutrefresh(WINDOW *win); - -/* wprintw.c */ -int wprintw(WINDOW *win, ...); - -/* wredrawln.c */ -int wredrawln(WINDOW *win, int begline, int numlines); - -/* wrefresh.c */ -int wrefresh(WINDOW *win); - -/* wscanw.c */ -int wscanw(WINDOW *win, ...); - -/* wscrl.c */ -int wscrl(WINDOW *win, int n); - -/* wsetscrreg.c */ -int wsetscrreg(WINDOW *win, int topy, int boty); - -/* wsyncdown.c */ -void wsyncdown(WINDOW *win); - -/* wsyncup.c */ -void wsyncup(WINDOW *win); -void wcursyncup(WINDOW *win); - -/* wtimeout.c */ -void wtimeout(WINDOW *win, int tm); - -/* wtouchln.c */ -int wtouchln(WINDOW *win, int y, int n, int changed); - -/* wvline.c */ -int wvline(WINDOW *win, chtype vertch, int num_chars); - -/* _box.c */ -/* really box32 */ -int box(WINDOW *win, chtype v, chtype h); - -/* V3.box.c */ -#undef box -int box(WINDOW *win, _ochtype v, _ochtype h); - -/* _newterm.c */ -/* really newterm32 */ -SCREEN *newterm(char *type, FILE *fout, FILE *fin); - -/* V3.newterm.c */ -#undef newterm -SCREEN *newterm(char *type, FILE *outfptr, FILE *infptr); - -/* setterm.c */ -#undef setterm -int setterm(char *name); - -/* pechochar.c */ -/* really p32echochar */ -int pechochar(WINDOW *win, chtype c); - -/* V3.pechochar.c */ -#undef pechochar -int pechochar(WINDOW *win, _ochtype c); - -/* waddch.c */ -/* really w32addch */ -int waddch(WINDOW *win, chtype c); - -/* V3.waddch.c */ -#undef waddch -int waddch(WINDOW *win, _ochtype c); - -/* wattroff.c */ -/* really w32attroff */ -int wattroff(WINDOW *win, chtype attrs); - -/* V3.wattroff.c */ -#undef wattroff -int wattroff(WINDOW *win, _ochtype attrs); - -/* wattron.c */ -/* really w32attron */ -int wattron(WINDOW *win, chtype attrs); - -/* V3.wattron.c */ -#undef wattron -int wattron(WINDOW *win, _ochtype attrs); - -/* wattrset.c */ -/* really w32attrset */ -int wattrset(WINDOW *win, chtype attrs); - -/* V3.wattrset.c */ -#undef wattrset -int wattrset(WINDOW *win, _ochtype attrs); - -/* wechochar.c */ -/* really w32echochar */ -int wechochar(WINDOW *win, chtype c); - -/* V3.wechochar.c */ -#undef wechochar -int wechochar(WINDOW *win, _ochtype c); - -/* winsch.c */ -/* really w32insch */ -int winsch(WINDOW *win, chtype c); - -/* V3.winsch.c */ -#undef winsch -int winsch(WINDOW *win, _ochtype c); - -/* putp.c */ -int _outchar(char ch); -int putp(char *str); -/* really vid32attr */ -int vidattr(chtype newmode); - -/* V3.vidattr.c */ -#undef vidattr -int vidattr(_ochtype a); - -/* vidputs.c */ -/* really vid32puts */ -int vidputs(chtype a, int (*b)(char)); - -/* V3.vidputs.c */ -#undef vidputs -int vidputs(_ochtype a, int (*o)(char)); - -/* initscr.c */ -/* really initscr32 */ -WINDOW *initscr(void); - -/* V3.initscr.c */ -#undef initscr -WINDOW *initscr(void); diff --git a/usr/src/lib/libcustr/common/llib-lcustr b/usr/src/lib/libcustr/common/llib-lcustr deleted file mode 100644 index 61a1885c85..0000000000 --- a/usr/src/lib/libcustr/common/llib-lcustr +++ /dev/null @@ -1,20 +0,0 @@ -/* - * This file and its contents are supplied under the terms of the - * Common Development and Distribution License ("CDDL"), version 1.0. - * You may only use this file in accordance with the terms of version - * 1.0 of the CDDL. - * - * A full copy of the text of the CDDL should have accompanied this - * source. A copy of the CDDL is also available via the Internet at - * http://www.illumos.org/license/CDDL. - */ - -/* - * Copyright 2018, Joyent, Inc. - */ - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <sys/debug.h> -#include <libcustr.h> diff --git a/usr/src/lib/libdemangle/common/llib-ldemangle-sys b/usr/src/lib/libdemangle/common/llib-ldemangle-sys deleted file mode 100644 index 0f4c4bc081..0000000000 --- a/usr/src/lib/libdemangle/common/llib-ldemangle-sys +++ /dev/null @@ -1,29 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright 2018 Jason King. - */ - -#include "demangle-sys.h" diff --git a/usr/src/lib/libdevice/llib-ldevice b/usr/src/lib/libdevice/llib-ldevice deleted file mode 100644 index e836d588c6..0000000000 --- a/usr/src/lib/libdevice/llib-ldevice +++ /dev/null @@ -1,31 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright 2009 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#include <sys/types.h> -#include <sys/devctl.h> -#include "libdevice.h" diff --git a/usr/src/lib/libdevid/llib-ldevid b/usr/src/lib/libdevid/llib-ldevid deleted file mode 100644 index 6fbc1d4b45..0000000000 --- a/usr/src/lib/libdevid/llib-ldevid +++ /dev/null @@ -1,33 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -#include "devid.h" -#include "libdevid.h" diff --git a/usr/src/lib/libdevinfo/llib-ldevinfo b/usr/src/lib/libdevinfo/llib-ldevinfo deleted file mode 100644 index 8bf601f9fa..0000000000 --- a/usr/src/lib/libdevinfo/llib-ldevinfo +++ /dev/null @@ -1,32 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2009 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - * - * usr/src/lib/libdevinfo/llib-ldevinfo - */ - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <libdevinfo.h> -#include <device_info.h> diff --git a/usr/src/lib/libdhcpagent/common/llib-ldhcpagent b/usr/src/lib/libdhcpagent/common/llib-ldhcpagent deleted file mode 100644 index 168da5b06f..0000000000 --- a/usr/src/lib/libdhcpagent/common/llib-ldhcpagent +++ /dev/null @@ -1,34 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <dhcp_hostconf.h> -#include <dhcp_stable.h> -#include <dhcpagent_ipc.h> -#include <dhcpagent_util.h> diff --git a/usr/src/lib/libdhcputil/common/llib-ldhcputil b/usr/src/lib/libdhcputil/common/llib-ldhcputil deleted file mode 100644 index 799c396a38..0000000000 --- a/usr/src/lib/libdhcputil/common/llib-ldhcputil +++ /dev/null @@ -1,35 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 1999-2003 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <dhcp_symbol.h> -#include <dhcp_inittab.h> -#include <dhcpmsg.h> -#include <dhcp_impl.h> diff --git a/usr/src/lib/libdisasm/common/llib-ldisasm b/usr/src/lib/libdisasm/common/llib-ldisasm deleted file mode 100644 index 4ca0ab20e6..0000000000 --- a/usr/src/lib/libdisasm/common/llib-ldisasm +++ /dev/null @@ -1,35 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -/* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <libdisasm.h> diff --git a/usr/src/lib/libdiskmgt/common/llib-ldiskmgt b/usr/src/lib/libdiskmgt/common/llib-ldiskmgt deleted file mode 100644 index d4fd481b8f..0000000000 --- a/usr/src/lib/libdiskmgt/common/llib-ldiskmgt +++ /dev/null @@ -1,33 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2002 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include "libdiskmgt.h" -#include "disks_private.h" diff --git a/usr/src/lib/libdladm/common/llib-ldladm b/usr/src/lib/libdladm/common/llib-ldladm deleted file mode 100644 index e5366fb92d..0000000000 --- a/usr/src/lib/libdladm/common/llib-ldladm +++ /dev/null @@ -1,42 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright 2015 Joyent, Inc. - */ - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <libdllink.h> -#include <libdlaggr.h> -#include <libdlwlan.h> -#include <libdlvnic.h> -#include <libdlvlan.h> -#include <libdlib.h> -#include <libdliptun.h> -#include <libdlmgmt.h> -#include <libdlflow.h> -#include <libdlstat.h> -#include <libdlether.h> -#include <libdlsim.h> -#include <libdlbridge.h> -#include <libdloverlay.h> diff --git a/usr/src/lib/libdll/common/llib-ldll b/usr/src/lib/libdll/common/llib-ldll deleted file mode 100644 index eac4e07d98..0000000000 --- a/usr/src/lib/libdll/common/llib-ldll +++ /dev/null @@ -1,32 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - * - * lib/libdll/common/llib-ldll - * - */ - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <dlldefs.h> diff --git a/usr/src/lib/libdlpi/common/llib-ldlpi b/usr/src/lib/libdlpi/common/llib-ldlpi deleted file mode 100644 index e1cc033309..0000000000 --- a/usr/src/lib/libdlpi/common/llib-ldlpi +++ /dev/null @@ -1,32 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <libdlpi.h> diff --git a/usr/src/lib/libdoor/common/llib-ldoor b/usr/src/lib/libdoor/common/llib-ldoor deleted file mode 100644 index fb6075ca86..0000000000 --- a/usr/src/lib/libdoor/common/llib-ldoor +++ /dev/null @@ -1,44 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright 2009 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#include <door.h> - -/* door_calls.c */ -int door_create(void (*)(void *, char *, size_t, door_desc_t *, uint_t), - void *, uint_t); -int door_xcreate(door_server_procedure_t *, void *, uint_t, - door_xcreate_server_func_t *, door_xcreate_thrsetup_func_t *, - void *, int); -int door_revoke(int); -int door_info(int, door_info_t *); -int door_call(int, door_arg_t *); -int door_return(char *, size_t, door_desc_t *, uint_t); -int door_cred(door_cred_t *); -int door_bind(int); -int door_unbind(void); -door_server_func_t *door_server_create(door_server_func_t *); diff --git a/usr/src/lib/libds/common/llib-lds b/usr/src/lib/libds/common/llib-lds deleted file mode 100644 index 83867420d8..0000000000 --- a/usr/src/lib/libds/common/llib-lds +++ /dev/null @@ -1,29 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include "libds.h" diff --git a/usr/src/lib/libdscp/llib-ldscp b/usr/src/lib/libdscp/llib-ldscp deleted file mode 100644 index b4ce6b9926..0000000000 --- a/usr/src/lib/libdscp/llib-ldscp +++ /dev/null @@ -1,32 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/*LINTLIBRARY*/ -/*PROTOLIB1*/ -/* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - * - * usr/src/lib/libdscp/llib-ldscp - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <libdscp.h> diff --git a/usr/src/lib/libdtrace/common/llib-ldtrace b/usr/src/lib/libdtrace/common/llib-ldtrace deleted file mode 100644 index 313e78c5ca..0000000000 --- a/usr/src/lib/libdtrace/common/llib-ldtrace +++ /dev/null @@ -1,32 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2003 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <dtrace.h> diff --git a/usr/src/lib/libefi/common/llib-lefi b/usr/src/lib/libefi/common/llib-lefi deleted file mode 100644 index 8f091f1e2e..0000000000 --- a/usr/src/lib/libefi/common/llib-lefi +++ /dev/null @@ -1,42 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <sys/efi_partition.h> -#include <pkginfo.h> - -/* - * usr/src/lib/libefi - */ -/* rdwr_efi.c */ -int efi_alloc_and_init(int fd, uint32_t nparts, struct dk_gpt **vtoc); -int efi_alloc_and_read(int fd, struct dk_gpt **vtoc); -int efi_write(int fd, struct dk_gpt *vtoc); -void efi_free(struct dk_gpt *); -int efi_use_whole_disk(int fd); - diff --git a/usr/src/lib/libelfsign/common/llib-lelfsign b/usr/src/lib/libelfsign/common/llib-lelfsign deleted file mode 100644 index 5ed60d4a75..0000000000 --- a/usr/src/lib/libelfsign/common/llib-lelfsign +++ /dev/null @@ -1,32 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <sys/crypto/elfsign.h> -#include <libelfsign.h> diff --git a/usr/src/lib/libeti/form/common/llib-lform b/usr/src/lib/libeti/form/common/llib-lform deleted file mode 100644 index f2753e2ce1..0000000000 --- a/usr/src/lib/libeti/form/common/llib-lform +++ /dev/null @@ -1,465 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ - - -/* - * Copyright (c) 1997 by Sun Microsystems, Inc. - * All rights reserved. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.6 */ - -/*LINTLIBRARY*/ - -#include "form.h" - -/* - * FIELDTYPE routines - */ - -FIELDTYPE * -new_fieldtype(fcheck, ccheck) -PTF_int fcheck; -PTF_int ccheck; -{ return ((FIELDTYPE *)0); } - -FIELDTYPE * -link_fieldtype(left, right) -FIELDTYPE *left; -FIELDTYPE *right; -{ return ((FIELDTYPE *)0); } - -int -free_fieldtype(t) -FIELDTYPE * t; -{ return (E_SYSTEM_ERROR); } - -int -set_fieldtype_arg(t, makearg, copyarg, freearg) -FIELDTYPE *t; -PTF_charP makearg; -PTF_charP copyarg; -PTF_void freearg; -{ return (E_SYSTEM_ERROR); } - -int -set_fieldtype_choice(t, next, prev) -FIELDTYPE *t; -PTF_int next; -PTF_int prev; -{ return (E_SYSTEM_ERROR); } - -/* - * FIELD routines - */ - -FIELD * -new_field(rows, cols, frow, fcol, nrow, nbuf) -int rows; -int cols; -int frow; -int fcol; -int nrow; -int nbuf; -{ return ((FIELD *)0); } - -FIELD * -dup_field(field, frow, fcol) -FIELD *field; -int frow; -int fcol; -{ return ((FIELD *)0); } - -FIELD * -link_field(field, frow, fcol) -FIELD *field; -int frow; -int fcol; -{ return ((FIELD *)0); } - -int -free_field(f) -FIELD * f; -{ return (E_SYSTEM_ERROR); } - -int -field_info(f, rows, cols, frow, fcol, nrow, nbuf) -FIELD *f; -int *rows; -int *cols; -int *frow; -int *fcol; -int *nrow; -int *nbuf; -{ return (E_SYSTEM_ERROR); } - -int -dynamic_field_info(f, drows, dcols, max) -FIELD *f; -int *drows; -int *dcols; -int *max; -{ return (E_SYSTEM_ERROR); } - -int -set_max_field(f, max) -FIELD *f; -int max; -{ return (E_SYSTEM_ERROR); } - -int -move_field(f, frow, fcol) -FIELD *f; -int frow; -int fcol; -{ return (E_SYSTEM_ERROR); } - -#ifdef __STDC__ -int -set_field_type(FIELD *f, FIELDTYPE *ft, ...) -#else -/*VARARGS*/ -int -set_field_type(va_alist) -va_dcl -#endif -{ return (E_SYSTEM_ERROR); } - -FIELDTYPE * -field_type(f) -FIELD *f; -{ return ((FIELDTYPE *)0); } - -char * -field_arg(f) -FIELD *f; -{ return ((char *)0); } - -int -set_new_page(f, flag) -FIELD *f; -int flag; -{ return (E_SYSTEM_ERROR); } - -int -new_page(f) -FIELD *f; -{ return (FALSE); } - -int -set_field_just(f, just) -FIELD *f; -int just; -{ return (E_SYSTEM_ERROR); } - -int -field_just(f) -FIELD *f; -{ return (NO_JUSTIFICATION); } - -int -set_field_fore(f, fore) -FIELD *f; -chtype fore; -{ return (E_SYSTEM_ERROR); } - -chtype -field_fore(f) -FIELD *f; -{ return (A_NORMAL); } - -int -set_field_back(f, back) -FIELD *f; -chtype back; -{ return (E_SYSTEM_ERROR); } - -chtype -field_back(f) -FIELD *f; -{ return (A_NORMAL); } - -int -set_field_pad(f, pad) -FIELD *f; -int pad; -{ return (E_SYSTEM_ERROR); } - -int -field_pad(f) -FIELD *f; -{ return (' '); } - -int -set_field_buffer(f, n, v) -FIELD *f; -int n; -char *v; -{ return (E_SYSTEM_ERROR); } - -char * -field_buffer(f, n) -FIELD *f; -int n; -{ return ((char *)0); } - -int -set_field_status(f, status) -FIELD *f; -int status; -{ return (E_SYSTEM_ERROR); } - -int -field_status(f) -FIELD *f; -{ return (FALSE); } - -int -set_field_userptr(f, userptr) -FIELD *f; -char *userptr; -{ return (E_SYSTEM_ERROR); } - -char * -field_userptr(f) -FIELD *f; -{ return ((char *)0); } - -int -set_field_opts(f, opts) -FIELD *f; -OPTIONS opts; -{ return (E_SYSTEM_ERROR); } - -OPTIONS -field_opts(f) -FIELD *f; -{ return ((OPTIONS)0); } - -int -field_opts_on(f, opts) -FIELD *f; -OPTIONS opts; -{ return (E_SYSTEM_ERROR); } - -int -field_opts_off(f, opts) -FIELD *f; -OPTIONS opts; -{ return (E_SYSTEM_ERROR); } - -/* - * FORM routines - */ - -FORM * -new_form(field) -FIELD **field; -{ return ((FORM *)0); } - -int -free_form(f) -FORM *f; -{ return (E_SYSTEM_ERROR); } - -int -set_form_fields(f, fields) -FORM *f; -FIELD **fields; -{ return (E_SYSTEM_ERROR); } - -FIELD ** -form_fields(f) -FORM *f; -{ return ((FIELD **)0); } - -int -field_count(f) -FORM *f; -{ return (-1); } - -int -set_form_win(f, window) -FORM *f; -WINDOW *window; -{ return (E_SYSTEM_ERROR); } - -WINDOW * -form_win(f) -FORM *f; -{ return ((WINDOW *)0); } - -int -set_form_sub(f, window) -FORM *f; -WINDOW *window; -{ return (E_SYSTEM_ERROR); } - -WINDOW * -form_sub(f) -FORM *f; -{ return ((WINDOW *)0); } - -int -set_current_field(f, c) -FORM *f; -FIELD *c; -{ return (E_SYSTEM_ERROR); } - -FIELD * -current_field(f) -FORM *f; -{ return ((FIELD *)0); } - -int -field_index(f) -FIELD *f; -{ return (-1); } - -int -set_form_page(f, page) -FORM *f; -int page; -{ return (E_SYSTEM_ERROR); } - -int -form_page(f) -FORM *f; -{ return (-1); } - -int -scale_form(f, rows, cols) -FORM *f; -int *rows; -int *cols; -{ return (E_SYSTEM_ERROR); } - -int -set_form_init(f, func) -FORM *f; -PTF_void func; -{ return (E_SYSTEM_ERROR); } - -PTF_void -form_init(f) -FORM *f; -{ return ((PTF_void)0); } - -int -set_form_term(f, func) -FORM *f; -PTF_void func; -{ return (E_SYSTEM_ERROR); } - -PTF_void -form_term(f) -FORM *f; -{ return ((PTF_void)0); } - -int -set_field_init(f, func) -FORM *f; -PTF_void func; -{ return (E_SYSTEM_ERROR); } - -PTF_void -field_init(f) -FORM *f; -{ return ((PTF_void)0); } - -int -set_field_term(f, func) -FORM *f; -PTF_void func; -{ return (E_SYSTEM_ERROR); } - -PTF_void -field_term(f) -FORM *f; -{ return ((PTF_void)0); } - -int -post_form(f) -FORM *f; -{ return (E_SYSTEM_ERROR); } - -int -unpost_form(f) -FORM *f; -{ return (E_SYSTEM_ERROR); } - -int -pos_form_cursor(f) -FORM *f; -{ return (E_SYSTEM_ERROR); } - -int -form_driver(f, c) -FORM *f; -int c; -{ return (E_SYSTEM_ERROR); } - -int -set_form_userptr(f, userptr) -FORM *f; -char *userptr; -{ return (E_SYSTEM_ERROR); } - -char * -form_userptr(f) -FORM *f; -{ return ((char *)0); } - -int -set_form_opts(f, opts) -FORM *f; -OPTIONS opts; -{ return (E_SYSTEM_ERROR); } - -OPTIONS -form_opts(f) -FORM *f; -{ return ((OPTIONS)0); } - -int -form_opts_on(f, opts) -FORM *f; -OPTIONS opts; -{ return (E_SYSTEM_ERROR); } - -int -form_opts_off(f, opts) -FORM *f; -OPTIONS opts; -{ return (E_SYSTEM_ERROR); } - -int -data_ahead(f) -FORM *f; -{ return (FALSE); } - -int -data_behind(f) -FORM *f; -{ return (FALSE); } diff --git a/usr/src/lib/libeti/menu/common/llib-lmenu b/usr/src/lib/libeti/menu/common/llib-lmenu deleted file mode 100644 index 09d11fe79e..0000000000 --- a/usr/src/lib/libeti/menu/common/llib-lmenu +++ /dev/null @@ -1,104 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ - - -/* - * Copyright (c) 1997, by Sun Microsystems, Inc. - * All rights reserved. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/*LINTLIBRARY*/ -#include "menu.h" - -WINDOW *win; -MENU *menu; -ITEM **items; -ITEM *item; - -ITEM **menu_items(MENU *m) {return items;} -ITEM *current_item(MENU *m) {return (ITEM *)0;} -ITEM *new_item(char *n, char *d) {return item;} -MENU *new_menu(ITEM **i) {return menu;} -OPTIONS item_opts(ITEM *i) {return O_SELECTABLE;} -OPTIONS menu_opts(MENU *m) {return O_ONEVALUE;} -PTF_void item_init(MENU *m) {return (PTF_void)0;} -PTF_void item_term(MENU *m) {return (PTF_void)0;} -PTF_void menu_init(MENU *m) {return (PTF_void)0;} -PTF_void menu_term(MENU *m) {return (PTF_void)0;} -WINDOW *menu_sub(MENU *m) {return win;} -WINDOW *menu_win(MENU *m) {return win;} - -char *item_description(ITEM *i) {return "description";} -char *item_name(ITEM *i) {return "name";} -char *item_userptr(ITEM *i) {return "item_userptr";} -char *menu_mark(MENU *m) {return "-";} -char *menu_pattern(MENU *m) {return "pattern";} -char *menu_userptr(MENU *m) {return "menu_userptr";} - -chtype menu_back(MENU *m) {return A_NORMAL;} -chtype menu_fore(MENU *m) {return A_NORMAL;} -chtype menu_grey(MENU *m) {return A_NORMAL;} - -void menu_format(MENU *m, int *r, int *c) {} - -int free_item(ITEM *i) {return E_OK;} -int free_menu(MENU *m) {return E_OK;} -int item_count(MENU *m) {return 0;} -int item_index(ITEM *i) {return 0;} -int item_opts_off(ITEM *i, OPTIONS o) {return 0;} -int item_opts_on(ITEM *i, OPTIONS o) {return 0;} -int item_value(ITEM *i) {return 0;} -int item_visible(ITEM *i) {return TRUE;} -int menu_driver(MENU *m, int c) {return E_OK;} -int menu_opts_off(MENU *m, OPTIONS o) {return 0;} -int menu_opts_on(MENU *m, OPTIONS o) {return 0;} -int menu_pad(MENU *m) {return ' ';} -int pos_menu_cursor(MENU *m) {return E_OK;} -int post_menu(MENU *m) {return E_OK;} -int scale_menu(MENU *m, int *r, int *c) {return E_OK;} -int set_current_item(MENU *m, ITEM *i) {return E_OK;} -int set_item_init(MENU *m, PTF_void f) {return E_OK;} -int set_item_opts(ITEM *i, OPTIONS o) {return E_OK;} -int set_item_term(MENU *m, PTF_void f) {return E_OK;} -int set_item_userptr(ITEM *i, char *u) {return E_OK;} -int set_item_value(ITEM *i, int v) {return E_OK;} -int set_menu_back(MENU *m, chtype a) {return E_OK;} -int set_menu_fore(MENU *m, chtype a) {return E_OK;} -int set_menu_format(MENU *m, int r, int c) {return E_OK;} -int set_menu_grey(MENU *m, chtype a) {return E_OK;} -int set_menu_init(MENU *m, PTF_void f) {return E_OK;} -int set_menu_items(MENU *m, ITEM **i) {return E_OK;} -int set_menu_mark(MENU *m, char *s) {return E_OK;} -int set_menu_opts(MENU *m, OPTIONS o) {return E_OK;} -int set_menu_pad(MENU *m, int i) {return E_OK;} -int set_menu_pattern(MENU *m, char *p) {return E_OK;} -int set_menu_sub(MENU *m, WINDOW *w) {return E_OK;} -int set_menu_term(MENU *m, PTF_void f) {return E_OK;} -int set_menu_userptr(MENU *m, char *u) {return E_OK;} -int set_menu_win(MENU *m, WINDOW *w) {return E_OK;} -int set_top_row(MENU *m, int i) {return E_OK;} -int top_row(MENU *m) {return 0;} -int unpost_menu(MENU *m) {return E_OK;} diff --git a/usr/src/lib/libeti/panel/common/llib-lpanel b/usr/src/lib/libeti/panel/common/llib-lpanel deleted file mode 100644 index b2bb304185..0000000000 --- a/usr/src/lib/libeti/panel/common/llib-lpanel +++ /dev/null @@ -1,124 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ - - -/* - * Copyright (c) 1997, by Sun Microsystems, Inc. - * All rights reserved. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.5 */ - -/*LINTLIBRARY*/ - -#include <sys/types.h> -#include "panel.h" - -int -bottom_panel(PANEL *panel) -{ - return OK; -} - -int -hide_panel(PANEL *panel) -{ - return OK; -} - -int -del_panel(PANEL *panel) -{ - return OK; -} - -WINDOW -*panel_window(PANEL *panel) -{ - return (WINDOW *) 0; -} - -char -*panel_userptr(PANEL *panel) -{ - return (char *)0; -} - -int -set_panel_userptr(PANEL *panel, char *ptr) -{ - return OK; -} - -PANEL -*panel_above(PANEL *panel) -{ - return (PANEL *) 0; -} - -PANEL -*panel_below(PANEL *panel) -{ - return (PANEL *) 0; -} - -int -panel_hidden(PANEL *panel) -{ - return TRUE; -} - -int -move_panel(PANEL *panel, int starty, int startx) -{ - return OK; -} - -PANEL -*new_panel(WINDOW *window) -{ - return (PANEL *) 0; -} - -int -show_panel(PANEL *panel) -{ - return OK; -} - -int -replace_panel(PANEL *panel, WINDOW *window) -{ - return OK; -} - -int -top_panel(PANEL *panel) -{ - return OK; -} - -void -update_panels(void) -{} diff --git a/usr/src/lib/libexacct/common/llib-lexacct b/usr/src/lib/libexacct/common/llib-lexacct deleted file mode 100644 index 1b5022b8e8..0000000000 --- a/usr/src/lib/libexacct/common/llib-lexacct +++ /dev/null @@ -1,32 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/*LINTLIBRARY*/ -/*PROTOLIB1*/ -/* - * Copyright (c) 1999-2001 by Sun Microsystems, Inc. - * All rights reserved. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <exacct.h> -#include <sys/exacct.h> diff --git a/usr/src/lib/libfakekernel/common/llib-lfakekernel b/usr/src/lib/libfakekernel/common/llib-lfakekernel deleted file mode 100644 index be05b862bd..0000000000 --- a/usr/src/lib/libfakekernel/common/llib-lfakekernel +++ /dev/null @@ -1,20 +0,0 @@ -/* - * This file and its contents are supplied under the terms of the - * Common Development and Distribution License ("CDDL"), version 1.0. - * You may only use this file in accordance with the terms of version - * 1.0 of the CDDL. - * - * A full copy of the text of the CDDL should have accompanied this - * source. A copy of the CDDL is also available via the Internet at - * http://www.illumos.org/license/CDDL. - */ - -/* - * Copyright 2013 Nexenta Systems, Inc. All rights reserved. - */ - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <sys/ksynch.h> -#include <fakekernel.h> diff --git a/usr/src/lib/libfcoe/common/llib-lfcoe b/usr/src/lib/libfcoe/common/llib-lfcoe deleted file mode 100644 index 888c17113e..0000000000 --- a/usr/src/lib/libfcoe/common/llib-lfcoe +++ /dev/null @@ -1,29 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2009 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <libfcoe.h> diff --git a/usr/src/lib/libfdisk/common/llib-lfdisk b/usr/src/lib/libfdisk/common/llib-lfdisk deleted file mode 100644 index ab95e0068d..0000000000 --- a/usr/src/lib/libfdisk/common/llib-lfdisk +++ /dev/null @@ -1,31 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2009 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - * - * usr/src/lib/libfdisk/llib-lfdisk - */ - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <libfdisk.h> diff --git a/usr/src/lib/libficl/Makefile.com b/usr/src/lib/libficl/Makefile.com index d0ac5a8791..65dd141b23 100644 --- a/usr/src/lib/libficl/Makefile.com +++ b/usr/src/lib/libficl/Makefile.com @@ -33,6 +33,8 @@ CSTD= $(CSTD_GNU99) PNGLITE= $(SRC)/common/pnglite CPPFLAGS += -I.. -I$(FICLDIR) -I$(FICLDIR)/emu -D_LARGEFILE64_SOURCE=1 CPPFLAGS += -I$(PNGLITE) +CFLAGS += $(C_BIGPICFLAGS) +CFLAGS64 += $(C_BIGPICFLAGS64) # As variable "count" is marked volatile, gcc 4.4.4 will complain about # function argument. So we switch this warning off diff --git a/usr/src/lib/libficl/llib-lficl-sys b/usr/src/lib/libficl/llib-lficl-sys deleted file mode 100644 index 77d9e45d72..0000000000 --- a/usr/src/lib/libficl/llib-lficl-sys +++ /dev/null @@ -1,20 +0,0 @@ -/* - * This file and its contents are supplied under the terms of the - * Common Development and Distribution License ("CDDL"), version 1.0. - * You may only use this file in accordance with the terms of version - * 1.0 of the CDDL. - * - * A full copy of the text of the CDDL should have accompanied this - * source. A copy of the CDDL is also available via the Internet at - * http://www.illumos.org/license/CDDL. - */ - -/* - * Copyright 2016 Toomas Soome <tsoome@me.com> - */ - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <ficl.h> -#include <ficlplatform/emu.h> diff --git a/usr/src/lib/libfsmgt/common/llib-lfsmgt b/usr/src/lib/libfsmgt/common/llib-lfsmgt deleted file mode 100644 index 2ab61837db..0000000000 --- a/usr/src/lib/libfsmgt/common/llib-lfsmgt +++ /dev/null @@ -1,32 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2003 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include "libfsmgt.h" diff --git a/usr/src/lib/libfstyp/common/llib-lfstyp b/usr/src/lib/libfstyp/common/llib-lfstyp deleted file mode 100644 index 05da2eb1cd..0000000000 --- a/usr/src/lib/libfstyp/common/llib-lfstyp +++ /dev/null @@ -1,30 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <libfstyp.h> diff --git a/usr/src/lib/libgen/common/llib-lgen b/usr/src/lib/libgen/common/llib-lgen deleted file mode 100644 index ca93477826..0000000000 --- a/usr/src/lib/libgen/common/llib-lgen +++ /dev/null @@ -1,42 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <libgen.h> -#undef _REENTRANT -#include <regexpr.h> /* get the static variable definitions */ -#define _REENTRANT -#include <regexpr.h> /* now the dynamic variable definitions */ - -/* - * This a private function for ex/vi only. - * It is not an alias for 'compile'. - */ -char *_compile(const char *, char *, char *, int); diff --git a/usr/src/lib/libgrubmgmt/common/llib-lgrubmgmt b/usr/src/lib/libgrubmgmt/common/llib-lgrubmgmt deleted file mode 100644 index f3640f843b..0000000000 --- a/usr/src/lib/libgrubmgmt/common/llib-lgrubmgmt +++ /dev/null @@ -1,29 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2009 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include "libgrubmgmt.h" diff --git a/usr/src/lib/libgss/llib-lgss b/usr/src/lib/libgss/llib-lgss deleted file mode 100644 index b1756bb31a..0000000000 --- a/usr/src/lib/libgss/llib-lgss +++ /dev/null @@ -1,32 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <gssapi/gssapi.h> diff --git a/usr/src/lib/libhotplug/common/llib-lhotplug b/usr/src/lib/libhotplug/common/llib-lhotplug deleted file mode 100644 index 6773e83b80..0000000000 --- a/usr/src/lib/libhotplug/common/llib-lhotplug +++ /dev/null @@ -1,29 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2009 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <libhotplug.h> diff --git a/usr/src/lib/libidmap/common/llib-lidmap b/usr/src/lib/libidmap/common/llib-lidmap deleted file mode 100644 index 4bb2bee5c4..0000000000 --- a/usr/src/lib/libidmap/common/llib-lidmap +++ /dev/null @@ -1,34 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. - */ - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include "idmap.h" -#include "idmap_priv.h" -#include "directory.h" -#include "directory_private.h" -#include "sized_array.h" -#include "directory_library_impl.h" -#include "sidutil.h" diff --git a/usr/src/lib/libilb/common/llib-lilb b/usr/src/lib/libilb/common/llib-lilb deleted file mode 100644 index a57ef8dd3e..0000000000 --- a/usr/src/lib/libilb/common/llib-lilb +++ /dev/null @@ -1,29 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2009 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <libilb.h> diff --git a/usr/src/lib/libima/common/llib-lima b/usr/src/lib/libima/common/llib-lima deleted file mode 100644 index c7cdc84a3d..0000000000 --- a/usr/src/lib/libima/common/llib-lima +++ /dev/null @@ -1,30 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2009 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <ima.h> -#include <libsun_ima.h> diff --git a/usr/src/lib/libinetsvc/common/llib-linetsvc b/usr/src/lib/libinetsvc/common/llib-linetsvc deleted file mode 100644 index b49e541f7b..0000000000 --- a/usr/src/lib/libinetsvc/common/llib-linetsvc +++ /dev/null @@ -1,31 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <inetsvc.h> diff --git a/usr/src/lib/libinetutil/common/llib-linetutil b/usr/src/lib/libinetutil/common/llib-linetutil deleted file mode 100644 index 03504ac752..0000000000 --- a/usr/src/lib/libinetutil/common/llib-linetutil +++ /dev/null @@ -1,29 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2009 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <libinetutil.h> diff --git a/usr/src/lib/libinstzones/common/llib-linstzones b/usr/src/lib/libinstzones/common/llib-linstzones deleted file mode 100644 index 62e629c562..0000000000 --- a/usr/src/lib/libinstzones/common/llib-linstzones +++ /dev/null @@ -1,31 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright 2009 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <instzones_api.h> diff --git a/usr/src/lib/libintl/common/llib-lintl b/usr/src/lib/libintl/common/llib-lintl deleted file mode 100644 index 877cbc2290..0000000000 --- a/usr/src/lib/libintl/common/llib-lintl +++ /dev/null @@ -1,37 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright (c) 1997 by Sun Microsystems, Inc. - * All rights reserved. - */ -#pragma ident "%Z%%M% %I% %E% SMI" - -/* - * usr/src/lib/libintl - * EMPTY library - */ - -#include <libintl.h> -#include <locale.h> diff --git a/usr/src/lib/libipadm/common/llib-lipadm b/usr/src/lib/libipadm/common/llib-lipadm deleted file mode 100644 index 4553567250..0000000000 --- a/usr/src/lib/libipadm/common/llib-lipadm +++ /dev/null @@ -1,35 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2010 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <libipadm.h> -/* - * functions private to libipadm and ipmgmtd/in.ndpd are prototyped - * in the files below - */ -#include <ipadm_ipmgmt.h> -#include <ipadm_ndpd.h> diff --git a/usr/src/lib/libipd/common/llib-lipd b/usr/src/lib/libipd/common/llib-lipd deleted file mode 100644 index 79a3521301..0000000000 --- a/usr/src/lib/libipd/common/llib-lipd +++ /dev/null @@ -1,20 +0,0 @@ -/* - * This file and its contents are supplied under the terms of the - * Common Development and Distribution License ("CDDL"), version 1.0. - * You may only use this file in accordance with the terms of version - * 1.0 of the CDDL. - * - * A full copy of the text of the CDDL should have accompanied this - * source. A copy of the CDDL is also available via the Internet at - * http://www.illumos.org/license/CDDL. - */ - -/* - * Copyright (c) 2012 Joyent, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <libipd.h> diff --git a/usr/src/lib/libipmi/common/llib-lipmi b/usr/src/lib/libipmi/common/llib-lipmi deleted file mode 100644 index fc27f40c95..0000000000 --- a/usr/src/lib/libipmi/common/llib-lipmi +++ /dev/null @@ -1,31 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <libipmi.h> diff --git a/usr/src/lib/libipmp/common/llib-lipmp b/usr/src/lib/libipmp/common/llib-lipmp deleted file mode 100644 index a22eec5d66..0000000000 --- a/usr/src/lib/libipmp/common/llib-lipmp +++ /dev/null @@ -1,32 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2009 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <ipmp.h> -#include <ipmp_admin.h> -#include <ipmp_mpathd.h> -#include <ipmp_query_impl.h> diff --git a/usr/src/lib/libipp/llib-lipp b/usr/src/lib/libipp/llib-lipp deleted file mode 100644 index d6924e8ade..0000000000 --- a/usr/src/lib/libipp/llib-lipp +++ /dev/null @@ -1,34 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2001-2002 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - * - * usr/src/lib/libipp/llib-lipp - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <libipp.h> diff --git a/usr/src/lib/libipsecutil/common/llib-lipsecutil b/usr/src/lib/libipsecutil/common/llib-lipsecutil deleted file mode 100644 index c09cb88c65..0000000000 --- a/usr/src/lib/libipsecutil/common/llib-lipsecutil +++ /dev/null @@ -1,32 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2003 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <ipsec_util.h> diff --git a/usr/src/lib/libiscsit/common/llib-liscsit b/usr/src/lib/libiscsit/common/llib-liscsit deleted file mode 100644 index 8d9fc33604..0000000000 --- a/usr/src/lib/libiscsit/common/llib-liscsit +++ /dev/null @@ -1,30 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <libiscsit.h> -#include <sys/iscsit/iscsit_common.h> diff --git a/usr/src/lib/libkmf/ber_der/common/llib-lkmfberder b/usr/src/lib/libkmf/ber_der/common/llib-lkmfberder deleted file mode 100644 index 44d4dec3b5..0000000000 --- a/usr/src/lib/libkmf/ber_der/common/llib-lkmfberder +++ /dev/null @@ -1,31 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <ber_der.h> diff --git a/usr/src/lib/libkmf/libkmf/common/llib-lkmf b/usr/src/lib/libkmf/libkmf/common/llib-lkmf deleted file mode 100644 index 355ed9bb21..0000000000 --- a/usr/src/lib/libkmf/libkmf/common/llib-lkmf +++ /dev/null @@ -1,32 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ -/* PROTOLIB1 */ -#include <kmfapi.h> -#include <kmfpolicy.h> -#include <kmfapiP.h> diff --git a/usr/src/lib/libkstat/common/llib-lkstat b/usr/src/lib/libkstat/common/llib-lkstat deleted file mode 100644 index 499f04e48b..0000000000 --- a/usr/src/lib/libkstat/common/llib-lkstat +++ /dev/null @@ -1,46 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright (c) 1997 by Sun Microsystems, Inc. - * All rights reserved. - */ -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <stdlib.h> -#include <stdio.h> -#include <kstat.h> - -/* - * usr/src/lib/libkstat - */ - -/* kstat.c */ -kstat_ctl_t *kstat_open(void); -int kstat_close(kstat_ctl_t *); -kid_t kstat_read(kstat_ctl_t *, kstat_t *, void *); -kid_t kstat_write(kstat_ctl_t *, kstat_t *, void *); -kid_t kstat_chain_update(kstat_ctl_t *); -kstat_t *kstat_lookup(kstat_ctl_t *, char *, int, char *); -void *kstat_data_lookup(kstat_t *, char *); diff --git a/usr/src/lib/libkvm/common/llib-lkvm b/usr/src/lib/libkvm/common/llib-lkvm deleted file mode 100644 index 9c04b1c6eb..0000000000 --- a/usr/src/lib/libkvm/common/llib-lkvm +++ /dev/null @@ -1,56 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright (c) 1997-1998 by Sun Microsystems, Inc. - * All rights reserved. - */ -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <stdlib.h> -#include <stdio.h> -#include <fcntl.h> -#include <sys/proc.h> -#include <sys/user.h> -#include <kvm.h> - -kvm_t *kvm_open(const char *, const char *, const char *, int, const char *); -int kvm_close(kvm_t *); -int kvm_nlist(kvm_t *, struct nlist []); -ssize_t kvm_read(kvm_t *, uintptr_t, void *, size_t); -ssize_t kvm_kread(kvm_t *, uintptr_t, void *, size_t); -ssize_t kvm_uread(kvm_t *, uintptr_t, void *, size_t); -ssize_t kvm_aread(kvm_t *, uintptr_t, void *, size_t, struct as *); -ssize_t kvm_pread(kvm_t *, uint64_t, void *, size_t); -ssize_t kvm_write(kvm_t *, uintptr_t, const void *, size_t); -ssize_t kvm_kwrite(kvm_t *, uintptr_t, const void *, size_t); -ssize_t kvm_uwrite(kvm_t *, uintptr_t, const void *, size_t); -ssize_t kvm_awrite(kvm_t *, uintptr_t, const void *, size_t, struct as *); -ssize_t kvm_pwrite(kvm_t *, uint64_t, const void *, size_t); -uint64_t kvm_physaddr(kvm_t *, struct as *, uintptr_t); -proc_t *kvm_getproc(kvm_t *, pid_t); -proc_t *kvm_nextproc(kvm_t *); -int kvm_setproc(kvm_t *); -user_t *kvm_getu(kvm_t *, struct proc *); -int kvm_getcmd(kvm_t *, proc_t *, user_t *, char ***, char ***); diff --git a/usr/src/lib/libldap5/sources/ldap/common/llib-lldap b/usr/src/lib/libldap5/sources/ldap/common/llib-lldap deleted file mode 100644 index 9ce0512704..0000000000 --- a/usr/src/lib/libldap5/sources/ldap/common/llib-lldap +++ /dev/null @@ -1,530 +0,0 @@ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright 2001, 2003 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <stdio.h> -#include <sys/types.h> -#include <lber.h> -#include <ldap.h> - - -/* - * in abandon.c: - */ -int ldap_abandon_ext(LDAP *ld, int msgid, LDAPControl **serverctrls, LDAPControl ** clientctrls); - -int ldap_abandon( LDAP *ld, int msgid ); - -/* - * in add.c: - */ -int ldap_add_ext( LDAP *ld, const char *dn, LDAPMod **attrs, LDAPControl ** serverctrls, LDAPControl **clientctrls, int *msgidp); - -int ldap_add_ext_s( LDAP *ld, const char *dn, LDAPMod **attrs, LDAPControl ** serverctrls, LDAPControl **clientctrls); - -int ldap_add( LDAP *ld, const char *dn, LDAPMod **attrs ); -int ldap_add_s( LDAP *ld, const char *dn, LDAPMod **attrs ); - -/* - * in bind.c: - */ -int ldap_bind(LDAP *ld, const char *dn, const char *passwd, int authmethod); -int ldap_bind_s(LDAP *ld, const char *dn, const char *passwd, int authmethod); -void ldap_set_rebind_proc(LDAP *ld, LDAP_REBINDPROC_CALLBACK *rebindproc, void *arg); - -/* - * in sbind.c: - */ -int ldap_simple_bind( LDAP *ld, const char *dn, const char *passwd ); -int ldap_simple_bind_s( LDAP *ld, const char *dn, const char *passwd ); - -/* - * in saslbind.c: - */ -int ldap_sasl_bind(LDAP *ld, const char *dn, const char *mechanism, const struct berval *cred, LDAPControl **serverctrls, LDAPControl **clientctrls, int *msgidp); - -int ldap_sasl_bind_s(LDAP *ld, const char *dn, const char *mechanism, const struct berval *cred, LDAPControl **serverctrls, LDAPControl **clientctrls, struct berval **servercredp); - -/* - * in kbind.c: - */ - -/* - * in cache.c - */ - -/* - * in compare.c: - */ -int ldap_compare_ext(LDAP *ld, const char *dn, const char *attr, const struct berval *bvalue, LDAPControl ** serverctrls, LDAPControl **clientctrls, int *msgidp); - -int ldap_compare_ext_s(LDAP *ld, const char *dn, const char *attr, const struct berval *bvalue, LDAPControl ** serverctrls, LDAPControl **clientctrls) ; - -int ldap_compare( LDAP *ld, const char *dn, const char *attr, const char *value ); - -int ldap_compare_s( LDAP *ld, const char *dn, const char *attr, const char *value ); - -/* - * in delete.c: - */ -int ldap_delete_ext(LDAP *ld, const char *dn, LDAPControl **serverctrls, LDAPControl **clientctrls, int *msgidp); - -int ldap_delete_ext_s(LDAP *ld, const char *dn, LDAPControl **serverctrls, LDAPControl **clientctrls); - -int ldap_delete( LDAP *ld, const char *dn ); -int ldap_delete_s( LDAP *ld, const char *dn ); - -/* - * in error.c: - */ -char *ldap_err2string( int err ); -void ldap_perror(LDAP *ld, const char *s); -int ldap_result2error(LDAP *ld, LDAPMessage *r, int freeit); -int ldap_get_lderrno(LDAP *ld, char **m, char **s); -int ldap_set_lderrno(LDAP *ld, int e, char *m, char *s); - -/* - * in modify.c: - */ -int ldap_modify_ext(LDAP *ld, const char *dn, LDAPMod **mods, LDAPControl **serverctrls, LDAPControl **clientctrls, int *msgidp); - -int ldap_modify_ext_s(LDAP *ld, const char *dn, LDAPMod **mods, LDAPControl **serverctrls, LDAPControl **clientctrls) ; - -int ldap_modify( LDAP *ld, const char *dn, LDAPMod **mods ); -int ldtap_modify_s( LDAP *ld, const char *dn, LDAPMod **mods ); - -/* - * in modrdn.c: - */ - -/* - * in rename.c: - */ -int ldap_rename(LDAP *ld, const char *dn, const char *newrdn, const char *newparent, int deleteoldrdn, LDAPControl ** serverctrls, LDAPControl **clientctrls, int *msgidp); - -int ldap_rename_s(LDAP *ld, const char *dn, const char *newrdn, const char *newparent, int deleteoldrdn, LDAPControl ** serverctrls, LDAPControl **clientctrls); - -int ldap_modrdn(LDAP *ld, const char *dn, const char *newrdn); -int ldap_modrdn_s(LDAP *ld, const char *dn, const char *newrdn); -int ldap_modrdn2(LDAP *ld, const char *dn, const char *newrdn, int deleteoldrdn); - -int ldap_modrdn2_s(LDAP *ld, const char *dn, const char *newrdn, int deleteoldrdn); - -/* - * in open.c: - */ -LDAP *ldap_init( const char *defhost, int defport ); -LDAP *ldap_open(const char *host, int port); -int ldap_version(LDAPVersion *ver); - -/* - * in getentry.c: - */ -LDAPMessage *ldap_first_entry( LDAP *ld, LDAPMessage *res ); -LDAPMessage *ldap_next_entry( LDAP *ld, LDAPMessage *entry ); -int ldap_count_entries( LDAP *ld, LDAPMessage *res ); -int ldap_get_entry_controls(LDAP *ld, LDAPMessage *entry, LDAPControl ***serverctrlsp); - -/* - * in getmsg.c: - */ -LDAPMessage *ldap_first_message( LDAP *ld, LDAPMessage *res ); -LDAPMessage *ldap_next_message( LDAP *ld, LDAPMessage *msg ); -int ldap_count_messages( LDAP *ld, LDAPMessage *res ); - -/* - * in getref.c: - */ -LDAPMessage *ldap_first_reference( LDAP *ld, LDAPMessage *res ); -LDAPMessage *ldap_next_reference( LDAP *ld, LDAPMessage *entry ); -int ldap_count_references( LDAP *ld, LDAPMessage *res ); - -/* - * in getdn.c - */ -char *ldap_get_dn( LDAP *ld, LDAPMessage *entry ); -char **ldap_explode_dn( const char *dn, const int notypes ); -char ** ldap_explode_rdn( const char *rdn, const int notypes ); -char *ldap_dn2ufn( const char *dn ); -char **ldap_explode_dns( const char *dn ); -int ldap_is_dns_dn( const char *dn ); -char *ldap_dns_to_dn(char *dns_name, int *nameparts); - -/* - * in getattr.c - */ -char *ldap_first_attribute( LDAP *ld, LDAPMessage *entry, - BerElement **ber ); - -char *ldap_next_attribute( LDAP *ld, LDAPMessage *entry, - BerElement *ber ); - -void ldap_memfree(void *p); - -/* - * in getvalues.c - */ -char **ldap_get_values( LDAP *ld, LDAPMessage *entry, const char *target ); -int ldap_count_values( char **vals ); -int ldap_count_values_len( struct berval **vals ); -void ldap_value_free( char **vals ); -void ldap_value_free_len( struct berval **vals ); - -struct berval **ldap_get_values_len(LDAP *ld, LDAPMessage *entry, const char *target); - -char **ldap_get_lang_values(LDAP *ld, LDAPMessage *entry, const char *target, char **type); - -struct berval **ldap_get_lang_values_len(LDAP *ld, LDAPMessage *entry, const char *target, char **type); - -/* - * in referral.c: - */ -int ldap_parse_reference(LDAP *ld, LDAPMessage *ref, - char ***referralsp, LDAPControl ***serverctrlsp, int freeit); -char ** ldap_get_reference_urls(LDAP *ld, LDAPMessage *res); - -/* - * in result.c: - */ -int ldap_result( LDAP *ld, int msgid, int all, - struct timeval *timeout, LDAPMessage **result ); - -int ldap_msgfree( LDAPMessage *lm ); -int ldap_msgtype( LDAPMessage *res ); -int ldap_msgid( LDAPMessage *res ); -int ldap_parse_result(LDAP *ld, LDAPMessage *res, int *errcodep, char **matcheddnp, char **errmsgp, char ***referralsp, LDAPControl ***serverctrlsp, int freeit) ; - -int ldap_parse_sasl_bind_result(LDAP *ld, LDAPMessage *res, struct berval **servercredp, int freeit); - -int ldap_parse_extended_result(LDAP *ld, LDAPMessage *res, char **resultoidp, struct berval **resultdata, int freeit); - -/* - * in search.c: - */ -int ldap_search_ext(LDAP *ld, const char *base, int scope, const char *filter, char **attrs, int attrsonly, LDAPControl **serverctrls, LDAPControl **clientctrls, struct timeval *timeoutp, int sizelimit, int *msgidp); - -int ldap_search_ext_s(LDAP *ld, const char *base, int scope, const char *filter, char **attrs, int attrsonly, LDAPControl **serverctrls, LDAPControl **clientctrls, struct timeval *timeoutp, int sizelimit, LDAPMessage **res); - -int ldap_search( LDAP *ld, const char *base, int scope, const char *filter, - char **attrs, int attrsonly ); - -int ldap_search_s( LDAP *ld, const char *base, int scope, const char *filter, - char **attrs, int attrsonly, LDAPMessage **res ); - -int ldap_search_st( LDAP *ld, const char *base, int scope, const char *filter, - char **attrs, int attrsonly, struct timeval *timeout, LDAPMessage **res ); - -/* - * in ufn.c - */ -int ldap_ufn_search_c( LDAP *ld, char *ufn, char **attrs, - int attrsonly, LDAPMessage **res, LDAP_CANCELPROC_CALLBACK cancelproc, - void *cancelparm ); - -int ldap_ufn_search_ct( LDAP *ld, char *ufn, char **attrs, - int attrsonly, LDAPMessage **res, LDAP_CANCELPROC_CALLBACK cancelproc, - void *cancelparm, char *tag1, char *tag2, char *tag3 ); - -int ldap_ufn_search_s( LDAP *ld, char *ufn, char **attrs, - int attrsonly, LDAPMessage **res ); - -LDAPFiltDesc *ldap_ufn_setfilter( LDAP *ld, char *fname ); -void ldap_ufn_setprefix( LDAP *ld, char *prefix ); -int ldap_ufn_timeout( void *tvparam ); - - -/* - * in unbind.c - */ -int ldap_unbind( LDAP *ld ); -int ldap_unbind_s( LDAP *ld ); -int ldap_unbind_ext(LDAP *ld, LDAPControl **serverctrls, LDAPControl **clientctrls); - - -/* - * in getfilter.c - */ -LDAPFiltDesc *ldap_init_getfilter( char *fname ); -LDAPFiltDesc *ldap_init_getfilter_buf( char *buf, ssize_t buflen ); -LDAPFiltInfo *ldap_getfirstfilter( LDAPFiltDesc *lfdp, char *tagpat, - char *value ); - -LDAPFiltInfo *ldap_getnextfilter( LDAPFiltDesc *lfdp ); -void ldap_setfilteraffixes( LDAPFiltDesc *lfdp, char *prefix, char *suffix ); -void ldap_build_filter( char *filtbuf, size_t buflen, - char *pattern, char *prefix, char *suffix, char *attr, - char *value, char **valwords ); - -int ldap_create_filter(char *buf, unsigned long buflen, char *pattern, char *prefix, char *suffix, char *attr, char *value, char **valwords); - -/* - * in free.c - */ -void ldap_getfilter_free( LDAPFiltDesc *lfdp ); -void ldap_mods_free( LDAPMod **mods, int freemods ); -void ldap_ber_free(BerElement *ber, int freebuf); - -/* - * in friendly.c - */ -char *ldap_friendly_name( char *filename, char *uname, - FriendlyMap *map ); - -void ldap_free_friendlymap( FriendlyMap *map ); - - -/* - * in cldap.c - */ - - -/* - * in sort.c - */ -int ldap_sort_entries( LDAP *ld, LDAPMessage **chain, char *attr, - int (*cmp)() ); - -int ldap_sort_values( LDAP *ld, char **vals, int (*cmp)() ); -int ldap_sort_strcasecmp( const char **a, const char **b ); -int ldap_multisort_entries(LDAP *ld, LDAPMessage **chain, char **attr, LDAP_CMP_CALLBACK *cmp); - - -/* - * in url.c - */ -int ldap_is_ldap_url( const char *url ); -int ldap_url_parse( const char *url, LDAPURLDesc **ludpp ); -int ldap_url_parse_nodn(const char *url, LDAPURLDesc **ludpp); -void ldap_free_urldesc( LDAPURLDesc *ludp ); -int ldap_url_search( LDAP *ld, const char *url, int attrsonly ); -int ldap_url_search_s( LDAP *ld, const char *url, int attrsonly, - LDAPMessage **res ); - -int ldap_url_search_st( LDAP *ld, const char *url, int attrsonly, - struct timeval *timeout, LDAPMessage **res ); - -char *ldap_dns_to_url(LDAP *ld, char *dns_name, char *attrs, -char *scope, char *filter); -char *ldap_dn_to_url(LDAP *ld, char *dn, int nameparts); - - -/* - * in charset.c - */ -void ldap_set_string_translators( LDAP *ld, - BERTranslateProc encode_proc, BERTranslateProc decode_proc ); - -int ldap_translate_from_t61( LDAP *ld, char **bufp, - unsigned int *lenp, int free_input ); - -int ldap_translate_to_t61( LDAP *ld, char **bufp, - unsigned int *lenp, int free_input ); - -void ldap_enable_translation( LDAP *ld, LDAPMessage *entry, - int enable ); - -int ldap_t61_to_8859(char **bufp, unsigned long *buflenp, - int free_input); - -int ldap_8859_to_t61(char **bufp, unsigned long *buflenp, - int free_input); - - -/* - * in io.c - */ -BerElement *ber_alloc_t(int options); -int ber_flatten(BerElement *ber, struct berval **bvPtr); -void ber_free(BerElement *ber, int freebuf); -BerElement *ber_alloc(void); -BerElement *ber_init(const struct berval *bv); - -/* - * in decode.c - */ -struct berval *ber_bvdup(const struct berval *bv); -void ber_bvecfree(struct berval **bv); -void ber_bvfree(struct berval *bv); -ber_tag_t ber_first_element(BerElement *ber, unsigned int *len, char **last); -ber_tag_t ber_next_element(BerElement *ber, ber_tag_t *len, char *last); -ber_tag_t ber_peek_tag(BerElement *ber, ber_tag_t *len); -ber_tag_t ber_scanf(BerElement *ber, const char *fmt, ...); -ber_tag_t ber_skip_tag(BerElement *ber, ber_tag_t *len); -ber_tag_t ber_get_int(BerElement *ber, ber_int_t *num); - -/* - * in encode.c - */ -int ber_printf(BerElement *ber, const char *fmt, ...); - -/* - * in control.c - */ -void ldap_control_free (LDAPControl *ctrl); -void ldap_controls_free (LDAPControl **ctrls); - -/* - * in spagectrl.c - */ -int ldap_create_page_control(LDAP *ld, unsigned int pagesize, struct berval *cookie, char isCritical, LDAPControl **output); - -int ldap_parse_page_control(LDAP *ld, LDAPControl **controls, unsigned int *totalcount, struct berval **cookie); - -/* - * in tmplout.c - */ -int ldap_entry2html(LDAP *ld, char *buf, LDAPMessage *entry, struct ldap_disptmpl *tmpl, char **defattrs, char ***defvals, writeptype writeproc, void *writeparm, char *eol, int rdncount, unsigned long opts, char *urlprefix, char *base); - -int ldap_entry2html_search(LDAP *ld, char *dn, char *base, LDAPMessage *entry, struct ldap_disptmpl*tmpllist, char **defattrs, char ***defvals, writeptype writeproc, void *writeparm, char *eol,int rdncount, unsigned long opts, char *urlprefix); - -int ldap_entry2text(LDAP *ld, char *buf, LDAPMessage *entry, struct ldap_disptmpl *tmpl, char **defattrs, char ***defvals, writeptype writeproc, void *writeparm, char *eol, int rdncount, unsigned long opts); - -int ldap_entry2text_search(LDAP *ld,char *dn, char *base, LDAPMessage *entry, struct ldap_disptmpl*tmpllist, char **defattrs, char ***defvals, writeptype writeproc, void *writeparm, char *eol,int rdncount, unsigned long opts); - -int ldap_vals2html(LDAP *ld, char *buf, char **vals, char *label, int labelwidth, unsigned long syntaxid, writeptype writeproc, void *writeparm, char *eol, int rdncount, char *urlprefix); - -int ldap_vals2text(LDAP *ld, char *buf, char **vals, char *label, int labelwidth, unsigned long syntaxid, writeptype writeproc, void *writeparm, char *eol, int rdncount); - -/* - * in extendop.c - */ -int ldap_extended_operation(LDAP *ld, const char *requestoid, const struct berval *requestdata, LDAPControl **serverctrls, LDAPControl**clientctrls, int *msgidp); - -int ldap_extended_operation_s(LDAP *ld, const char *requestoid, const struct berval *requestdata, LDAPControl **serverctrls, LDAPControl **clientctrls, char **retoidp, struct berval **retdatap); - -/* - * in disptmpl.c - */ -struct ldap_disptmpl *ldap_first_disptmpl(struct ldap_disptmpl *tmpllist); -struct ldap_tmplitem *ldap_first_tmplcol(struct ldap_disptmpl *tmpl,struct ldap_tmplitem *row); - -struct ldap_tmplitem *ldap_first_tmplrow(struct ldap_disptmpl *tmpl); -void ldap_free_templates(struct ldap_disptmpl *tmpllist); -int ldap_init_templates(char *file, struct ldap_disptmpl **tmpllistp); - -int ldap_init_templates_buf(char *buf, long buflen, struct ldap_disptmpl **tmpllistp); - -struct ldap_disptmpl *ldap_next_disptmpl(struct ldap_disptmpl *tmpllist, struct ldap_disptmpl *tmpl); - -struct ldap_tmplitem *ldap_next_tmplcol(struct ldap_disptmpl *tmpl, struct ldap_tmplitem *row, struct ldap_tmplitem *col); - -struct ldap_tmplitem *ldap_next_tmplrow(struct ldap_disptmpl *tmpl, struct ldap_tmplitem *row); - -struct ldap_disptmpl *ldap_oc2template(char **oclist, struct ldap_disptmpl *tmpllist); - -char **ldap_tmplattrs(struct ldap_disptmpl *tmpl, char **includeattrs, int exclude, unsigned long syntaxmask); - -struct ldap_disptmpl *ldap_name2template(char *name, struct ldap_disptmpl *tmpllist); - -/* - * in cram_md5.c - */ -int ldap_sasl_cram_md5_bind_s(LDAP *ld, char *dn, struct berval *cred, LDAPControl **serverctrls, LDAPControl **clientctrls); - -/* - * in setoption.c - */ -int ldap_set_option (LDAP *ld, int option, const void *optdata); - -/* - * in log.c - */ -void ldaplogconfigf(FILE *fd); - -/* - * in line64.c - */ -char *ldif_type_and_value(char *type, char *val, int vlen); -char *str_getline(char **next); -int str_parse_line(char *line, char **type, char **value, int *vlen); - -/* - * in sortctrl.c - */ -int ldap_create_sort_control (LDAP *ld, LDAPsortkey **sortKeyList, const char ctl_iscritical, LDAPControl **ctrlp); - -int ldap_parse_sort_control(LDAP *ld, LDAPControl **ctrlp, unsigned long *result, char **attribute); - -int ldap_create_sort_keylist(LDAPsortkey ***sortKeyList, const char *string_rep); - -void ldap_free_sort_keylist(LDAPsortkey **sortKeyList); - -/* - * in vlistctrl.c - */ -int ldap_create_virtuallist_control(LDAP *ld, LDAPVirtualList *ldvlistp, LDAPControl **ctrlp); - -int ldap_parse_virtuallist_control(LDAP *ld, LDAPControl **ctrls, unsigned long *target_posp, unsigned long *list_sizep, int *errcodep); - -/* - * in ldapsinit.c - */ -LDAP * ldapssl_init( const char *defhost, int defport, int defsecure ); -int ldapssl_install_routines( LDAP *ld ); -int ldapssl_enable_clientauth( LDAP *ld, char *keynickname, char *keypasswd, char *certnickname ); - -/* - * in clientinit.c - */ -int ldapssl_client_init( const char *certdbpath, void *certdbhandle); -int ldapssl_clientauth_init(const char *certdbpath, void *certdbhandle, const int needkeydb, const char *keydbpath, void *keydbhandle); - -int ldapssl_advclientauth_init( const char *certdbpath, void *certdbhandle, const int needkeydb, const char *keydbpath, void *keydbhandle, const int needsecmoddb, const char *secmoddbpath, const int sslstrength ); - -int ldapssl_pkcs_init( const struct ldapssl_pkcs_fns *pfns); - -/* - * in errormap.c - */ -const char * ldapssl_err2string( const int prerrno ); - -/* - * in psearch.c - */ -int ldap_create_persistentsearch_control(LDAP *ld, int changetypes, int changesonly, int return_echg_ctls, char ctl_iscritical, LDAPControl **ctrlp); - -int ldap_parse_entrychange_control(LDAP *ld, LDAPControl **ctrls, int *chgtypep, char **prevdnp, int *chgnumpresentp, ber_int_t *chgnump); - -/* - * in proxyauthctrl.c - */ -int ldap_create_proxyauth_control(LDAP *ld, const char *dn, const char ctl_iscritical, LDAPControl **ctrlp); - -int ldap_create_proxiedauth_control(LDAP *ld, const char *authzid, LDAPControl **ctrlp); - -/* - * in srchpref.c - */ -struct ldap_searchobj *ldap_first_searchobj(struct ldap_searchobj *solist); -void ldap_free_searchprefs(struct ldap_searchobj *solist); -int ldap_init_searchprefs(char *file, struct ldap_searchobj **solistp); -int ldap_init_searchprefs_buf(char *buf, long buflen, struct ldap_searchobj **solistp); - -struct ldap_searchobj *ldap_next_searchobj(struct ldap_searchobj *solist, struct ldap_searchobj *so); - -/* - * in getoption.c - */ -int ldap_get_option (LDAP *ld, int option, void *outvalue); - -/* - * in memcache.c - */ -int ldap_memcache_init(unsigned long ttl, unsigned long size, char **baseDNs, struct ldap_thread_fns *thread_fns, LDAPMemCache **cachep); - -int ldap_memcache_set(LDAP *ld, LDAPMemCache *cache); -int ldap_memcache_get(LDAP *ld, LDAPMemCache **cachep); -void ldap_memcache_flush(LDAPMemCache *cache, char *dn, int scope); -void ldap_memcache_destroy(LDAPMemCache *cache); -void ldap_memcache_update(LDAPMemCache *cache); - -/* - * in digest_md5.c - */ -int ldap_x_sasl_digest_md5_bind_s(LDAP *ld, char *dn, struct berval *cred, LDAPControl **serverctrls, LDAPControl **clientctrls); diff --git a/usr/src/lib/liblgrp/common/llib-llgrp b/usr/src/lib/liblgrp/common/llib-llgrp deleted file mode 100644 index d108f2acd7..0000000000 --- a/usr/src/lib/liblgrp/common/llib-llgrp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright 2003 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <sys/lgrp_user.h> diff --git a/usr/src/lib/libm/common/llib-lm b/usr/src/lib/libm/common/llib-lm deleted file mode 100644 index 6a6613076b..0000000000 --- a/usr/src/lib/libm/common/llib-lm +++ /dev/null @@ -1,47 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2011 Nexenta Systems, Inc. All rights reserved. - */ -/* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#undef __PRAGMA_REDEFINE_EXTNAME -#include <math.h> -#if defined(_STDC_C99) -#undef isnan -extern int isnan(double); -extern int isnand(double); /* LSARC/2003/670 */ -typedef union _h_val { - unsigned long _i[2]; - double _d; -} _h_val; -extern const _h_val __huge_val; -#endif -#include <fenv.h> -#include <complex.h> -#undef clog -extern double complex clog(double complex); diff --git a/usr/src/lib/libmail/common/llib-lmail b/usr/src/lib/libmail/common/llib-lmail deleted file mode 100644 index 5db5e51906..0000000000 --- a/usr/src/lib/libmail/common/llib-lmail +++ /dev/null @@ -1,42 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright (c) 1999, by Sun Microsystems, Inc. - * All rights reserved. - */ -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <stdlib.h> -#include <stdio.h> -#include <maillock.h> - -/* - * usr/src/lib/libmail - */ - -/* maillock.c */ -int maillock(char *, int); -void mailunlock(void); -void touchlock(void); diff --git a/usr/src/lib/libmalloc/common/llib-lmalloc b/usr/src/lib/libmalloc/common/llib-lmalloc deleted file mode 100644 index 9410703ff2..0000000000 --- a/usr/src/lib/libmalloc/common/llib-lmalloc +++ /dev/null @@ -1,36 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <malloc.h> - -void *valloc(size_t size); -void *memalign(size_t alignment, size_t size); -void cfree(void *p, size_t num, size_t size); diff --git a/usr/src/lib/libmapid/common/llib-lmapid b/usr/src/lib/libmapid/common/llib-lmapid deleted file mode 100644 index 4cf9a31082..0000000000 --- a/usr/src/lib/libmapid/common/llib-lmapid +++ /dev/null @@ -1,34 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <nfs/mapid.h> -void mapid_reeval_domain(cb_t *); -int mapid_stdchk_domain(const char *); -char *mapid_derive_domain(void); -char *mapid_get_domain(void); diff --git a/usr/src/lib/libmapmalloc/common/llib-lmapmalloc b/usr/src/lib/libmapmalloc/common/llib-lmapmalloc deleted file mode 100644 index ca5bba911e..0000000000 --- a/usr/src/lib/libmapmalloc/common/llib-lmapmalloc +++ /dev/null @@ -1,34 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <malloc.h> - -void cfree(void *p, size_t num, size_t size); diff --git a/usr/src/lib/libmd/common/llib-lmd b/usr/src/lib/libmd/common/llib-lmd deleted file mode 100644 index 1d61afcff5..0000000000 --- a/usr/src/lib/libmd/common/llib-lmd +++ /dev/null @@ -1,34 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <md5.h> -#include <sha1.h> -#include <sha2.h> -#include <md4.h> diff --git a/usr/src/lib/libmd5/common/llib-lmd5 b/usr/src/lib/libmd5/common/llib-lmd5 deleted file mode 100644 index 0235ae5c81..0000000000 --- a/usr/src/lib/libmd5/common/llib-lmd5 +++ /dev/null @@ -1,31 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <md5.h> diff --git a/usr/src/lib/libmlrpc/common/llib-lmlrpc b/usr/src/lib/libmlrpc/common/llib-lmlrpc deleted file mode 100644 index 3345e6129a..0000000000 --- a/usr/src/lib/libmlrpc/common/llib-lmlrpc +++ /dev/null @@ -1,31 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - * - * Copyright 2013 Nexenta Systems, Inc. All rights reserved. - */ - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <libmlrpc.h> diff --git a/usr/src/lib/libndmp/common/llib-lndmp b/usr/src/lib/libndmp/common/llib-lndmp deleted file mode 100644 index 06e5ee1d02..0000000000 --- a/usr/src/lib/libndmp/common/llib-lndmp +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/* - * BSD 3 Clause License - * - * Copyright (c) 2007, The Storage Networking Industry Association. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * - Neither the name of The Storage Networking Industry Association (SNIA) - * nor the names of its contributors may be used to endorse or promote - * products derived from this software without specific prior written - * permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <libndmp.h> diff --git a/usr/src/lib/libnls/common/llib-lnls b/usr/src/lib/libnls/common/llib-lnls deleted file mode 100644 index 6dc0e03b3a..0000000000 --- a/usr/src/lib/libnls/common/llib-lnls +++ /dev/null @@ -1,34 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright (c) 1997 by Sun Microsystems, Inc. - * All rights reserved. - */ -#pragma ident "%Z%%M% %I% %E% SMI" - - -/* - * usr/src/lib/libnls - */ diff --git a/usr/src/lib/libnsl/common/llib-lnsl b/usr/src/lib/libnsl/common/llib-lnsl deleted file mode 100644 index 8a1fba5b94..0000000000 --- a/usr/src/lib/libnsl/common/llib-lnsl +++ /dev/null @@ -1,1086 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright 2009 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/* - * Copyright 2018 Nexenta Systems, Inc. - */ - - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <sys/types.h> -#include <thread.h> -#include <synch.h> -#include <fcntl.h> -#include <sys/des.h> -#include <des/softdes.h> -#include <des/desdata.h> -#include <rpc/rpc.h> -#include <rpc/key_prot.h> -#include <rpc/des_crypt.h> -#include <rpc/pmap_prot.h> -#include <sys/ioctl.h> -#include <netdir.h> -#include <nss_netdir.h> -#include <nss_dbdefs.h> -#include <sac.h> -#include <netconfig.h> -#include <ndbm.h> -#include <rpcsvc/yp_prot.h> -#include <rpcsvc/ypclnt.h> -#include <rpcsvc/yppasswd.h> -#include <rpcsvc/ypupd.h> -#include <rpcsvc/nis.h> -#include <rpcsvc/nislib.h> -#include <sys/stream.h> -#include <sys/stropts.h> -#include <sys/tihdr.h> -#include <sys/timod.h> -#include <tiuser.h> - - -/* - * Declare t_errno, even though this file is compiled '_REENTRANT'. This - * way t_errno is defined in the lint library, which is used for programs - * compiled with _REENTRANT and those compiled without it. - */ -#ifdef t_errno -#undef t_errno -#endif -extern int t_errno; - -/* - * usr/src/lib/libnsl/common routines - */ - -/* common.c */ - -/* - * usr/src/lib/libnsl/des routines - */ - -/* des_crypt.c */ -int cbc_crypt(char *key, char *buf, size_t len, uint_t mode, char *ivec); -int ecb_crypt(char *key, char *buf, size_t len, uint_t mode); - -/* des_soft.c */ -void des_setparity(char *p); -int __des_crypt(char *buf, unsigned len, struct desparams *desp); - -/* intl_crypt.c */ - -/* intl_soft.c */ -int _des_crypt(char *buf, unsigned len, struct desparams *desp); - -/* - * usr/src/lib/libnsl/dial routines - */ - -/* callers.c */ - -/* conn.c */ - -/* dial.c */ -void undial(int fd); - -/* getargs.c */ - -/* interface.c */ - -/* line.c */ - -/* stoa.c */ - -/* strecpy.c */ - -/* strsave.c */ - -/* sysfiles.c */ - -/* ulockf.c */ - -/* uucpdefs.c */ - -/* - * usr/src/lib/libnsl/key routines - */ - -/* gen_dhkeys.c */ -void __gen_dhkeys(char *public, char *secret, char *pass); - -/* publickey.c */ -int getpublickey(const char *netname, char *pkey); -int __getpublickey_cached(char *netname, char *pkey, int *from_cache); -void __getpublickey_flush(const char *netname); -int getsecretkey(const char *netname, char *skey, const char *passwd); - -/* xcrypt.c */ -int xencrypt(char *secret, char *passwd); -int xdecrypt(char *secret, char *passwd); -int passwd2des(char *pw, char *key); - -/* - * usr/src/lib/libnsl/netdir routines - */ - -/* netdir.c */ -int *__nderror(void); -int netdir_getbyname(struct netconfig *tp, struct nd_hostserv *serv, - struct nd_addrlist **addrs); -int netdir_getbyaddr(struct netconfig *tp, struct nd_hostservlist **serv, - struct netbuf *addr); -int __netdir_getbyaddr_nosrv(struct netconfig *tp, - struct nd_hostservlist **serv, - struct netbuf *addr); -int netdir_options(struct netconfig *tp, int option, int fd, char *par); -struct netbuf *uaddr2taddr(struct netconfig *tp, char *addr); -char *taddr2uaddr(struct netconfig *tp, struct netbuf *addr); -void netdir_free(void *ptr, int type); -char *netdir_sperror(void); -void netdir_perror(char *s); - -/* - * usr/src/lib/libnsl/netselect routines - */ - -/* netselect.c */ -void *setnetconfig(void); -int endnetconfig(void *vdata); -struct netconfig *getnetconfig(void *vdata); -struct netconfig *getnetconfigent(const char *netid); -void freenetconfigent(struct netconfig *netp); -void *setnetpath(void); -int endnetpath(void *vdata); -struct netconfig *getnetpath(void *vdata); -char *nc_sperror(void); -void nc_perror(const char *string); - -/* - * usr/src/lib/libnsl/nis/gen routines - */ - -/* nis_subr.c */ -name_pos nis_dir_cmp(nis_name n1, nis_name n2); -nis_name nis_local_group(void); -nis_name nis_domain_of(char *s); -nis_name nis_leaf_of_r(const nis_name s, char *buf, size_t bufsize); -nis_name nis_leaf_of(char *s); -nis_name nis_name_of(char *s); -nis_name nis_local_directory(void); -nis_name nis_local_host(void); -void nis_destroy_object(nis_object *obj); -nis_object *nis_clone_object(nis_object *obj, nis_object *dest); -nis_object *nis_read_obj(char *f); -int nis_write_obj(char *f, nis_object *o); -void *nis_get_static_storage(struct nis_sdata *bs, u_int el, u_int nel); -/* - * char *nis_old_data(char *s); - * char *nis_data(char *s); - */ - -/* nis_xdr.c */ -bool_t xdr_nis_attr(XDR *xdrs, nis_attr *objp); -bool_t xdr_nis_name(XDR *xdrs, nis_name *objp); -bool_t xdr_endpoint(XDR *xdrs, endpoint *objp); -bool_t xdr_nis_server(XDR *xdrs, nis_server *objp); -bool_t xdr_directory_obj(XDR *xdrs, directory_obj *objp); -bool_t xdr_entry_obj(XDR *xdrs, entry_obj *objp); -bool_t xdr_table_obj(XDR *xdrs, table_obj *objp); -bool_t xdr_objdata(XDR *xdrs, objdata *objp); -bool_t xdr_nis_oid(XDR *xdrs, nis_oid *objp); -bool_t xdr_nis_object(XDR *xdrs, nis_object *objp); -bool_t xdr_nis_object(XDR *xdrs, nis_object *objp); -bool_t xdr_log_entry_t(XDR *xdrs, log_entry_t *objp); -bool_t xdr_log_entry(XDR *xdrs, log_entry *objp); -bool_t xdr_nis_tag(XDR *xdrs, nis_tag *objp); -bool_t xdr_nis_bound_endpoint(XDR *xdrs, nis_bound_endpoint *objp); -bool_t xdr_nis_bound_directory(XDR *xdrs, nis_bound_directory *objp); -bool_t xdr_nis_active_endpoint(XDR *xdrs, nis_active_endpoint *objp); - -/* thr_misc.c */ - -/* - * usr/src/lib/libnsl/nsl routines - */ - -/* _conn_util.c */ - -/* _data2.c */ - -/* _errlst.c */ -int *__t_errno(void); - -/* _utility.c */ - -/* t_accept.c */ -int t_accept(int, int, struct t_call *); - -/* t_alloc.c */ -char *t_alloc(int, int, int); - -/* t_bind.c */ -int t_bind(int, struct t_bind *, struct t_bind *); - -/* t_close.c */ -int t_close(int); - -/* t_connect.c */ -int t_connect(int, struct t_call *, struct t_call *); - -/* t_error.c */ -void t_error(const char *); - -/* t_free.c */ -int t_free(char *, int); - -/* t_getinfo.c */ -int t_getinfo(int, struct t_info *); - -/* t_getname.c */ -int t_getname(int, struct netbuf *, int); - -/* t_getstate.c */ -int t_getstate(int); - -/* t_listen.c */ -int t_listen(int, struct t_call *); - -/* t_look.c */ -int t_look(int); - -/* t_open.c */ -int t_open(const char *, int, struct t_info *); - -/* t_optmgmt.c */ -int t_optmgmt(int, struct t_optmgmt *, struct t_optmgmt *); - -/* t_rcv.c */ -int t_rcv(int, char *, unsigned, int *); - -/* t_rcvconnect.c */ -int t_rcvconnect(int, struct t_call *); - -/* t_rcvdis.c */ -int t_rcvdis(int, struct t_discon *); - -/* t_rcvrel.c */ -int t_rcvrel(int); - -/* t_rcvudata.c */ -int t_rcvudata(int, struct t_unitdata *, int *); - -/* t_rcvuderr.c */ -int t_rcvuderr(int, struct t_uderr *); - -/* t_snd.c */ -int t_snd(int, char *, unsigned, int); - -/* t_snddis */ -int t_snddis(int, struct t_call *); - -/* t_sndrel.c */ -int t_sndrel(int); - -/* t_sndudata.c */ -int t_sndudata(int, struct t_unitdata *); - -/* t_strerror.c */ -char *t_strerror(int); - -/* t_sync.c */ -int t_sync(int); - -/* t_unbind.c */ -int t_unbind(int); - -/* - * struct t_iovec is defined in <xti.h>. But <xti.h> cannot be included - * because inclusion of <xti.h> and <tiuser.h> are mututally exclusive - * and <tiuser.h> is exposed by the inclusion of <rpc/rpc.h>. Needs to - * be seen how to build llib-lnsl.ln from multiple source files to avoid - * this problem. - */ -struct t_iovec { - void *iov_base; - size_t iov_len; -}; - -/* t_sndv.c */ -int t_sndv(int, const struct t_iovec *, unsigned int, int); - -/* t_sndvudata.c */ -int t_sndvudata(int, struct t_unitdata *, struct t_iovec *, unsigned int); - -/* t_sndreldata.c */ -int t_sndreldata(int, struct t_discon *); - -/* t_rcvv.c */ -int t_rcvv(int, struct t_iovec *, unsigned int, int *); - -/* t_rcvvudata.c */ -int t_rcvvudata(int, struct t_unitdata *, struct t_iovec *, - unsigned int, int *); - -/* t_rcvreldata.c */ -extern int t_rcvreldata(int, struct t_discon *); - -/* t_sysconf.c */ -int t_sysconf(int); - -/* xti_wrappers.c */ -int _xti_accept(int, int, struct t_call *); -int _xti_xns5_accept(int, int, struct t_call *); -char *_xti_alloc(int, int, int); -int _xti_bind(int, struct t_bind *, struct t_bind *); -int _xti_close(int); -int _xti_connect(int, struct t_call *, struct t_call *); -int _xti_error(char *); -int _xti_free(char *, int); -int _xti_getinfo(int, struct t_info *); -int _xti_getprotaddr(int, struct t_bind *, struct t_bind *); -int _xti_getstate(int); -int _xti_listen(int, struct t_call *); -int _xti_look(int); -int _xti_open(char *, int, struct t_info *); -int _xti_optmgmt(int, struct t_optmgmt *, struct t_optmgmt *); -int _xti_rcv(int, char *, unsigned int, int *); -int _xti_rcvconnect(int, struct t_call *); -int _xti_rcvdis(int, struct t_discon *); -int _xti_rcvrel(int); -int _xti_rcvreldata(int, struct t_discon *); -int _xti_rcvudata(int, struct t_unitdata *, int *); -int _xti_rcvuderr(int, struct t_uderr *); -int _xti_rcvv(int, struct t_iovec *, unsigned int, int *); -int _xti_rcvvudata(int, struct t_unitdata *, struct t_iovec *, - unsigned int, int *); -int _xti_snd(int, char *, unsigned int, int); -int _xti_xns5_snd(int, char *, unsigned int, int); -int _xti_snddis(int, struct t_call *); -int _xti_sndrel(int); -int _xti_sndreldata(int, struct t_discon *); -int _xti_sndudata(int, struct t_unitdata *); -int _xti_sndv(int, const struct t_iovec *, unsigned int, int); -int _xti_sndvudata(int, struct t_unitdata *, struct t_iovec *, unsigned int); -char *_xti_strerror(int); -int _xti_sync(int); -int _xti_sysconf(int); -int _xti_unbind(int); - -/* - * usr/src/lib/libnsl/nss routines - */ - -/* gethostby_door.c */ - -/* gethostbyname_r.c */ -struct hostent *_uncached_gethostbyname_r(const char *nam, - struct hostent *result, - char *buffer, int buflen, int *h_errnop); -struct hostent *_uncached_gethostbyaddr_r(const char *addr, int length, - int type, struct hostent *result, - char *buffer, int buflen, int *h_errnop); -struct hostent *gethostbyname_r(const char *nam, struct hostent *result, - char *buffer, int buflen, int *h_errnop); -struct hostent *gethostbyaddr_r(const char *addr, int length, int type, - struct hostent *result, - char *buffer, int buflen, int *h_errnop); - -/* gethostent.c */ -struct hostent *gethostbyname(const char *nam); -struct hostent *gethostbyaddr(const void *addr, socklen_t len, int type); -struct hostent *gethostent(void); - -/* gethostent_r.c */ -int sethostent(int stay); -int endhostent(void); -struct hostent *gethostent_r(struct hostent *result, char *buffer, int buflen, - int *h_errnop); - -/* getipnodeby.c */ -void freehostent(struct hostent *hent); -struct hostent *getipnodebyaddr(const void *src, size_t len, int type, - int *error_num); -struct hostent *getipnodebyname(const char *name, int af, int flags, - int *error_num); - -/* getrpcent.c */ -struct rpcent *getrpcbyname(const char *nam); -struct rpcent *getrpcbynumber(const int num); -struct rpcent *getrpcent(void); - -/* getrpcent_r.c */ -struct rpcent *getrpcbyname_r(const char *name, struct rpcent *result, - char *buffer, int buflen); -struct rpcent *getrpcbynumber_r(const int number, struct rpcent *result, - char *buffer, int buflen); -void setrpcent(const int stay); -void endrpcent(void); -struct rpcent *getrpcent_r(struct rpcent *result, char *buffer, int buflen); - -/* inet_matchaddr.c */ -int inet_matchaddr(const void *, const char *); - -/* netdir_inet.c */ -int _get_hostserv_inetnetdir_byname(struct netconfig *nconf, - struct nss_netdirbyname_in *args, - union nss_netdirbyname_out *res); -int _get_hostserv_inetnetdir_byaddr(struct netconfig *nconf, - struct nss_netdirbyaddr_in *args, - union nss_netdirbyaddr_out *res); -int __nss2herrno(nss_status_t nsstat); -nss_status_t _herrno2nss(int h_errno); -struct hostent *_switch_gethostbyname_r(const char *name, - struct hostent *result, - char *buffer, int buflen, int *h_errnop); -struct hostent *_switch_gethostbyaddr_r(const char *addr, int len, int type, - struct hostent *result, - char *buffer, int buflen, int *h_errnop); -int str2servent(const char *instr, int lenstr, void *ent, - char *buffer, int buflen); -void *__inet_get_local_interfaces(void); -void __inet_free_local_interfaces(void *p); -int __inet_address_is_local(void *p, struct in_addr addr); -int __inet_uaddr_is_local(void *p, struct netconfig *nc, char *uaddr); -int __inet_address_count(void *p); -ulong_t __inet_get_addr(void *p, int n); -char *__inet_get_uaddr(void *p, struct netconfig *nc, int n); -char *__inet_get_networka(void *p, int n); - -/* netdir_inet_sundry.c */ - -/* - * usr/src/lib/libnsl/rpc routines - */ - -/* auth_des.c */ -AUTH *authdes_seccreate(const char *servername, uint_t win, - const char *timehost, const des_block *ckey); - -/* auth_none.c */ -AUTH *authnone_create(void); - -/* auth_sys.c */ -AUTH *authsys_create(const char *machname, uid_t uid, gid_t gid, int len, - const gid_t *aup_gids); -AUTH *authsys_create_default(void); - -/* auth_time.c */ - -/* authdes_prot.c */ -bool_t xdr_authdes_cred(XDR *xdrs, struct authdes_cred *cred); -bool_t xdr_authdes_verf(XDR *xdrs, struct authdes_verf *verf); - -/* authsys_prot.c */ -bool_t xdr_authsys_parms(XDR *xdrs, struct authsys_parms *p); -bool_t xdr_uid_t(XDR *xdrs, uid_t *ip); -bool_t xdr_gid_t(XDR *xdrs, gid_t *ip); - -/* clnt_bcast.c */ -enum clnt_stat rpc_broadcast_exp(rpcprog_t prog, rpcvers_t vers, rpcproc_t proc, - xdrproc_t xargs, caddr_t argsp, xdrproc_t xresults, - caddr_t resultsp, resultproc_t eachresult, int inittime, - int waittime, const char *netclass); -enum clnt_stat rpc_broadcast(rpcprog_t prog, rpcvers_t vers, rpcproc_t proc, - xdrproc_t xargs, caddr_t argsp, xdrproc_t xresults, - caddr_t resultsp, resultproc_t eachresult, - const char *netclass); - -/* clnt_dg.c */ -CLIENT *clnt_dg_create(int fd, struct netbuf *svcaddr, rpcprog_t program, - rpcvers_t version, uint_t sendsz, uint_t recvsz); - -/* clnt_door.c */ -CLIENT *clnt_door_create(rpcprog_t program, rpcvers_t version, uint_t sendsz); - -/* clnt_generic.c */ -CLIENT *clnt_create_vers(const char *hostname, rpcprog_t prog, - rpcvers_t *vers_out, rpcvers_t vers_low, - rpcvers_t vers_high, const char *nettype); -CLIENT *clnt_create_vers_timed(const char *hostname, rpcprog_t prog, - rpcvers_t *vers_out, rpcvers_t vers_low, - rpcvers_t vers_high, const char *nettype, - const struct timeval *tp); -CLIENT *clnt_create(const char *hostname, rpcprog_t prog, rpcvers_t vers, - const char *nettype); -CLIENT *clnt_create_timed(const char *hostname, rpcprog_t prog, rpcvers_t vers, - const char *netclass, const struct timeval *tp); -CLIENT *clnt_tp_create(const char *hostname, rpcprog_t prog, rpcvers_t vers, - const struct netconfig *nconf); -CLIENT *clnt_tp_create_timed(const char *hostname, rpcprog_t prog, - rpcvers_t vers, const struct netconfig *nconf, - const struct timeval *tp); -CLIENT *clnt_tli_create(int fd, const struct netconfig *nconf, - struct netbuf *svcaddr, rpcprog_t prog, rpcvers_t vers, - uint_t sendsz, uint_t recvsz); - -/* clnt_perror.c */ -char *clnt_sperror(const CLIENT *cl, const char *s); -void clnt_perror(const CLIENT *cl, const char *s); -void clnt_perrno(enum clnt_stat num); -char *clnt_spcreateerror(const char *s); -void clnt_pcreateerror(const char *s); -const char *clnt_sperrno(const enum clnt_stat stat); - -/* clnt_raw.c */ -CLIENT *clnt_raw_create(rpcprog_t prog, rpcvers_t vers); - -/* clnt_simple.c */ -enum clnt_stat rpc_call(const char *host, rpcprog_t prognum, rpcvers_t versnum, - rpcproc_t procnum, xdrproc_t inproc, const char *in, - xdrproc_t outproc, char *out, const char *netclass); - -/* clnt_vc.c */ -CLIENT *clnt_vc_create(int fd, struct netbuf *svcaddr, rpcprog_t prog, - rpcvers_t vers, uint_t sendsz, uint_t recvsz); - -/* getdname.c */ -int getdomainname(char *name, int namelen); -int setdomainname(char *domain, int len); - -/* gethostname.c */ -int gethostname(char *hname, int hlen); - -/* key_call.c */ -int key_setsecret(const char *secretkey); -int key_secretkey_is_set(void); -int key_encryptsession_pk(const char *remotename, netobj *remotekey, - des_block *deskey); -int key_decryptsession_pk(const char *remotename, netobj *remotekey, - des_block *deskey); - -int key_encryptsession(const char *remotename, des_block *deskey); -int key_decryptsession(const char *remotename, des_block *deskey); -int key_gendes(des_block *key); -int key_setnet(struct key_netstarg *arg); -int key_get_conv(char *pkey, des_block *deskey); -int key_call(ulong_t proc, xdrproc_t xdr_arg, char *arg, xdrproc_t xdr_rslt, - char *rslt); - -/* key_prot.c */ -bool_t xdr_keystatus(XDR *xdrs, keystatus *objp); -bool_t xdr_keybuf(XDR *xdrs, keybuf objp); -bool_t xdr_netnamestr(XDR *xdrs, netnamestr *objp); -bool_t xdr_cryptkeyarg(XDR *xdrs, cryptkeyarg *objp); -bool_t xdr_cryptkeyarg2(XDR *xdrs, cryptkeyarg2 *objp); -bool_t xdr_cryptkeyres(XDR *xdrs, cryptkeyres *objp); -bool_t xdr_unixcred(XDR *xdrs, unixcred *objp); -bool_t xdr_getcredres(XDR *xdrs, getcredres *objp); -bool_t xdr_key_netstarg(XDR *xdrs, key_netstarg *objp); -bool_t xdr_key_netstres(XDR *xdrs, key_netstres *objp); - -/* mt_misc.c */ -#ifdef rpc_createerr -#undef rpc_createerr -#endif -struct rpc_createerr *__rpc_createerr(void); - -/* netname.c */ -int getnetname(char *name); -int __getnetnamebyuid(char *name, uid_t uid); -int user2netname(char *netname, const uid_t uid, const char *domain); -int host2netname(char *netname, const char *host, const char *domain); - -/* netnamer.c */ -int netname2user(const char *netname, uid_t *uidp, gid_t *gidp, - int *gidlenp, gid_t *gidlist); -int netname2host(const char *netname, char *hostname, int hostlen); - -/* openchild.c */ - -/* pmap_clnt.c */ -int pmap_set(rpcprog_t program, rpcvers_t version, rpcprot_t protocol, ushort_t port); -bool_t pmap_unset(rpcprog_t program, rpcvers_t version); -ushort_t pmap_getport(struct sockaddr_in *address, rpcprog_t program, - rpcvers_t version, rpcprot_t protocol); -struct pmaplist *pmap_getmaps(struct sockaddr_in *address); -enum clnt_stat pmap_rmtcall(struct sockaddr_in *addr, rpcprog_t prog, - rpcvers_t vers, rpcproc_t proc, xdrproc_t xdrargs, - caddr_t argsp, xdrproc_t xdrres, caddr_t resp, - struct timeval tout, rpcport_t *port_ptr); - -/* pmap_prot.c */ -bool_t xdr_pmap(XDR *xdrs, struct pmap *objp); -bool_t xdr_pmaplist_ptr(XDR *xdrs, pmaplist_ptr *rp); -bool_t xdr_pmaplist(XDR *xdrs, PMAPLIST **rp); -bool_t xdr_rmtcallargs(XDR *xdrs, struct p_rmtcallargs *cap); -bool_t xdr_rmtcallres(XDR *xdrs, struct p_rmtcallres *crp); - -/* rpc_callmsg.c */ -bool_t xdr_callmsg(XDR *xdrs, struct rpc_msg *cmsg); - -/* rpc_comdata.c */ - -/* rpc_generic.c */ -int __rpc_dtbsize(void); -uint_t __rpc_get_t_size(t_scalar_t size, t_scalar_t bufsize); -uint_t __rpc_get_a_size(t_scalar_t size); -struct netconfig *__rpc_getconfip(char *nettype); -void *__rpc_setconf(char *nettype); -struct netconfig *__rpc_getconf(void *vhandle); -void __rpc_endconf(void *vhandle); -struct netconfig *__rpcfd_to_nconf(int fd, int servtype); -int __rpc_matchserv(int servtype, unsigned int nc_semantics); - -/* rpc_prot.c */ -bool_t xdr_opaque_auth(XDR *xdrs, struct opaque_auth *ap); -bool_t xdr_des_block(XDR *xdrs, des_block *blkp); -bool_t xdr_accepted_reply(XDR *xdrs, struct accepted_reply *ar); -bool_t xdr_rejected_reply(XDR *xdrs, struct rejected_reply *rr); -bool_t xdr_replymsg(XDR *xdrs, struct rpc_msg *rmsg); -bool_t xdr_callhdr(XDR *xdrs, struct rpc_msg *cmsg); -void __seterr_reply(struct rpc_msg *msg, struct rpc_err *error); - -/* rpc_sel2poll.c */ -int __rpc_select_to_poll(int fdmax, fd_set *fdset, struct pollfd *p0); -int __rpc_timeval_to_msec(struct timeval *t); - -/* rpc_soc.c */ -CLIENT *clntudp_bufcreate(struct sockaddr_in *raddr, rpcprog_t prog, - rpcvers_t vers, struct timeval wait, int *sockp, - uint_t sendsz, uint_t recvsz); -CLIENT *clntudp_create(struct sockaddr_in *raddr, rpcprog_t program, - rpcvers_t version, struct timeval wait, int *sockp); -CLIENT *clnttcp_create(struct sockaddr_in *raddr, rpcprog_t prog, - rpcvers_t vers, int *sockp, uint_t sendsz, - uint_t recvsz); -CLIENT *clntraw_create(rpcprog_t prog, rpcvers_t vers); -SVCXPRT *svctcp_create(int fd, uint_t sendsize, uint_t recvsize); -SVCXPRT *svcudp_bufcreate(int fd, uint_t sendsize, uint_t recvsize); -SVCXPRT *svcfd_create(int fd, uint_t sendsize, uint_t recvsize); -SVCXPRT *svcudp_create(int fd); -SVCXPRT *svcraw_create(void); -int __rpc_bindresvport(int fd, struct sockaddr_in *sin, int *portp, int qlen); -void get_myaddress(struct sockaddr_in *addr); -ushort_t getrpcport(char *host, rpcprog_t prognum, rpcvers_t versnum, rpcprot_t proto); -int callrpc(char *host, rpcprog_t prognum, rpcvers_t versnum, rpcproc_t procnum, - xdrproc_t inproc, char *in, xdrproc_t outproc, char *out); -int registerrpc(rpcprog_t prognum, rpcvers_t versnum, rpcproc_t procnum, - char *(*progname)(), xdrproc_t inproc, xdrproc_t outproc); -enum clnt_stat clnt_broadcast(rpcprog_t prog, rpcvers_t vers, rpcproc_t proc, - xdrproc_t xargs, caddr_t argsp, xdrproc_t xresults, - caddr_t resultsp, resultproc_t eachresult); -AUTH *authdes_create(char *servername, uint_t window, - struct sockaddr_in *syncaddr, des_block *ckey); - -/* rpc_td.c */ - -/* rpcb_clnt.c */ -bool_t __rpc_control(int request, void *info); -bool_t rpcb_set(rpcprog_t program, rpcvers_t version, - const struct netconfig *nconf, const struct netbuf *address); -bool_t rpcb_unset(rpcprog_t program, rpcvers_t version, - const struct netconfig *nconf); -int rpcb_getaddr(rpcprog_t program, rpcvers_t version, - const struct netconfig *nconf, struct netbuf *address, - const char *host); -rpcblist *rpcb_getmaps(const struct netconfig *nconf, const char *host); -enum clnt_stat rpcb_rmtcall(const struct netconfig *nconf, const char *host, - rpcprog_t prog, rpcvers_t vers, rpcproc_t proc, - xdrproc_t xdrargs, caddr_t argsp, xdrproc_t xdrres, - caddr_t resp, struct timeval tout, - struct netbuf *addr_ptr); -bool_t rpcb_gettime(const char *host, time_t *timep); -char *rpcb_taddr2uaddr(struct netconfig *nconf, struct netbuf *taddr); -struct netbuf *rpcb_uaddr2taddr(struct netconfig *nconf, char *uaddr); - -/* rpcb_prot.c */ -bool_t xdr_rpcb(XDR *xdrs, RPCB *objp); -bool_t xdr_rpcblist_ptr(XDR *xdrs, rpcblist_ptr *rp); -bool_t xdr_rpcblist(XDR *xdrs, RPCBLIST **rp); -bool_t xdr_rpcb_entry(XDR *xdrs, rpcb_entry *objp); -bool_t xdr_rpcb_entry_list_ptr(XDR *xdrs, rpcb_entry_list_ptr *rp); -bool_t xdr_rpcb_rmtcallargs(XDR *xdrs, struct r_rpcb_rmtcallargs *objp); -bool_t xdr_rpcb_rmtcallres(XDR *xdrs, struct r_rpcb_rmtcallres *objp); -bool_t xdr_netbuf(XDR *xdrs, struct netbuf *objp); - -/* rpcb_st_xdr.c */ -bool_t xdr_rpcbs_addrlist(XDR *xdrs, rpcbs_addrlist *objp); -bool_t xdr_rpcbs_addrlist(XDR *xdrs, rpcbs_addrlist *objp); - -bool_t xdr_rpcbs_rmtcalllist(XDR *xdrs, rpcbs_rmtcalllist *objp); -bool_t xdr_rpcbs_proc(XDR *xdrs, rpcbs_proc objp); -bool_t xdr_rpcbs_addrlist_ptr(XDR *xdrs, rpcbs_addrlist_ptr *objp); -bool_t xdr_rpcbs_rmtcalllist_ptr(XDR *xdrs, rpcbs_rmtcalllist_ptr *objp); -bool_t xdr_rpcb_stat(XDR *xdrs, rpcb_stat *objp); -bool_t xdr_rpcb_stat_byvers(XDR *xdrs, rpcb_stat_byvers objp); - -/* rpcdname.c */ -int __rpc_get_default_domain(char **domain); - -/* rpcsec_gss_if.c */ -AUTH *rpc_gss_seccreate(CLIENT *clnt, char *principal, char *mechanism, - rpc_gss_service_t service_type, char *qop, - rpc_gss_options_req_t *options_req, - rpc_gss_options_ret_t *options_ret); -bool_t rpc_gss_set_defaults(AUTH *auth, rpc_gss_service_t service, char *qop); -bool_t rpc_gss_get_principal_name(rpc_gss_principal_t *principal, char - *mechanism, char *user_name, char *node, char *secdomain); -char **rpc_gss_get_mechanisms(void); -char **rpc_gss_get_mech_info(char *mechanism, rpc_gss_service_t *service); -bool_t rpc_gss_get_versions(u_int *vers_hi, u_int *vers_lo); -bool_t rpc_gss_is_installed(char *mechanism); -bool_t rpc_gss_set_svc_name(char *principal, char *mechanism, uint_t req_time, - uint_t program, uint_t version); -bool_t rpc_gss_set_callback(rpc_gss_callback_t *cb); -bool_t rpc_gss_getcred(struct svc_req *req, rpc_gss_rawcred_t **rcred, - rpc_gss_ucred_t **ucred, void **cookie); -bool_t rpc_gss_mech_to_oid(char *mech, rpc_gss_OID *oid); -bool_t rpc_gss_qop_to_num(char *qop, char *mech, u_int *num); -int rpc_gss_max_data_length(AUTH *rpcgss_handle, int max_tp_unit_len); -int rpc_gss_svc_max_data_length(struct svc_req *req, int max_tp_unit_len); -void rpc_gss_get_error(rpc_gss_error_t *error); - -/* rtime_tli.c */ -int rtime_tli(char *host, struct timeval *timep, struct timeval *timeout); - -/* svc.c */ -void xprt_register(const SVCXPRT *xprt); -void xprt_unregister(const SVCXPRT *xprt); -bool_t svc_reg(const SVCXPRT *xprt, rpcprog_t prog, rpcvers_t vers, - void (*dispatch)(), const struct netconfig *nconf); -void svc_unreg(rpcprog_t prog, rpcvers_t vers); -bool_t svc_register(SVCXPRT *xprt, rpcprog_t prog, rpcvers_t vers, - void (*dispatch)(), int protocol); -void svc_unregister(rpcprog_t prog, rpcvers_t vers); -bool_t svc_sendreply(const SVCXPRT *xprt, xdrproc_t xdr_results, - caddr_t xdr_location); -void svcerr_noproc(const SVCXPRT *xprt); -void svcerr_decode(const SVCXPRT *xprt); -void svcerr_systemerr(const SVCXPRT *xprt); -void svcerr_auth(const SVCXPRT *xprt, enum auth_stat why); -void svcerr_weakauth(const SVCXPRT *xprt); -void svcerr_noprog(const SVCXPRT *xprt); -void svcerr_progvers(const SVCXPRT *xprt, rpcvers_t low_vers, - rpcvers_t high_vers); -void svc_getreq(int rdfds); -void svc_getreqset(fd_set *readfds); -void svc_getreq_poll(struct pollfd *pfdp, int pollretval); -void svc_getreq_common(int fd); -SVCXPRT *svc_xprt_alloc(void); -void svc_xprt_free(SVCXPRT *xprt); -bool_t svc_get_local_cred(SVCXPRT *xprt, svc_local_cred_t *lcred); -SVCAUTH *__svc_get_svcauth(SVCXPRT *); -void *__svc_set_proc_cleanup_cb(void *cb); - -/* svc_auth.c */ -enum auth_stat __authenticate(struct svc_req *rqst, struct rpc_msg *msg); -int svc_auth_reg(int cred_flavor, enum auth_stat (*handler)()); - -/* svc_auth_sys.c */ - -/* svc_dg.c */ -SVCXPRT *svc_dg_create(int fd, uint_t sendsize, uint_t recvsize); -int svc_dg_enablecache(SVCXPRT *xprt, uint_t size); - -/* svc_door.c */ -SVCXPRT *svc_door_create(void (*dispatch)(), rpcprog_t prognum, - rpcvers_t versnum, uint_t sendsize); - -/* svc_generic.c */ -int svc_create(void (*dispatch)(), rpcprog_t prognum, rpcvers_t versnum, - const char *nettype); -SVCXPRT *svc_tp_create(void (*dispatch)(), rpcprog_t prognum, rpcvers_t versnum, - const struct netconfig *nconf); -SVCXPRT *svc_tli_create(int fd, const struct netconfig *nconf, - const struct t_bind *bindaddr, uint_t sendsz, - uint_t recvsz); - -/* svc_raw.c */ -SVCXPRT *svc_raw_create(void); - -/* svc_run.c */ -void svc_run(void); -void svc_exit(void); -void svc_done(SVCXPRT *xprt); -bool_t rpc_control(int op, void *info); - -/* svc_simple.c */ -int rpc_reg(rpcprog_t prognum, rpcvers_t versnum, rpcproc_t procnum, - char *(*progname)(), xdrproc_t inproc, xdrproc_t outproc, - const char *nettype); - -/* svc_vc.c */ -SVCXPRT *svc_vc_create(int fd, uint_t sendsize, uint_t recvsize); -SVCXPRT *svc_fd_create(int fd, uint_t sendsize, uint_t recvsize); -bool_t __svc_vc_dupcache_init(SVCXPRT *xprt, void *condition, int basis); -int __svc_vc_dup(struct svc_req *req, caddr_t *resp_buf, uint_t *resp_bufsz); -int __svc_vc_dupdone(struct svc_req *req, caddr_t resp_buf, uint_t resp_bufsz, - int status); - -/* svcauth_des.c */ -int authdes_getucred(const struct authdes_cred *adc, uid_t *uid, gid_t *gid, - short *grouplen, gid_t *groups); -enum auth_stat __svcauth_des(struct svc_req *rqst, struct rpc_msg *msg); - -/* ti_opts.c */ -int __rpc_negotiate_uid(int fd); -int __rpc_get_local_uid(SVCXPRT *trans, uid_t *uid_out); - -/* xdr.c */ -void xdr_free(xdrproc_t proc, char *objp); -bool_t xdr_void(void); -bool_t xdr_int(XDR *xdrs, int *ip); -bool_t xdr_u_int(XDR *xdrs, uint_t *up); -bool_t xdr_long(XDR *xdrs, long *lp); -bool_t xdr_u_long(XDR *xdrs, ulong_t *ulp); -bool_t xdr_short(XDR *xdrs, short *sp); -bool_t xdr_u_short(XDR *xdrs, ushort_t *sp); -bool_t xdr_char(XDR *xdrs, char *cp); -bool_t xdr_u_char(XDR *xdrs, uchar_t *cp); -bool_t xdr_bool(XDR *xdrs, bool_t *bp); -bool_t xdr_enum(XDR *xdrs, enum_t *ep); -bool_t xdr_opaque(XDR *xdrs, caddr_t cp, uint_t cnt); -bool_t xdr_bytes(XDR *xdrs, char **cpp, uint_t *sizep, uint_t maxsize); -bool_t xdr_netobj(XDR *xdrs, struct netobj *np); -bool_t xdr_union(XDR *xdrs, enum_t *dscmp, char *unp, - const struct xdr_discrim *choices, xdrproc_t dfault); -bool_t xdr_string(XDR *xdrs, char **cpp, uint_t maxsize); -bool_t xdr_hyper(XDR *xdrs, longlong_t *hp); -bool_t xdr_u_hyper(XDR *xdrs, u_longlong_t *hp); -bool_t xdr_longlong_t(XDR *xdrs, longlong_t *hp); -bool_t xdr_u_longlong_t(XDR *xdrs, u_longlong_t *hp); -bool_t xdr_ulonglong_t(XDR *xdrs, u_longlong_t *hp); -bool_t xdr_wrapstring(XDR *xdrs, char **cpp); - -/* xdr_array.c */ -bool_t xdr_array(XDR *xdrs, caddr_t *addrp, uint_t *sizep, uint_t maxsize, - uint_t elsize, xdrproc_t elproc); -bool_t xdr_vector(XDR *xdrs, char *basep, uint_t nelem, uint_t elemsize, - xdrproc_t xdr_elem); - -/* xdr_float.c */ -bool_t xdr_float(XDR *xdrs, float *fp); -bool_t xdr_double(XDR *xdrs, double *dp); -bool_t xdr_quadruple(XDR *xdrs, long double *fp); - -/* xdr_mem.c */ -void xdrmem_create(XDR *xdrs, caddr_t addr, uint_t size, enum xdr_op op); - -/* xdr_rec.c */ -void xdrrec_create(XDR *xdrs, uint_t sendsize, uint_t recvsize, - caddr_t tcp_handle, int (*readit)(), int (*writeit)()); - -uint_t xdrrec_readbytes(XDR *xdrs, caddr_t addr, uint_t l); -bool_t xdrrec_skiprecord(XDR *xdrs); -bool_t xdrrec_eof(XDR *xdrs); -bool_t xdrrec_endofrecord(XDR *xdrs, bool_t sendnow); - -/* xdr_refer.c */ -bool_t xdr_reference(XDR *xdrs, caddr_t *pp, uint_t size, xdrproc_t proc); -bool_t xdr_pointer(XDR *xdrs, char **objpp, uint_t obj_size, xdrproc_t xdr_obj); - -/* xdr_sizeof.c */ -unsigned int xdr_sizeof(xdrproc_t func, void *data); - -/* xdr_stdio.c */ -void xdrstdio_create(XDR *xdrs, FILE *file, enum xdr_op op); - -/* svid_funcs.c */ -#undef auth_destroy -#undef clnt_call -#undef clnt_control -#undef clnt_destroy -#undef clnt_freeres -#undef clnt_geterr -#undef svc_destroy -#undef svc_freeargs -#undef svc_getargs -#undef svc_getrpccaller -#undef xdr_destroy -#undef xdr_getpos -#undef xdr_inline -#undef xdr_setpos -void auth_destroy(AUTH *auth); -enum clnt_stat clnt_call(CLIENT *cl, rpcproc_t proc, xdrproc_t xargs, - caddr_t argsp, xdrproc_t xres, caddr_t resp, - struct timeval timeout); -bool_t clnt_control(CLIENT *cl, uint_t rq, void *in); -void clnt_destroy(CLIENT *cl); -bool_t clnt_freeres(CLIENT *cl, xdrproc_t xres, caddr_t resp); -void clnt_geterr(CLIENT *cl, struct rpc_err *errp); -bool_t svc_control(SVCXPRT *xprt, const uint_t rq, void *in); -bool_t svc_freeargs(SVCXPRT *xprt, xdrproc_t xargs, char *argsp); -bool_t svc_getargs(SVCXPRT *xprt, xdrproc_t xargs, char *argsp); -struct netbuf *svc_getrpccaller(SVCXPRT *xprt); -long *xdr_inline(XDR *xdrs, int len); -void xdr_destroy(XDR *xdrs); -uint_t xdr_getpos(XDR *xdrs); -bool_t xdr_setpos(XDR *xdrs, uint_t pos); - -/* - * usr/src/lib/libnsl/saf routines - */ - -/* checkver.c */ -int check_version(int ver, char *fname); - -/* doconfig.c */ -int doconfig(int fd, char *script, long rflag); - -/* - * usr/src/lib/libnsl/yp routines - */ - -/* dbm.c */ -int dbminit(char *file); -int dbmclose(void); -datum fetch(datum key); -int delete(datum key); -int store(datum key, datum dat); -datum firstkey(void); -datum nextkey(datum key); -datum firsthash(long hash); -datum makdatum(char *buf, int n); -long hashinc(long hash); -long calchash(datum item); - -/* yp_all.c */ -int yp_all(char *domain, char *map, struct ypall_callback *callback); -int __yp_all_rsvdport(char *domain, char *map, struct ypall_callback *callback); - -/* yp_b_clnt.c */ -enum ypbind_resptype { - YPBIND_SUCC_VAL = 1, - YPBIND_FAIL_VAL = 2 -}; -typedef enum ypbind_resptype ypbind_resptype; -struct ypbind_resp { - ypbind_resptype ypbind_status; - union { - uint_t ypbind_error; - struct ypbind_binding *ypbind_bindinfo; - } ypbind_resp_u; -}; -typedef struct ypbind_resp ypbind_resp; -struct ypbind_domain { - char *ypbind_domainname; - rpcvers_t ypbind_vers; -}; -typedef struct ypbind_domain ypbind_domain; -struct ypbind_setdom { - char *ypsetdom_domain; - struct ypbind_binding *ypsetdom_bindinfo; -}; -typedef struct ypbind_setdom ypbind_setdom; -ypbind_resp *ypbindproc_domain_3(ypbind_domain *argp, CLIENT *clnt); - -/* yp_b_xdr.c */ -bool_t xdr_ypbind_domain(XDR *xdrs, ypbind_domain *objp); -bool_t xdr_ypbind_resp(XDR *xdrs, ypbind_resp *objp); -bool_t xdr_ypbind_setdom(XDR *xdrs, ypbind_setdom *objp); -bool_t xdr_ypbind_resptype(XDR *xdrs, ypbind_resptype *objp); - -/* yp_bind.c */ -struct dom_binding { - struct dom_binding *dom_pnext; - char *dom_domain; - struct ypbind_binding *dom_binding; - CLIENT *dom_client; - int cache_bad; - int fd; - dev_t rdev; - int ref_count; - int need_free; - mutex_t server_name_lock; -}; -int __yp_dobind(char *domain, struct dom_binding **binding); -int __yp_rel_binding(struct dom_binding *binding); -void yp_unbind(char *domain); -int __yp_add_binding(char *domain, char *addr); -int yp_bind(char *domain); -int yp_get_default_domain(char **domain); -int usingypmap(char **ddn, char *map); -CLIENT *__clnt_create_loopback(rpcprog_t prog, rpcvers_t vers, int err); - -/* yp_enum.c */ -int yp_first(char *domain, char *map, char **key, int *keylen, - char **val, int *vallen); -int yp_next(char *domain, char *map, char *inkey, int inkeylen, - char **outkey, int *outkeylen, char **val, int *vallen); - -/* yp_master.c */ -int yp_master(char *domain, char *map, char **master); -int __yp_master_rsvdport(char *domain, char *map, char **master); - -/* yp_match.c */ -int yp_match(char *domain, char *map, char *key, int keylen, - char **val, int *vallen); -int yp_match_rsvdport(char *domain, char *map, char *key, int keylen, - char **val, int *vallen); -void __empty_yp_cache(void); - -/* yp_order.c */ -int yp_order(char *domain, char *map, unsigned long *order); - -/* yp_rsvd.c */ -CLIENT *__yp_clnt_create_rsvdport(const char *hostname, - rpcprog_t prog, rpcvers_t vers, - const char *nettype, - const uint_t sendsz, const uint_t recvsz); - -/* yp_update.c */ -int yp_update(char *domain, char *map, unsigned op, - char *key, int keylen, char *data, int datalen); - -/* yp_xdr.c */ -bool xdr_datum(XDR * xdrs, datum *pdatum); -bool xdr_ypdomain_wrap_string(XDR *xdrs, char **ppstring); -bool xdr_ypmap_wrap_string(XDR *xdrs, char **ppstring); -bool xdr_ypreq_key(XDR *xdrs, struct ypreq_key *ps); -bool xdr_ypreq_nokey(XDR *xdrs, struct ypreq_nokey *ps); -bool xdr_ypresp_val(XDR *xdrs, struct ypresp_val *ps); -bool xdr_ypresp_key_val(XDR *xdrs, struct ypresp_key_val *ps); -bool xdr_ypowner_wrap_string(XDR *xdrs, char **ppstring); -bool xdr_ypmap_parms(XDR *xdrs, struct ypmap_parms *ps); -bool xdr_ypresp_master(XDR *xdrs, struct ypresp_master *ps); -bool xdr_ypresp_order(XDR * xdrs, struct ypresp_order *ps); -bool xdr_ypresp_maplist(XDR *xdrs, struct ypresp_maplist *ps); -bool xdr_yppushresp_xfr(XDR *xdrs, struct yppushresp_xfr *ps); -bool xdr_ypreq_newxfr(XDR *xdrs, struct ypreq_newxfr *ps); -bool xdr_ypreq_xfr(XDR *xdrs, struct ypreq_xfr *ps); -bool xdr_ypall(XDR *xdrs, struct ypall_callback *callback); - -/* yperr_string.c */ -char *yperr_string(int code); - -/* yppasswd_xdr.c */ -bool_t xdr_yppasswd(XDR *xdrsp, struct yppasswd *pp); - -/* ypprot_err.c */ -int ypprot_err(int yp_protocol_error); - -/* ypupd.c */ -bool_t xdr_yp_buf(XDR *xdrs, yp_buf *objp); -bool_t xdr_ypupdate_args(XDR *xdrs, ypupdate_args *objp); -bool_t xdr_ypdelete_args(XDR *xdrs, ypdelete_args *objp); - -/* nis_sec_mechs.c */ -char *__nis_keyalg2authtype(keylen_t keylen, algtype_t algtype, - char *authtype, size_t authtype_len); - -/* usr/src/lib/libnsl/nss/parse.c */ -char *_strtok_escape(char *string, char *sepset, char **lasts); diff --git a/usr/src/lib/libnvpair/llib-lnvpair b/usr/src/lib/libnvpair/llib-lnvpair deleted file mode 100644 index ffc733ad85..0000000000 --- a/usr/src/lib/libnvpair/llib-lnvpair +++ /dev/null @@ -1,32 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <libnvpair.h> diff --git a/usr/src/lib/libnwam/common/llib-lnwam b/usr/src/lib/libnwam/common/llib-lnwam deleted file mode 100644 index 96cc76df3e..0000000000 --- a/usr/src/lib/libnwam/common/llib-lnwam +++ /dev/null @@ -1,30 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2010 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <libnwam.h> -#include <libnwam_priv.h> diff --git a/usr/src/lib/libofmt/common/llib-lofmt b/usr/src/lib/libofmt/common/llib-lofmt deleted file mode 100644 index 3abbb9f946..0000000000 --- a/usr/src/lib/libofmt/common/llib-lofmt +++ /dev/null @@ -1,19 +0,0 @@ -/* - * This file and its contents are supplied under the terms of the - * Common Development and Distribution License ("CDDL"), version 1.0. - * You may only use this file in accordance with the terms of version - * 1.0 of the CDDL. - * - * A full copy of the text of the CDDL should have accompanied this - * source. A copy of the CDDL is also available via the Internet at - * http://www.illumos.org/license/CDDL. - */ - -/* - * Copyright 2017 Nexenta Systems, Inc. - */ - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <ofmt.h> diff --git a/usr/src/lib/libpam/llib-lpam b/usr/src/lib/libpam/llib-lpam deleted file mode 100644 index 31c734b9c5..0000000000 --- a/usr/src/lib/libpam/llib-lpam +++ /dev/null @@ -1,34 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright (c) 2001 by Sun Microsystems, Inc. - * All rights reserved. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <pam_appl.h> -#include <pam_modules.h> -#include <pam_impl.h> diff --git a/usr/src/lib/libpcidb/common/llib-lpcidb b/usr/src/lib/libpcidb/common/llib-lpcidb deleted file mode 100644 index 5a3ad37d62..0000000000 --- a/usr/src/lib/libpcidb/common/llib-lpcidb +++ /dev/null @@ -1,30 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright (c) 2012 Joyent, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <pcidb.h> diff --git a/usr/src/lib/libpcp/Makefile.com b/usr/src/lib/libpcp/Makefile.com index 21f26dd465..a90f67ec90 100644 --- a/usr/src/lib/libpcp/Makefile.com +++ b/usr/src/lib/libpcp/Makefile.com @@ -22,6 +22,8 @@ # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# LIBRARY= libpcp.a VERS= .1 @@ -42,8 +44,6 @@ LINKED_LIBPCP_DIR = \ $(LINKED_PLATFORMS:%=$(USR_PLAT_DIR)/%/lib/libpcp.so) LINKED_LIBPCP1_DIR = \ $(LINKED_PLATFORMS:%=$(USR_PLAT_DIR)/%/lib/libpcp.so.1) -LINKED_LLIBLPCP_DIR = \ - $(LINKED_PLATFORMS:%=$(USR_PLAT_DIR)/%/lib/llib-lpcp.ln) LIBS = $(DYNLIB) $(LINTLIB) CFLAGS += $(CCVERBOSE) @@ -52,7 +52,6 @@ LDLIBS += -lc -lumem -ldevinfo PLATLIBS = $(USR_PLAT_DIR)/$(PLATFORM)/lib INS.slink6= $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/libpcp.so.1 $@ INS.slink7= $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/libpcp.so $@ -INS.slink8= $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/llib-lpcp.ln $@ .KEEP_STATE: diff --git a/usr/src/lib/libpcp/sparc/Makefile b/usr/src/lib/libpcp/sparc/Makefile index 6d4ccea2b6..80a10b172a 100644 --- a/usr/src/lib/libpcp/sparc/Makefile +++ b/usr/src/lib/libpcp/sparc/Makefile @@ -21,7 +21,8 @@ # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# lib/libpcp/sparc/Makefile +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# UTSBASE= ../../../uts @@ -72,10 +73,6 @@ $(LINKED_LIBPCP_DIR): $(USR_PLAT_DIR) $(LINKED_LIBPCP1_DIR): $(USR_PLAT_DIR) -$(INS.slink6) -$(LINKED_LLIBLPCP_DIR): $(USR_PLAT_DIR) - -$(INS.slink8) - install: all $(USR_PSM_LIBS) $(PLATLIBS)/libpcp.so \ $(LINKED_DIRS) $(LINKED_LIB_DIRS) \ - $(LINKED_LIBPCP_DIR) $(LINKED_LIBPCP1_DIR) \ - $(LINKED_LLIBLPCP_DIR) + $(LINKED_LIBPCP_DIR) $(LINKED_LIBPCP1_DIR) diff --git a/usr/src/lib/libpctx/common/llib-lpctx b/usr/src/lib/libpctx/common/llib-lpctx deleted file mode 100644 index 3595176e7d..0000000000 --- a/usr/src/lib/libpctx/common/llib-lpctx +++ /dev/null @@ -1,32 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -/* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -#include "libpctx.h" diff --git a/usr/src/lib/libpicl/llib-lpicl b/usr/src/lib/libpicl/llib-lpicl deleted file mode 100644 index e9b9c15c7f..0000000000 --- a/usr/src/lib/libpicl/llib-lpicl +++ /dev/null @@ -1,55 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -/* - * Copyright (c) 1999-2000 by Sun Microsystems, Inc. - * All rights reserved. - */ -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <picl.h> - -int picl_initialize(void); -int picl_shutdown(void); -int picl_get_root(picl_nodehdl_t *nodehandle); -int picl_get_propval(picl_prophdl_t proph, void *valbuf, size_t sz); -int picl_get_propval_by_name(picl_nodehdl_t nodeh, const char *propname, - void *valbuf, size_t sz); -int picl_set_propval(picl_prophdl_t proph, void *valbuf, size_t sz); -int picl_set_propval_by_name(picl_nodehdl_t nodeh, const char *propname, - void *valbuf, size_t sz); -int picl_get_propinfo(picl_prophdl_t proph, picl_propinfo_t *pi); -int picl_get_first_prop(picl_nodehdl_t nodeh, picl_prophdl_t *proph); -int picl_get_next_prop(picl_prophdl_t proph, picl_prophdl_t *nexth); -int picl_get_prop_by_name(picl_nodehdl_t nodeh, const char *nm, - picl_prophdl_t *ph); -int picl_get_next_by_row(picl_prophdl_t thish, picl_prophdl_t *proph); -int picl_get_next_by_col(picl_prophdl_t thish, picl_prophdl_t *proph); -int picl_wait(unsigned int secs); -char *picl_strerror(int err); -int picl_walk_tree_by_class(picl_nodehdl_t rooth, - const char *classname, void *c_args, - int (*callback_fn)(picl_nodehdl_t hdl, void *args)); -int picl_get_propinfo_by_name(picl_nodehdl_t nodeh, const char *pname, - picl_propinfo_t *pinfo, picl_prophdl_t *proph); diff --git a/usr/src/lib/libpicltree/llib-lpicltree b/usr/src/lib/libpicltree/llib-lpicltree deleted file mode 100644 index 88fcc07d1a..0000000000 --- a/usr/src/lib/libpicltree/llib-lpicltree +++ /dev/null @@ -1,93 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -/* - * Copyright (c) 1999-2000 by Sun Microsystems, Inc. - * All rights reserved. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <synch.h> -#include <picl.h> -#include <picltree.h> -#include "ptree_impl.h" - -int ptree_get_root(picl_nodehdl_t *nodeh); -int ptree_create_node(const char *name, const char *clname, - picl_nodehdl_t *nodeh); -int ptree_destroy_node(picl_nodehdl_t nodeh); -int ptree_add_node(picl_nodehdl_t parh, picl_nodehdl_t chdh); -int ptree_delete_node(picl_nodehdl_t nodeh); - -int ptree_create_prop(const ptree_propinfo_t *pi, const void *vbuf, - picl_prophdl_t *proph); -int ptree_destroy_prop(picl_prophdl_t proph); -int ptree_delete_prop(picl_prophdl_t proph); -int ptree_add_prop(picl_nodehdl_t nodeh, picl_prophdl_t proph); -int ptree_create_table(picl_prophdl_t *tbl_hdl); -int ptree_add_row_to_table(picl_prophdl_t tbl, int nprops, - const picl_prophdl_t *props); -int ptree_update_propval_by_name(picl_nodehdl_t nodeh, const char *name, - const void *vbuf, unsigned int sz); -int ptree_update_propval(picl_prophdl_t proph, const void *buf, - unsigned int sz); -int ptree_get_propval(picl_prophdl_t proph, void *buf, unsigned int sz); -int ptree_get_propval_by_name(picl_nodehdl_t nodeh, const char *name, - void *buf, unsigned int sz); -int ptree_get_propinfo(picl_prophdl_t proph, ptree_propinfo_t *pi); -int ptree_get_first_prop(picl_nodehdl_t nodeh, picl_prophdl_t *proph); -int ptree_get_next_prop(picl_prophdl_t thish, picl_prophdl_t *proph); -int ptree_get_prop_by_name(picl_nodehdl_t nodeh, const char *name, - picl_prophdl_t *proph); -int ptree_get_next_by_row(picl_prophdl_t proph, picl_prophdl_t *rowh); -int ptree_get_next_by_col(picl_prophdl_t proph, picl_prophdl_t *colh); - -int ptree_get_node_by_path(const char *prl, picl_nodehdl_t *nodeh); -int picld_plugin_register(picld_plugin_reg_t *infop); -int ptree_init_propinfo(ptree_propinfo_t *infop, int version, int ptype, - int pmode, size_t psize, char *pname, - int (*readfn)(ptree_rarg_t *, void *), - int (*writefn)(ptree_warg_t *, const void *)); -int ptree_create_and_add_prop(picl_nodehdl_t nodeh, - ptree_propinfo_t *infop, void *vbuf, - picl_prophdl_t *proph); -int ptree_create_and_add_node(picl_nodehdl_t rooth, const char *name, - const char *classname, picl_nodehdl_t *nodeh); - -int ptree_walk_tree_by_class(picl_nodehdl_t rooth, const char *classname, - void *c_args, int (*callback_fn)(picl_nodehdl_t hdl, void *args)); - -int ptree_find_node(picl_nodehdl_t rooth, char *pname, - picl_prop_type_t ptype, void *pval, size_t valsize, - picl_nodehdl_t *retnodeh); -int ptree_post_event(const char *ename, const void *earg, - size_t size, void (*completion_handler)(char *ename, - void *earg, size_t size)); -int ptree_register_handler(const char *ename, - void (*evt_handler)(const char *ename, const void *earg, - size_t size, void *cookie), void *cookie); -void ptree_unregister_handler(const char *ename, - void (*evt_handler)(const char *ename, const void *earg, - size_t size, void *cookie), void *cookie); diff --git a/usr/src/lib/libpkg/common/llib-lpkg b/usr/src/lib/libpkg/common/llib-lpkg deleted file mode 100644 index b2fdb70d75..0000000000 --- a/usr/src/lib/libpkg/common/llib-lpkg +++ /dev/null @@ -1,36 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright (c) 2017 Peter Tribble. - */ - -/* - * Copyright 2009 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - - -/* LINTLIBRARY */ -/* PROTOLIB1 */ -#include <cfext.h> -#include <pkglib.h> -#include <pkglocale.h> diff --git a/usr/src/lib/libpool/common/llib-lpool b/usr/src/lib/libpool/common/llib-lpool deleted file mode 100644 index 461b21a6f9..0000000000 --- a/usr/src/lib/libpool/common/llib-lpool +++ /dev/null @@ -1,32 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ -/* PROTOLIB1 */ -#include <pool.h> - diff --git a/usr/src/lib/libpp/common/llib-lpp b/usr/src/lib/libpp/common/llib-lpp deleted file mode 100644 index 5d49fc1b83..0000000000 --- a/usr/src/lib/libpp/common/llib-lpp +++ /dev/null @@ -1,32 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - * - * lib/libpp/common/llib-lpp - */ - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include "pp.h" diff --git a/usr/src/lib/libpri/common/llib-lpri b/usr/src/lib/libpri/common/llib-lpri deleted file mode 100644 index 49367dc4da..0000000000 --- a/usr/src/lib/libpri/common/llib-lpri +++ /dev/null @@ -1,31 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <sys/pri.h> diff --git a/usr/src/lib/libproc/common/llib-lproc b/usr/src/lib/libproc/common/llib-lproc deleted file mode 100644 index a5fb8a19a2..0000000000 --- a/usr/src/lib/libproc/common/llib-lproc +++ /dev/null @@ -1,392 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright 2009 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ -/* - * Copyright (c) 2013 by Delphix. All rights reserved. - */ -#include "libproc.h" - -/* - * usr/src/lib/libproc - */ - -/* Pcontrol.c */ -int _libproc_debug; -struct ps_prochandle *Pcreate(const char *file, char *const *argv, - int *perr, char *path, size_t len); -const char *Pcreate_error(int error); -void Pcreate_callback(struct ps_prochandle *Pr); -struct ps_prochandle *Pgrab(pid_t pid, int gflag, int *perr); -const char *Pgrab_error(int error); -void Pfree(struct ps_prochandle *Pr); -int Pstate(struct ps_prochandle *Pr); -int Pasfd(struct ps_prochandle *Pr); -int Pctlfd(struct ps_prochandle *Pr); -const psinfo_t *Ppsinfo(struct ps_prochandle *Pr); -const pstatus_t *Pstatus(struct ps_prochandle *Pr); -int Pcred(struct ps_prochandle *Pr, prcred_t *pcrp, int ngroups); -int Ppriv(struct ps_prochandle *Pr, prpriv_t **pprivp); -void Ppriv_free(struct ps_prochandle *Pr, prpriv_t *privp); -void Psync(struct ps_prochandle *Pr); -int Pcreate_agent(struct ps_prochandle *Pr); -void Pdestroy_agent(struct ps_prochandle *Pr); -int Preopen(struct ps_prochandle *Pr); -void Prelease(struct ps_prochandle *Pr, int flags); -int Pstopstatus(struct ps_prochandle *Pr, long cmd, uint_t msec); -int Pwait(struct ps_prochandle *Pr, uint_t msec); -int Pstop(struct ps_prochandle *Pr, uint_t msec); -int Pdstop(struct ps_prochandle *Pr); -int Pgetareg(struct ps_prochandle *Pr, int regno, prgreg_t *preg); -int Pputareg(struct ps_prochandle *Pr, int regno, prgreg_t reg); -int Psetrun(struct ps_prochandle *Pr, int sig, int flags); -ssize_t Pread(struct ps_prochandle *Pr, - void *buf, size_t nbyte, uintptr_t address); -ssize_t Pread_string(struct ps_prochandle *Pr, - char *buf, size_t nbyte, uintptr_t address); -ssize_t Pwrite(struct ps_prochandle *Pr, - const void *buf, size_t nbyte, uintptr_t address); -int Pclearsig(struct ps_prochandle *Pr); -int Pclearfault(struct ps_prochandle *Pr); -int Psetbkpt(struct ps_prochandle *Pr, uintptr_t address, ulong_t *saved); -int Pdelbkpt(struct ps_prochandle *Pr, uintptr_t address, ulong_t saved); -int Pxecbkpt(struct ps_prochandle *Pr, ulong_t saved); -int Psetwapt(struct ps_prochandle *Pr, const prwatch_t *wp); -int Pdelwapt(struct ps_prochandle *Pr, const prwatch_t *wp); -int Pxecwapt(struct ps_prochandle *Pr, const prwatch_t *wp); -int Psetflags(struct ps_prochandle *Pr, long flags); -int Punsetflags(struct ps_prochandle *Pr, long flags); -int Psignal(struct ps_prochandle *Pr, int which, int stop); -void Psetsignal(struct ps_prochandle *Pr, const sigset_t *set); -int Pfault(struct ps_prochandle *Pr, int which, int stop); -void Psetfault(struct ps_prochandle *Pr, const fltset_t *set); -int Psysentry(struct ps_prochandle *Pr, int which, int stop); -void Psetsysentry(struct ps_prochandle *Pr, const sysset_t *set); -int Psysexit(struct ps_prochandle *Pr, int which, int stop); -void Psetsysexit(struct ps_prochandle *Pr, const sysset_t *set); -int Plwp_iter(struct ps_prochandle *Pr, proc_lwp_f *func, void *cd); -int Psyscall(struct ps_prochandle *Pr, sysret_t *, - int sysindex, uint_t nargs, argdes_t *argp); - -struct ps_lwphandle *Lgrab(struct ps_prochandle *P, lwpid_t lwpid, int *perr); -const char *Lgrab_error(int error); -struct ps_prochandle *Lprochandle(struct ps_lwphandle *Lwp); -void Lfree(struct ps_lwphandle *Lwp); -int Lctlfd(struct ps_lwphandle *Lwp); -int Lwait(struct ps_lwphandle *Lwp, uint_t msec); -int Lstop(struct ps_lwphandle *Lwp, uint_t msec); -int Ldstop(struct ps_lwphandle *Lwp); -int Lstate(struct ps_lwphandle *Lwp); -const lwpsinfo_t *Lpsinfo(struct ps_lwphandle *Lwp); -const lwpstatus_t *Lstatus(struct ps_lwphandle *Lwp); -int Lgetareg(struct ps_lwphandle *Lwp, int regno, prgreg_t *preg); -int Lputareg(struct ps_lwphandle *Lwp, int regno, prgreg_t reg); -int Lsetrun(struct ps_lwphandle *Lwp, int sig, int flags); -int Lclearsig(struct ps_lwphandle *Lwp); -int Lclearfault(struct ps_lwphandle *Lwp); -int Lxecbkpt(struct ps_lwphandle *Lwp, ulong_t saved); -int Lxecwapt(struct ps_lwphandle *Lwp, const prwatch_t *wp); -void Lsync(struct ps_lwphandle *Lwp); - -/* Plwpregs.c */ -int Plwp_getregs(struct ps_prochandle *Pr, lwpid_t i, prgregset_t gr); -int Plwp_setregs(struct ps_prochandle *Pr, lwpid_t i, const prgregset_t gr); -int Plwp_getfpregs(struct ps_prochandle *Pr, lwpid_t i, prfpregset_t *fp); -int Plwp_setfpregs(struct ps_prochandle *Pr, lwpid_t i, const prfpregset_t *fp); -#if defined(sparc) || defined(__sparc) -int Plwp_getxregs(struct ps_prochandle *Pr, lwpid_t i, prxregset_t *xr); -int Plwp_setxregs(struct ps_prochandle *Pr, lwpid_t i, const prxregset_t *xr); -#if defined(__sparcv9) -int Plwp_getasrs(struct ps_prochandle *Pr, lwpid_t i, asrset_t asrs); -int Plwp_setasrs(struct ps_prochandle *Pr, lwpid_t i, const asrset_t asrs); -#endif /* __sparcv9 */ -#endif /* __sparc */ -int Plwp_getpsinfo(struct ps_prochandle *Pr, lwpid_t i, lwpsinfo_t *lps); - -/* Pcore.c */ -struct ps_prochandle *Pfgrab_core(int fd, const char *aout, int *perr); -struct ps_prochandle *Pgrab_core(const char *core, const char *aout, - int gflag, int *perr); - -/* Pisprocdir.c */ -int Pisprocdir(struct ps_prochandle *Pr, const char *dir); - -/* Pservice.c */ -ps_err_e ps_pdmodel(struct ps_prochandle *Pr, int *modelp); -ps_err_e ps_pread(struct ps_prochandle *Pr, - psaddr_t addr, void *buf, size_t size); -ps_err_e ps_pwrite(struct ps_prochandle *Pr, - psaddr_t addr, const void *buf, size_t size); -ps_err_e ps_pdread(struct ps_prochandle *Pr, - psaddr_t addr, void *buf, size_t size); -ps_err_e ps_pdwrite(struct ps_prochandle *Pr, - psaddr_t addr, const void *buf, size_t size); -ps_err_e ps_ptread(struct ps_prochandle *Pr, - psaddr_t addr, void *buf, size_t size); -ps_err_e ps_ptwrite(struct ps_prochandle *Pr, - psaddr_t addr, const void *buf, size_t size); -ps_err_e ps_pstop(struct ps_prochandle *Pr); -ps_err_e ps_pcontinue(struct ps_prochandle *Pr); -ps_err_e ps_lstop(struct ps_prochandle *Pr, lwpid_t lwpid); -ps_err_e ps_lcontinue(struct ps_prochandle *Pr, lwpid_t lwpid); -ps_err_e ps_lgetregs(struct ps_prochandle *Pr, - lwpid_t lwpid, prgregset_t regs); -ps_err_e ps_lsetregs(struct ps_prochandle *Pr, - lwpid_t lwpid, const prgregset_t regs); -ps_err_e ps_lgetfpregs(struct ps_prochandle *Pr, - lwpid_t lwpid, prfpregset_t *regs); -ps_err_e ps_lsetfpregs(struct ps_prochandle *Pr, - lwpid_t lwpid, const prfpregset_t *regs); -#if defined(sparc) || defined(__sparc) -ps_err_e ps_lgetxregsize(struct ps_prochandle *Pr, - lwpid_t lwpid, int *xrsize); -ps_err_e ps_lgetxregs(struct ps_prochandle *Pr, - lwpid_t lwpid, caddr_t xregs); -ps_err_e ps_lsetxregs(struct ps_prochandle *Pr, - lwpid_t lwpid, caddr_t xregs); -#endif /* sparc */ -#if defined(__i386) || defined(__amd64) -ps_err_e ps_lgetLDT(struct ps_prochandle *Pr, - lwpid_t lwpid, struct ssd *ldt); -#endif /* __i386 || __amd6464 */ -void ps_plog(const char *fmt, ...); - -/* Psymtab.c */ -void Pupdate_maps(struct ps_prochandle *Pr); -void Pupdate_syms(struct ps_prochandle *Pr); -rd_agent_t *Prd_agent(struct ps_prochandle *Pr); -const prmap_t *Paddr_to_map(struct ps_prochandle *Pr, uintptr_t addr); -const prmap_t *Paddr_to_text_map(struct ps_prochandle *Pr, uintptr_t addr); -const prmap_t *Pname_to_map(struct ps_prochandle *Pr, const char *name); -const prmap_t *Plmid_to_map(struct ps_prochandle *Pr, Lmid_t lmid, - const char *name); -int Plookup_by_addr(struct ps_prochandle *Pr, uintptr_t addr, - char *sym_name_buffer, size_t bufsize, GElf_Sym *symbolp); -int Plookup_by_name(struct ps_prochandle *Pr, - const char *object_name, const char *symbol_name, - GElf_Sym *sym); -int Plookup_by_lmid(struct ps_prochandle *Pr, - Lmid_t lmid, const char *object_name, const char *symbol_name, - GElf_Sym *sym); -const rd_loadobj_t *Paddr_to_loadobj(struct ps_prochandle *, uintptr_t); -const rd_loadobj_t *Pname_to_loadobj(struct ps_prochandle *, const char *); -const rd_loadobj_t *Plmid_to_loadobj(struct ps_prochandle *, Lmid_t, - const char *); -int Pmapping_iter(struct ps_prochandle *Pr, proc_map_f *func, void *cd); -int Pmapping_iter_resolved(struct ps_prochandle *Pr, proc_map_f *func, - void *cd); -int Pobject_iter(struct ps_prochandle *Pr, proc_map_f *func, void *cd); -int Pobject_iter_resolved(struct ps_prochandle *Pr, proc_map_f *func, - void *cd); -char *Pobjname(struct ps_prochandle *Pr, uintptr_t addr, - char *buffer, size_t bufsize); -char *Pobjname_resolved(struct ps_prochandle *Pr, uintptr_t addr, - char *buffer, size_t bufsize); -int Plmid(struct ps_prochandle *Pr, uintptr_t addr, Lmid_t *lmidp); -int Psymbol_iter(struct ps_prochandle *Pr, const char *object_name, - int which, int type, proc_sym_f *func, void *cd); -int Psymbol_iter_by_lmid(struct ps_prochandle *Pr, Lmid_t lmid, - const char *object_name, int which, int type, - proc_sym_f *func, void *cd); -char *Pgetenv(struct ps_prochandle *Pr, const char *name, - char *buffer, size_t bufsize); -char *Pplatform(struct ps_prochandle *Pr, char *s, size_t n); -int Puname(struct ps_prochandle *Pr, struct utsname *u); -char *Pzonename(struct ps_prochandle *Pr, char *s, size_t n); -char *Pfindobj(struct ps_prochandle *Pr, const char *path, - char *s, size_t n); -char *Pexecname(struct ps_prochandle *Pr, char *buffer, size_t bufsize); -void Preset_maps(struct ps_prochandle *Pr); - -ps_err_e ps_pglobal_lookup(struct ps_prochandle *Pr, - const char *object_name, const char *sym_name, - psaddr_t *sym_addr); - -ps_err_e ps_pglobal_sym(struct ps_prochandle *Pr, - const char *object_name, const char *sym_name, - ps_sym_t *symp); - -long Pgetauxval(struct ps_prochandle *Pr, int type); -const auxv_t *Pgetauxvec(struct ps_prochandle *Pr); -ps_err_e ps_pauxv(struct ps_prochandle *Pr, const auxv_t **aux); - -/* Putil.c */ -void Perror_printf(struct ps_prochandle *Pr, const char *format, ...); - -/* pr_door.c */ -int pr_door_info(struct ps_prochandle *Pr, int did, door_info_t *di); - -/* pr_exit.c */ -int pr_exit(struct ps_prochandle *Pr, int status); -int pr_lwp_exit(struct ps_prochandle *Pr); - -/* pr_fcntl.c */ -int pr_fcntl(struct ps_prochandle *Pr, int fd, int cmd, void *argp); - -/* pr_getitimer.c */ -int pr_getitimer(struct ps_prochandle *Pr, - int which, struct itimerval *itv); -int pr_setitimer(struct ps_prochandle *Pr, - int which, const struct itimerval *itv, struct itimerval *oitv); - -/* pr_getrctl.c */ -int pr_getrctl(struct ps_prochandle *Pr, const char *rname, - rctlblk_t *old_blk, rctlblk_t *new_blk, int rflag); -int pr_setrctl(struct ps_prochandle *Pr, const char *rname, - rctlblk_t *old_blk, rctlblk_t *new_blk, int rflag); -int pr_setprojrctl(struct ps_prochandle *Pr, const char *rname, - rctlblk_t *new_blk, size_t size, int rflag); - -/* pr_getrlimit.c */ -int pr_getrlimit(struct ps_prochandle *Pr, - int resource, struct rlimit *rlp); -int pr_setrlimit(struct ps_prochandle *Pr, - int resource, const struct rlimit *rlp); -int pr_getrlimit64(struct ps_prochandle *Pr, - int resource, struct rlimit64 *rlp); -int pr_setrlimit64(struct ps_prochandle *Pr, - int resource, const struct rlimit64 *rlp); - -/* pr_getsockname.c */ -int pr_getsockname(struct ps_prochandle *Pr, - int sock, struct sockaddr *name, socklen_t *namelen); -int pr_getpeername(struct ps_prochandle *Pr, - int sock, struct sockaddr *name, socklen_t *namelen); - -/* pr_ioctl.c */ -int pr_ioctl(struct ps_prochandle *Pr, - int fd, int code, void *buf, size_t size); - -/* pr_lseek.c */ -off_t pr_lseek(struct ps_prochandle *Pr, - int filedes, off_t offset, int whence); -offset_t pr_llseek(struct ps_prochandle *Pr, - int filedes, offset_t offset, int whence); - -/* pr_memcntl.c */ -int pr_memcntl(struct ps_prochandle *Pr, - caddr_t addr, size_t len, int cmd, caddr_t arg, int attr, int mask); - -/* pr_mmap.c */ -void *pr_mmap(struct ps_prochandle *Pr, - void *addr, size_t len, int prot, int flags, int fd, off_t off); -int pr_munmap(struct ps_prochandle *Pr, - void *addr, size_t len); -void *pr_zmap(struct ps_prochandle *Pr, - void *addr, size_t len, int prot, int flags); - -/* pr_open.c */ -int pr_open(struct ps_prochandle *Pr, - const char *filename, int flags, mode_t mode); -int pr_creat(struct ps_prochandle *Pr, - const char *filename, mode_t mode); -int pr_close(struct ps_prochandle *Pr, int fd); -int pr_access(struct ps_prochandle *Pr, const char *path, int amode); - -/* pr_pbind.c */ -int pr_processor_bind(struct ps_prochandle *Pr, idtype_t, id_t, int, int *); - -/* pr_rename.c */ -int pr_rename(struct ps_prochandle *Pr, const char *old, const char *new); -int pr_link(struct ps_prochandle *Pr, const char *exist, const char *new); -int pr_unlink(struct ps_prochandle *Pr, const char *); - -/* pr_sigaction.c */ -int pr_sigaction(struct ps_prochandle *Pr, - int sig, const struct sigaction *act, struct sigaction *oact); - -/* pr_stat.c */ -int pr_stat(struct ps_prochandle *Pr, const char *path, struct stat *buf); -int pr_lstat(struct ps_prochandle *Pr, const char *path, struct stat *buf); -int pr_fstat(struct ps_prochandle *Pr, int fd, struct stat *buf); -int pr_stat64(struct ps_prochandle *Pr, const char *path, - struct stat64 *buf); -int pr_lstat64(struct ps_prochandle *Pr, const char *path, - struct stat64 *buf); -int pr_fstat64(struct ps_prochandle *Pr, int fd, struct stat64 *buf); - -/* pr_statvfs.c */ -int pr_statvfs(struct ps_prochandle *Pr, const char *path, statvfs_t *buf); -int pr_fstatvfs(struct ps_prochandle *Pr, int fd, statvfs_t *buf); - -/* pr_tasksys.c */ -projid_t pr_getprojid(struct ps_prochandle *Pr); -taskid_t pr_gettaskid(struct ps_prochandle *Pr); -taskid_t pr_settaskid(struct ps_prochandle *Pr, projid_t project, int flags); - -/* pr_waitid.c */ -int pr_waitid(struct ps_prochandle *Pr, - idtype_t idtype, id_t id, siginfo_t *infop, int options); - -/* proc_get_info.c */ -int proc_get_cred(pid_t pid, prcred_t *credp, int ngroups); -prpriv_t *proc_get_priv(pid_t pid); -void proc_free_priv(prpriv_t *); -int proc_get_psinfo(pid_t pid, psinfo_t *psp); -int proc_get_status(pid_t pid, pstatus_t *psp); -int proc_get_auxv(pid_t pid, auxv_t *pauxv, int naux); - -/* proc_names.c */ -char *proc_fltname(int flt, char *buf, size_t bufsz); -char *proc_signame(int sig, char *buf, size_t bufsz); -char *proc_sysname(int sys, char *buf, size_t bufsz); - -int proc_str2flt(const char *str, int *fltnum); -int proc_str2sig(const char *str, int *signum); -int proc_str2sys(const char *str, int *sysnum); - -char *proc_fltset2str(const fltset_t *set, const char *delim, int members, - char *buf, size_t nbytes); -char *proc_sigset2str(const sigset_t *set, const char *delim, int members, - char *buf, size_t nbytes); -char *proc_sysset2str(const sysset_t *set, const char *delim, int members, - char *buf, size_t nbytes); - -char *proc_str2fltset(const char *str, const char *delim, int members, - fltset_t *set); -char *proc_str2sigset(const char *str, const char *delim, int members, - sigset_t *set); -char *proc_str2sysset(const char *str, const char *delim, int members, - sysset_t *set); - -int proc_walk(proc_walk_f *func, void *arg, int flags); - -/* proc_arg.c */ -struct ps_prochandle *proc_arg_grab(const char *arg, - int oflag, int gflag, int *perr); - -pid_t proc_arg_psinfo(const char *arg, int oflag, psinfo_t *psp, int *perr); -void proc_unctrl_psinfo(psinfo_t *psp); - -/* proc_set.c */ -int Psetcred(struct ps_prochandle *Pr, const prcred_t *pcred); - -/* Pstack.c */ -int Pstack_iter(struct ps_prochandle *Pr, - const prgregset_t regs, proc_stack_f *func, void *arg); - -/* Pisadep.c */ -const char *Ppltdest(struct ps_prochandle *Pr, uintptr_t addr); diff --git a/usr/src/lib/libproject/common/llib-lproject b/usr/src/lib/libproject/common/llib-lproject deleted file mode 100644 index 0acd9641b3..0000000000 --- a/usr/src/lib/libproject/common/llib-lproject +++ /dev/null @@ -1,40 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <project.h> -#include <sys/types.h> - -struct ps_prochandle; -typedef struct priv_set priv_set_t; - -priv_set_t *setproject_initpriv(void); -projid_t setproject_proc(const char *, const char *, int, pid_t, - struct ps_prochandle *, struct project *); diff --git a/usr/src/lib/libprtdiag/common/llib-lprtdiag b/usr/src/lib/libprtdiag/common/llib-lprtdiag deleted file mode 100644 index 5c7ac4ce3b..0000000000 --- a/usr/src/lib/libprtdiag/common/llib-lprtdiag +++ /dev/null @@ -1,33 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <sys/types.h> -#include "libprtdiag.h" diff --git a/usr/src/lib/libpthread/common/llib-lpthread b/usr/src/lib/libpthread/common/llib-lpthread deleted file mode 100644 index ec13f98fd0..0000000000 --- a/usr/src/lib/libpthread/common/llib-lpthread +++ /dev/null @@ -1,31 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright (c) 2001 by Sun Microsystems, Inc. - * All rights reserved. - */ -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <pthread.h> diff --git a/usr/src/lib/libraidcfg/common/llib-lraidcfg b/usr/src/lib/libraidcfg/common/llib-lraidcfg deleted file mode 100644 index a0626c6b0b..0000000000 --- a/usr/src/lib/libraidcfg/common/llib-lraidcfg +++ /dev/null @@ -1,32 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <raidcfg.h> diff --git a/usr/src/lib/librcm/llib-lrcm b/usr/src/lib/librcm/llib-lrcm deleted file mode 100644 index c6c8dd1679..0000000000 --- a/usr/src/lib/librcm/llib-lrcm +++ /dev/null @@ -1,87 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/*LINTLIBRARY*/ -/*PROTOLIB1*/ -/* - * Copyright 1999-2000, 2003 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - * - * usr/src/lib/librcm/llib-ldevinfo - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -#include "librcm.h" -#include "librcm_event.h" - -/* librcm interfaces */ - -int rcm_get_handle(char *, uint_t, void *, rcm_handle_t **); -int rcm_free_handle(rcm_handle_t *); -int rcm_get_info(rcm_handle_t *, char *, uint_t, rcm_info_t **); -int rcm_get_rsrcstate(rcm_handle_t *, char *, int *); -void rcm_free_info(rcm_info_t *); -int rcm_append_info(rcm_info_t **, rcm_info_t *); -rcm_info_tuple_t *rcm_info_next(rcm_info_t *, rcm_info_tuple_t *); -const char *rcm_info_rsrc(rcm_info_tuple_t *); -const char *rcm_info_info(rcm_info_tuple_t *); -const char *rcm_info_modname(rcm_info_tuple_t *); -const char *rcm_info_error(rcm_info_tuple_t *); -pid_t rcm_info_pid(rcm_info_tuple_t *); -int rcm_info_state(rcm_info_tuple_t *); -int rcm_info_seqnum(rcm_info_tuple_t *); -nvlist_t *rcm_info_properties(rcm_info_tuple_t *); -int rcm_request_offline(rcm_handle_t *, char *, uint_t, rcm_info_t **); -int rcm_request_offline_list(rcm_handle_t *, char **, uint_t, rcm_info_t **); -int rcm_notify_online(rcm_handle_t *, char *, uint_t, rcm_info_t **); -int rcm_notify_online_list(rcm_handle_t *, char **, uint_t, rcm_info_t **); -int rcm_notify_remove(rcm_handle_t *, char *, uint_t, rcm_info_t **); -int rcm_notify_remove_list(rcm_handle_t *, char **, uint_t, rcm_info_t **); -int rcm_request_suspend(rcm_handle_t *, char *, uint_t, timespec_t *, - rcm_info_t **); -int rcm_request_suspend_list(rcm_handle_t *, char **, uint_t, timespec_t *, - rcm_info_t **); -int rcm_notify_resume(rcm_handle_t *, char *, uint_t, rcm_info_t **); -int rcm_notify_resume_list(rcm_handle_t *, char **, uint_t, rcm_info_t **); -int rcm_notify_event(rcm_handle_t *, char *, uint_t, nvlist_t *, rcm_info_t **); -int rcm_register_event(rcm_handle_t *, char *, uint_t, rcm_info_t **); -int rcm_unregister_event(rcm_handle_t *, char *, uint_t); -int rcm_register_capacity(rcm_handle_t *, char *, uint_t, rcm_info_t **); -int rcm_unregister_capacity(rcm_handle_t *, char *, uint_t); -int rcm_register_interest(rcm_handle_t *, char *, uint_t, rcm_info_t **); -int rcm_unregister_interest(rcm_handle_t *, char *, uint_t); -int rcm_exec_cmd(char *); -char *rcm_module_dir(uint_t); -void *rcm_module_open(char *); -void rcm_module_close(void *); -const char *rcm_get_client_name(rcm_handle_t *); - -char *rcm_script_dir(uint_t); -char *rcm_dir(uint_t, int *); -char *rcm_get_script_dir(char *); -int rcm_is_script(char *); - -/* event related interfaces */ - -int get_event_service(char *, void *, size_t, void **, size_t *); -int create_event_service(char *, void (*)(void **, size_t *)); -int revoke_event_service(int); diff --git a/usr/src/lib/libreparse/common/llib-lreparse b/usr/src/lib/libreparse/common/llib-lreparse deleted file mode 100644 index 082aa4032d..0000000000 --- a/usr/src/lib/libreparse/common/llib-lreparse +++ /dev/null @@ -1,46 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright 2009 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#include <sys/fs_reparse.h> -#include "rp_plugin.h" - -/* - * usr/src/lib/libreparse - */ -int reparse_add(nvlist_t *, const char *, const char *); -int reparse_create(const char *, const char *); -int reparse_delete(const char *); -int reparse_deref(const char *, const char *, char *, size_t *); -void reparse_free(nvlist_t *); -nvlist_t *reparse_init(void); -int reparse_parse(const char *, nvlist_t *); -int reparse_remove(nvlist_t *, const char *); -int reparse_remove(nvlist_t *, const char *); -int reparse_unparse(nvlist_t *, char **); -int reparse_validate(const char *); -int rp_plugin_init(); diff --git a/usr/src/lib/libresolv2/common/llib-lresolv b/usr/src/lib/libresolv2/common/llib-lresolv deleted file mode 100644 index aedd06a0fa..0000000000 --- a/usr/src/lib/libresolv2/common/llib-lresolv +++ /dev/null @@ -1,59 +0,0 @@ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright (c) 1997-1999 by Sun Microsystems, Inc. - * All rights reserved. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <stdio.h> -#include <sys/types.h> -#include <netinet/in.h> -#include <netdb.h> -#include <arpa/nameser.h> -#include <resolv.h> - -/* - * usr/src/lib/libresolv2 routines - */ - -int dn_skipname(const uchar_t *, const uchar_t *); -void fp_query(const u_char *, FILE *); -const uchar_t * p_cdname(const uchar_t *, const uchar_t *, FILE *); -const char * p_class(int); -void p_query(const u_char *); -const char * p_time(unsigned int); -const char * p_type(int); -void putlong(unsigned int, uchar_t *); -uint32_t _getlong(const u_char *); -uint16_t _getshort(const u_char *); -const char * hstrerror(int); -int res_init(void); -int res_mkquery(int, const char *, int, int, const u_char *, - int, const u_char *, u_char *, int); -int res_query(const char *, int, int, u_char *, int); -int res_querydomain(const char *, const char *, int, int, - u_char *, int); -int res_search(const char *, int, int, u_char *, int); -int res_send(const u_char *, int, u_char *, int); -int res_update(ns_updrec *); -int res_ninit(res_state); -void fp_resstat(const res_state, FILE *); -const char * res_hostalias(const res_state, const char *, char *, size_t); -int res_nquery(res_state, const char *, int, int, u_char *, int); -int res_nsearch(res_state, const char *, int, int, u_char *, int); -int res_nquerydomain(res_state, const char *, const char *, - int, int, u_char *, int); -int res_nmkquery(res_state, int, const char *, int, int, - const u_char *, int, const u_char *, - u_char *, int); -int res_nsend(res_state, const u_char *, int, u_char *, int); -int res_nmkupdate(res_state, ns_updrec *, u_char *, int); -void res_nclose(res_state); -int res_nsendsigned(res_state, const u_char *, int, ns_tsig_key *, - u_char *, int); -int dn_comp(const char *, u_char *, int, u_char **, u_char **); -int dn_expand(const u_char *, const u_char *, const u_char *, - char *, int); diff --git a/usr/src/lib/librestart/common/llib-lrestart b/usr/src/lib/librestart/common/llib-lrestart deleted file mode 100644 index e70649f4e9..0000000000 --- a/usr/src/lib/librestart/common/llib-lrestart +++ /dev/null @@ -1,32 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <librestart.h> -#include <librestart_priv.h> diff --git a/usr/src/lib/librpcsvc/common/llib-lrpcsvc b/usr/src/lib/librpcsvc/common/llib-lrpcsvc deleted file mode 100644 index 70b5165b01..0000000000 --- a/usr/src/lib/librpcsvc/common/llib-lrpcsvc +++ /dev/null @@ -1,42 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <rpcsvc/autofs_prot.h> -#include <rpcsvc/bootparam_prot.h> -#include <rpcsvc/mount.h> -#include <rpcsvc/nfs4_prot.h> -#include <rpcsvc/nlm_prot.h> -#include <rpcsvc/rpc_sztypes.h> -#include <rpcsvc/rstat.h> -#include <rpcsvc/ufs_prot.h> - -extern int __clnt_bindresvport(CLIENT *); - diff --git a/usr/src/lib/librsc/Makefile.com b/usr/src/lib/librsc/Makefile.com index a1d16211d3..29b7c98757 100644 --- a/usr/src/lib/librsc/Makefile.com +++ b/usr/src/lib/librsc/Makefile.com @@ -22,6 +22,8 @@ # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# LIBRARY= librsc.a VERS= .1 @@ -40,8 +42,6 @@ LINKED_LIBRSC_DIR = \ $(LINKED_PLATFORMS:%=$(USR_PLAT_DIR)/%/lib/librsc.so) LINKED_LIBRSC1_DIR = \ $(LINKED_PLATFORMS:%=$(USR_PLAT_DIR)/%/lib/librsc.so.1) -LINKED_LLIBLRSC_DIR = \ - $(LINKED_PLATFORMS:%=$(USR_PLAT_DIR)/%/lib/llib-lrsc.ln) # There should be a mapfile here MAPFILES = @@ -53,7 +53,6 @@ LDLIBS += -lc PLATLIBS = $(USR_PLAT_DIR)/$(PLATFORM)/lib/ INS.slink6= $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/librsc.so.1 $@ INS.slink7= $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/librsc.so $@ -INS.slink8= $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/llib-lrsc.ln $@ .KEEP_STATE: @@ -71,8 +70,7 @@ $(PLATLIBS)/librsc.so: install: all $(USR_PSM_LIBS) $(PLATLIBS)/librsc.so \ $(LINKED_DIRS) $(LINKED_LIB_DIRS) \ - $(LINKED_LIBRSC_DIR) $(LINKED_LIBRSC1_DIR) \ - $(LINKED_LLIBLRSC_DIR) + $(LINKED_LIBRSC_DIR) $(LINKED_LIBRSC1_DIR) $(USR_PSM_LIB_DIR)/%: % $(USR_PSM_LIB_DIR) $(INS.file) @@ -89,7 +87,4 @@ $(LINKED_LIBRSC_DIR): $(USR_PLAT_DIR) $(LINKED_LIBRSC1_DIR): $(USR_PLAT_DIR) -$(INS.slink6) -$(LINKED_LLIBLRSC_DIR): $(USR_PLAT_DIR) - -$(INS.slink8) - include $(SRC)/lib/Makefile.targ diff --git a/usr/src/lib/librstp/common/llib-lrstp b/usr/src/lib/librstp/common/llib-lrstp deleted file mode 100644 index e80ecd4156..0000000000 --- a/usr/src/lib/librstp/common/llib-lrstp +++ /dev/null @@ -1,30 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2009 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <stp_in.h> -#include <stp_vectors.h> diff --git a/usr/src/lib/librt/common/llib-lrt b/usr/src/lib/librt/common/llib-lrt deleted file mode 100644 index 0850024175..0000000000 --- a/usr/src/lib/librt/common/llib-lrt +++ /dev/null @@ -1,60 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <aio.h> -#include <mqueue.h> -#include <sched.h> -#include <semaphore.h> - -/* - * NOTE: We list the following interfaces explicitly because the header - * files that they're part of include *lots* of other interfaces - * that are not part of librt. - */ - -int clock_getres(clockid_t, struct timespec *); -int clock_gettime(clockid_t, struct timespec *); -int clock_settime(clockid_t, const struct timespec *); -int fdatasync(int); -int nanosleep(const struct timespec *, struct timespec *); -int shm_open(const char *, int, mode_t); -int shm_unlink(const char *); -int sigwaitinfo(const sigset_t *_RESTRICT_KYWD, siginfo_t *_RESTRICT_KYWD); -int sigtimedwait(const sigset_t *_RESTRICT_KYWD, siginfo_t *_RESTRICT_KYWD, - const struct timespec *_RESTRICT_KYWD); -int sigqueue(pid_t, int, const union sigval); -int timer_create(clockid_t, struct sigevent *_RESTRICT_KYWD, - timer_t *_RESTRICT_KYWD); -int timer_delete(timer_t); -int timer_getoverrun(timer_t); -int timer_gettime(timer_t, struct itimerspec *); -int timer_settime(timer_t, int, const struct itimerspec *_RESTRICT_KYWD, - struct itimerspec *_RESTRICT_KYWD); diff --git a/usr/src/lib/libsasl/lib/llib-lsasl b/usr/src/lib/libsasl/lib/llib-lsasl deleted file mode 100644 index 2246c0a2b1..0000000000 --- a/usr/src/lib/libsasl/lib/llib-lsasl +++ /dev/null @@ -1,52 +0,0 @@ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright 2003 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#ident "%Z%%M% %I% %E% SMI" - -#include <sasl/sasl.h> -#include <sasl/saslplug.h> -#include <sasl/saslutil.h> -#include <sasl/prop.h> - -void *sasl_create_context(void); - -void sasl_free_context(void *context); - -extern int _sasl_server_init(void *ctx, const sasl_callback_t *callbacks, - const char *appname); - -extern int _sasl_server_new(void *ctx, const char *service, - const char *serverFQDN, const char *user_realm, - const char *iplocalport, const char *ipremoteport, - const sasl_callback_t *callbacks, unsigned flags, - sasl_conn_t **pconn); - -extern int _sasl_client_init(void *ctx, - const sasl_callback_t *callbacks); - -extern int _sasl_client_new(void *ctx, - const char *service, - const char *serverFQDN, - const char *iplocalport, - const char *ipremoteport, - const sasl_callback_t *prompt_supp, - unsigned flags, - sasl_conn_t **pconn); - -extern int _sasl_client_add_plugin(void *ctx, - const char *plugname, - sasl_client_plug_init_t *cplugfunc); -extern int _sasl_server_add_plugin(void *ctx, - const char *plugname, - sasl_server_plug_init_t *splugfunc); -extern int _sasl_canonuser_add_plugin(void *ctx, - const char *plugname, - sasl_canonuser_init_t *canonuserfunc); -extern int _sasl_auxprop_add_plugin(void *ctx, - const char *plugname, - sasl_auxprop_init_t *auxpropfunc); diff --git a/usr/src/lib/libsaveargs/common/llib-lsaveargs b/usr/src/lib/libsaveargs/common/llib-lsaveargs deleted file mode 100644 index ef08c73ed8..0000000000 --- a/usr/src/lib/libsaveargs/common/llib-lsaveargs +++ /dev/null @@ -1,17 +0,0 @@ -/* - * This file and its contents are supplied under the terms of the - * Common Development and Distribution License ("CDDL"), version 1.0. - * You may only use this file in accordance with the terms of version - * 1.0 of the CDDL. - * - * A full copy of the text of the CDDL should have accompanied this - * source. A copy of the CDDL is also available via the Internet at - * http://www.illumos.org/license/CDDL. - */ - -/* Copyright 2013, Richard Lowe. */ - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <saveargs.h> diff --git a/usr/src/lib/libscf/common/llib-lscf b/usr/src/lib/libscf/common/llib-lscf deleted file mode 100644 index 0c44db1331..0000000000 --- a/usr/src/lib/libscf/common/llib-lscf +++ /dev/null @@ -1,32 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <libscf.h> -#include <libscf_priv.h> diff --git a/usr/src/lib/libsched/common/llib-lsched b/usr/src/lib/libsched/common/llib-lsched deleted file mode 100644 index 6d4270ee7d..0000000000 --- a/usr/src/lib/libsched/common/llib-lsched +++ /dev/null @@ -1,37 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <schedctl.h> - -/* schedctl.c */ -schedctl_t *schedctl_init(void); -schedctl_t *schedctl_lookup(void); -void schedctl_exit(void); diff --git a/usr/src/lib/libsctp/common/llib-lsctp b/usr/src/lib/libsctp/common/llib-lsctp deleted file mode 100644 index f3ae6aa529..0000000000 --- a/usr/src/lib/libsctp/common/llib-lsctp +++ /dev/null @@ -1,33 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ -/* PROTOLIB1 */ -#include <sys/socket.h> -#include <netinet/in.h> -#include <netinet/sctp.h> diff --git a/usr/src/lib/libsec/common/llib-lsec b/usr/src/lib/libsec/common/llib-lsec deleted file mode 100644 index 36d04ec197..0000000000 --- a/usr/src/lib/libsec/common/llib-lsec +++ /dev/null @@ -1,40 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <grp.h> -#include <pwd.h> -#include <limits.h> -#include <errno.h> -#include <stdlib.h> -#include <string.h> -#include <sys/param.h> -#include <sys/types.h> -#include <sys/acl.h> -#include <aclutils.h> diff --git a/usr/src/lib/libsecdb/common/llib-lsecdb b/usr/src/lib/libsecdb/common/llib-lsecdb deleted file mode 100644 index 4e32c65c2e..0000000000 --- a/usr/src/lib/libsecdb/common/llib-lsecdb +++ /dev/null @@ -1,36 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright (c) 1999, 2001 by Sun Microsystems, Inc. - * All rights reserved. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <auth_attr.h> -#include <exec_attr.h> -#include <prof_attr.h> -#include <user_attr.h> -#include <secdb.h> diff --git a/usr/src/lib/libsendfile/common/llib-lsendfile b/usr/src/lib/libsendfile/common/llib-lsendfile deleted file mode 100644 index 7b708f689f..0000000000 --- a/usr/src/lib/libsendfile/common/llib-lsendfile +++ /dev/null @@ -1,32 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright (c) 2001 by Sun Microsystems, Inc. - * All rights reserved. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <sys/sendfile.h> diff --git a/usr/src/lib/libsff/common/llib-lsff b/usr/src/lib/libsff/common/llib-lsff deleted file mode 100644 index 1636a7e1b0..0000000000 --- a/usr/src/lib/libsff/common/llib-lsff +++ /dev/null @@ -1,19 +0,0 @@ -/* - * This file and its contents are supplied under the terms of the - * Common Development and Distribution License ("CDDL"), version 1.0. - * You may only use this file in accordance with the terms of version - * 1.0 of the CDDL. - * - * A full copy of the text of the CDDL should have accompanied this - * source. A copy of the CDDL is also available via the Internet at - * http://www.illumos.org/license/CDDL. - */ - -/* - * Copyright (c) 2017 Joyent, Inc. - */ - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <libsfp.h> diff --git a/usr/src/lib/libshare/common/llib-lshare b/usr/src/lib/libshare/common/llib-lshare deleted file mode 100644 index d426f1bf58..0000000000 --- a/usr/src/lib/libshare/common/llib-lshare +++ /dev/null @@ -1,32 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include "libshare.h" diff --git a/usr/src/lib/libshell/common/llib-lshell b/usr/src/lib/libshell/common/llib-lshell deleted file mode 100644 index a65fe10ee2..0000000000 --- a/usr/src/lib/libshell/common/llib-lshell +++ /dev/null @@ -1,33 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - * - * lib/libshell/common/llib-lshell - * - */ - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <shell.h> -#include <nval.h> diff --git a/usr/src/lib/libsip/common/llib-lsip b/usr/src/lib/libsip/common/llib-lsip deleted file mode 100644 index 173c2178ea..0000000000 --- a/usr/src/lib/libsip/common/llib-lsip +++ /dev/null @@ -1,31 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ -/* PROTOLIB1 */ -#include <sip.h> diff --git a/usr/src/lib/libsldap/common/llib-lsldap b/usr/src/lib/libsldap/common/llib-lsldap deleted file mode 100644 index 5f59110773..0000000000 --- a/usr/src/lib/libsldap/common/llib-lsldap +++ /dev/null @@ -1,246 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - *Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. - */ - -#include <stdio.h> -#include <sys/types.h> -#include <lber.h> -#include <ldap.h> -#include "ns_sldap.h" - - -/* - * Simplified LDAP Naming APIs - */ -int __ns_ldap_list( - const char *service, - const char *filter, - int (*init_filter_cb)(const ns_ldap_search_desc_t *desc, - char **realfilter, const void *userdata), - const char * const *attribute, - const ns_cred_t *cred, - const int flags, - ns_ldap_result_t ** result, - ns_ldap_error_t ** errorp, - int (*callback)(const ns_ldap_entry_t *entry, const void *userdata), - const void *userdata); - -int __ns_ldap_list_sort( - const char *service, - const char *filter, - const char *sortattr, - int (*init_filter_cb)(const ns_ldap_search_desc_t *desc, - char **realfilter, const void *userdata), - const char * const *attribute, - const ns_cred_t *cred, - const int flags, - ns_ldap_result_t ** result, - ns_ldap_error_t ** errorp, - int (*callback)(const ns_ldap_entry_t *entry, const void *userdata), - const void *userdata); - -int __ns_ldap_addAttr( - const char *service, - const char *dn, - const ns_ldap_attr_t * const *attr, - const ns_cred_t *cred, - const int flags, - ns_ldap_error_t **errorp); - -int __ns_ldap_delAttr( - const char *service, - const char *dn, - const ns_ldap_attr_t * const *attr, - const ns_cred_t *cred, - const int flags, - ns_ldap_error_t **errorp); - -int __ns_ldap_repAttr( - const char *service, - const char *dn, - const ns_ldap_attr_t * const *attr, - const ns_cred_t *cred, - const int flags, - ns_ldap_error_t **errorp); - -int __ns_ldap_addEntry( - const char *service, - const char *dn, - const ns_ldap_entry_t *entry, - const ns_cred_t *cred, - const int flags, - ns_ldap_error_t **errorp); - -int __ns_ldap_addTypedEntry( - const char *servicetype, - const char *basedn, - const void *data, - const int create, - const ns_cred_t *cred, - const int flags, - ns_ldap_error_t **errorp); - -int __ns_ldap_delEntry( - const char *service, - const char *dn, - const ns_cred_t *cred, - const int flags, - ns_ldap_error_t **errorp); - -int __ns_ldap_firstEntry( - const char *service, - const char *filter, - const char *sortattr, - int (*init_filter_cb)(const ns_ldap_search_desc_t *desc, - char **realfilter, const void *userdata), - const char * const *attribute, - const ns_cred_t *cred, - const int flags, - void **cookie, - ns_ldap_result_t ** result, - ns_ldap_error_t **errorp, - const void *userdata); - -int __ns_ldap_nextEntry( - void *cookie, - ns_ldap_result_t ** result, - ns_ldap_error_t **errorp); - -int __ns_ldap_endEntry( - void **cookie, - ns_ldap_error_t **errorp); - -int __ns_ldap_freeResult( - ns_ldap_result_t **result); - -int __ns_ldap_freeError( - ns_ldap_error_t **errorp); - -int __ns_ldap_freeCookie( - void **cookie); - -int __ns_ldap_uid2dn( - const char *uid, - char **userDN, - const ns_cred_t *cred, - ns_ldap_error_t ** errorp); - -int __ns_ldap_host2dn( - const char *host, - const char *domain, - char **hostDN, - const ns_cred_t *cred, - ns_ldap_error_t ** errorp); - -int __ns_ldap_dn2domain( - const char *dn, - char **domain, - const ns_cred_t *cred, - ns_ldap_error_t **errorp); - -int __ns_ldap_auth( - const ns_cred_t *cred, - const int flag, - ns_ldap_error_t **errorp, - LDAPControl **serverctrls, - LDAPControl **clientctrls); - -int __ns_ldap_err2str( - int err, - char **strmsg); - -int __ns_ldap_setParam( - const ParamIndexType type, - const void *data, - ns_ldap_error_t **errorp); - -int __ns_ldap_getParam( - const ParamIndexType type, - void ***data, - ns_ldap_error_t **errorp); - -int __ns_ldap_freeParam( - void ***data); - -char **__ns_ldap_getAttr( - const ns_ldap_entry_t *entry, - const char *attrname); - -int __s_api_prepend_automountmapname_to_dn( - const char *service, - char **basedn, - ns_ldap_error_t ** errorp); - -char *__s_api_get_canonical_name( - ns_ldap_entry_t *entry, - ns_ldap_attr_t *attrptr, - int case_ignore); - -void __ns_ldap_setServer( - int set); - -ns_ldap_error_t *__ns_ldap_LoadConfiguration( - void); - -ns_ldap_error_t *__ns_ldap_DumpConfiguration( - char *file); - -ns_ldap_error_t *__ns_ldap_DumpLdif( - char *filename); - -ns_ldap_error_t *__ns_ldap_print_config( - int verbose); - -void __ns_ldap_default_config( - void); - -int __ns_ldap_download( - const char *profile, - char *addr, - char *baseDN, - ns_ldap_error_t **errorp); - -int __ns_ldap_check_dns_preq( - int foreground, - int mode_verbose, - int mode_quiet, - const char *fname, - ns_ldap_self_gssapi_config_t config, - ns_ldap_error_t **errpp); - -int __ns_ldap_check_gssapi_preq( - int foreground, - int mode_verbose, - int mode_quiet, - ns_ldap_self_gssapi_config_t config, - ns_ldap_error_t **errpp); - -int __ns_ldap_check_all_preq( - int foreground, - int mode_verbose, - int mode_quiet, - ns_ldap_self_gssapi_config_t config, - ns_ldap_error_t **errpp); diff --git a/usr/src/lib/libslp/clib/llib-lslp b/usr/src/lib/libslp/clib/llib-lslp deleted file mode 100644 index c28556bddb..0000000000 --- a/usr/src/lib/libslp/clib/llib-lslp +++ /dev/null @@ -1,80 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright (c) 1999 by Sun Microsystems, Inc. - * All rights reserved. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <slp.h> - -SLPError SLPOpen(const char *pcLang, SLPBoolean isAsync, SLPHandle *phSLP); - -void SLPClose(SLPHandle hSLP); - -SLPError SLPReg(SLPHandle hSLP, const char *pcSrvURL, - const unsigned short usLifetime, - const char *pcSrvType, - const char *pcAttrs, SLPBoolean fresh, - SLPRegReport callback, void *pvUser); - -SLPError SLPDereg(SLPHandle hSLP, const char *pURL, - SLPRegReport callback, void *pvUser); - -SLPError SLPDelAttrs(SLPHandle hSLP, const char *pURL, - const char *pcAttrs, - SLPRegReport callback, void *pvUser); - - -SLPError SLPFindSrvTypes(SLPHandle hSLP, const char *pcNamingAuthority, - const char *pcScopeList, - SLPSrvTypeCallback callback, void *pvUser); - -SLPError SLPFindSrvs(SLPHandle hSLP, const char *pcServiceType, - const char *pcScope, const char *pcSearchFilter, - SLPSrvURLCallback callback, void *pvUser); - -SLPError SLPFindAttrs(SLPHandle hSLP, const char *pcURL, const char *pcScope, - const char *pcAttrIds, - SLPAttrCallback callback, void *pvUser); - -unsigned short SLPGetRefreshInterval(void); - -SLPError SLPFindScopes(SLPHandle hSLP, char **ppcScopes); - -SLPError SLPEscape(const char *pcInbuf, char **ppcOutBuf, SLPBoolean isTag); - -SLPError SLPUnescape(const char *pcInbuf, char **ppcOutBuf, SLPBoolean isTag); - -void SLPSetProperty(const char *pcName, const char *pcValue); - -const char *SLPGetProperty(const char *pcName); - -void SLPFree(void *pvMem); - -SLPError SLPParseSrvURL(char *pcSrvURL, SLPSrvURL** ppSrvURL); - -const char *slp_strerror(SLPError err); diff --git a/usr/src/lib/libsmbfs/smb/llib-lsmbfs b/usr/src/lib/libsmbfs/smb/llib-lsmbfs deleted file mode 100644 index 7459db63be..0000000000 --- a/usr/src/lib/libsmbfs/smb/llib-lsmbfs +++ /dev/null @@ -1,39 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright 2009 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - * - * Copyright 2013 Nexenta Systems, Inc. All rights reserved. - */ - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <netsmb/smbfs_api.h> -#include <netsmb/smbfs_acl.h> - -#include <netsmb/smb_lib.h> -#include <netsmb/smb_keychain.h> -#include <netsmb/smb_rap.h> -#include <netsmb/spnego.h> - diff --git a/usr/src/lib/libsmbios/common/llib-lsmbios b/usr/src/lib/libsmbios/common/llib-lsmbios deleted file mode 100644 index b0c74b31bd..0000000000 --- a/usr/src/lib/libsmbios/common/llib-lsmbios +++ /dev/null @@ -1,32 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <smbios.h> diff --git a/usr/src/lib/libsmedia/library/common/llib-lsmedia b/usr/src/lib/libsmedia/library/common/llib-lsmedia deleted file mode 100644 index a8e1b29217..0000000000 --- a/usr/src/lib/libsmedia/library/common/llib-lsmedia +++ /dev/null @@ -1,31 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright(c) 1997 by Sun Microsystems, Inc. - * All rights reserved. - */ -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <sys/smedia.h> diff --git a/usr/src/lib/libsocket/common/llib-lsocket b/usr/src/lib/libsocket/common/llib-lsocket deleted file mode 100644 index 3e2bc0a167..0000000000 --- a/usr/src/lib/libsocket/common/llib-lsocket +++ /dev/null @@ -1,128 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2010 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ -/* Copyright (c) 2013, OmniTI Computer Consulting, Inc. All rights reserved. */ - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <sys/types.h> -#include <sys/socket.h> -#include <net/if.h> -#include <netinet/in.h> -#include <sys/uio.h> -#include <sys/isa_defs.h> -#include <arpa/inet.h> -#include <sys/ethernet.h> -#include <netdb.h> -#include <net/if_dl.h> -#include <ifaddrs.h> -#include <libsocket_priv.h> - -/* - * usr/src/lib/libsocket/inet routines not prototyped in the above - * header files. - */ - -/* bindresvport.c */ -int bindresvport(int sd, struct sockaddr_in *sin); - -/* bootparams_getbyname.c */ -int bootparams_getbyname(char *name, char *linebuf, int linelen); - -/* inet6_rthdr.c */ -int __inet6_rthdr_add(void *, const struct in6_addr *); -struct in6_addr *__inet6_rthdr_getaddr(void *, int); - -/* netmasks.c */ -int getnetmaskbynet(const struct in_addr net, struct in_addr *mask); - -/* ruserpass.c */ -void _ruserpass(const char *host, char **aname, char **apass); - -/* - * usr/src/lib/libsocket/socket routines - */ - -/* _soutil.c */ - -/* socket.c */ -int socket(int domain, int type, int protocol); -int _socket(int domain, int type, int protocol); -int _socket_bsd(int family, int type, int protocol); -int __xnet_socket(int family, int type, int protocol); - -/* socketpair.c */ -int socketpair(int domain, int type, int protocol, int sv[]); -int _socketpair(int domain, int type, int protocol, int *sv); -int _socketpair_bsd(int domain, int type, int protocol, int *sv); -int __xnet_socketpair(int domain, int type, int protocol, int *sv); - -/* weaks.c */ -int bind(int s, const struct sockaddr *name, socklen_t namelen); -int listen(int s, int backlog); -int accept(int s, struct sockaddr *addr, Psocklen_t addrlen); -int accept4(int s, struct sockaddr *addr, Psocklen_t addrlen, int flags); -int connect(int s, const struct sockaddr *name, socklen_t namelen); -int shutdown(int s, int how); -ssize_t recv(int s, void *buf, size_t len, int flags); -ssize_t recvfrom(int s, void *buf, size_t len, int flags, - struct sockaddr *from, Psocklen_t fromlen); -ssize_t recvmsg(int s, struct msghdr *msg, int flags); -ssize_t send(int s, const void *msg, size_t len, int flags); -ssize_t sendmsg(int s, const struct msghdr *msg, int flags); -ssize_t sendto(int s, const void *msg, size_t len, int flags, - const struct sockaddr *to, socklen_t tolen); -int getpeername(int s, struct sockaddr *name, Psocklen_t namelen); -int getsockname(int s, struct sockaddr *name, Psocklen_t namelen); -int getsockopt(int s, int level, int optname, void *optval, Psocklen_t optlen); -int setsockopt(int s, int level, int optname, const void *optval, socklen_t optlen); - -int _bind(int s, const struct sockaddr *name, int namelen); -int _listen(int s, int backlog); -int _accept(int s, struct sockaddr *addr, int *addrlen); -int _accept4(int s, struct sockaddr *addr, int *addrlen, int flags); -int _connect(int s, struct sockaddr *name, int namelen); -int _shutdown(int s, int how); -int _recv(int s, char *buf, int len, int flags); -int _recvfrom(int s, char *buf, int len, int flags, - struct sockaddr *from, int *fromlen); -int _recvmsg(int s, struct msghdr *msg, int flags); -int _send(int s, const char *msg, int len, int flags); -int _sendmsg(int s, const struct msghdr *msg, int flags); -int _sendto(int s, const char *msg, int len, int flags, - const struct sockaddr *to, int tolen); -int _getpeername(int s, struct sockaddr *name, int *namelen); -int _getsockname(int s, struct sockaddr *name, int *namelen); -int _getsockopt(int s, int level, int optname, char *optval, int *optlen); -int _setsockopt(int s, int level, int optname, const char *optval, int optlen); -int __xnet_bind(int sock, const struct sockaddr *addr, socklen_t addrlen); -int __xnet_listen(int sock, int backlog); -int __xnet_connect(int sock, const struct sockaddr *addr, socklen_t addrlen); -int __xnet_recvmsg(int sock, struct msghdr *msg, int flags); -int __xnet_sendmsg(int sock, const struct msghdr *msg, int flags); -int __xnet_sendto(int sock, const void *buf, size_t len, int flags, - const struct sockaddr *addr, socklen_t addrlen); -int __xnet_getsockopt(int sock, int level, int option_name, - void *option_value, socklen_t *option_lenp); diff --git a/usr/src/lib/libsqlite/Makefile.com b/usr/src/lib/libsqlite/Makefile.com index 3ce5d9b1e4..6ab092d4d1 100644 --- a/usr/src/lib/libsqlite/Makefile.com +++ b/usr/src/lib/libsqlite/Makefile.com @@ -4,6 +4,7 @@ # Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com> # Copyright 2016 Nexenta Systems, Inc. All rights reserved. # Copyright (c) 2018, Joyent, Inc. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # # Make the SO name unlikely to conflict with any other @@ -133,7 +134,7 @@ TESTSRC = \ $(SRCDIR)/test1.c \ $(SRCDIR)/test2.c \ $(SRCDIR)/test3.c \ - $(SRCDIR)/md5.c + $(SRCDIR)/md5.c TESTOBJS = $(TESTSRC:$(SRCDIR)/%.c=%.o) @@ -198,7 +199,6 @@ ENCODING = ISO8859 all: $(LIBS) install: all \ $(ROOTLIBDIR)/$(DYNLIB) \ - $(ROOTLIBDIR)/$(LINTLIB) \ $(ROOTLIBDIR)/$(NATIVERELOC) lint: diff --git a/usr/src/lib/libsqlite/llib-lsqlite-sys b/usr/src/lib/libsqlite/llib-lsqlite-sys deleted file mode 100644 index c4d2f47fd9..0000000000 --- a/usr/src/lib/libsqlite/llib-lsqlite-sys +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include "sqlite.h" -#include "sqlite-misc.h" diff --git a/usr/src/lib/libsrpt/common/llib-lsrpt b/usr/src/lib/libsrpt/common/llib-lsrpt deleted file mode 100644 index c807a7d9f5..0000000000 --- a/usr/src/lib/libsrpt/common/llib-lsrpt +++ /dev/null @@ -1,28 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. - */ - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <libsrpt.h> diff --git a/usr/src/lib/libstmf/common/llib-lstmf b/usr/src/lib/libstmf/common/llib-lstmf deleted file mode 100644 index 73d658b7ff..0000000000 --- a/usr/src/lib/libstmf/common/llib-lstmf +++ /dev/null @@ -1,30 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <libstmf.h> -#include <store.h> diff --git a/usr/src/lib/libstmfproxy/common/llib-lstmfproxy b/usr/src/lib/libstmfproxy/common/llib-lstmfproxy deleted file mode 100644 index 6bf059869c..0000000000 --- a/usr/src/lib/libstmfproxy/common/llib-lstmfproxy +++ /dev/null @@ -1,29 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2009 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <libstmfproxy.h> diff --git a/usr/src/lib/libsum/common/llib-lsum b/usr/src/lib/libsum/common/llib-lsum deleted file mode 100644 index eecd61c3ac..0000000000 --- a/usr/src/lib/libsum/common/llib-lsum +++ /dev/null @@ -1,32 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - * - * lib/libsum/common/llib-lsum - * - */ - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <sum.h> diff --git a/usr/src/lib/libsun_ima/common/llib-lsun_ima b/usr/src/lib/libsun_ima/common/llib-lsun_ima deleted file mode 100644 index dcb4620e72..0000000000 --- a/usr/src/lib/libsun_ima/common/llib-lsun_ima +++ /dev/null @@ -1,31 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2009 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <ima.h> -#include <sys/scsi/adapters/iscsi_if.h> -#include <sys/iscsi_protocol.h> diff --git a/usr/src/lib/libsysevent/llib-lsysevent b/usr/src/lib/libsysevent/llib-lsysevent deleted file mode 100644 index a0cc48b012..0000000000 --- a/usr/src/lib/libsysevent/llib-lsysevent +++ /dev/null @@ -1,148 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/*LINTLIBRARY*/ -/*PROTOLIB1*/ -/* - * Copyright 2009 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - * - * usr/src/lib/libsysevent/llib-lsysevent - */ - -#include <synch.h> -#include <thread.h> -#include "libsysevent.h" - -int sysevent_post_event(char *event_class, char *event_subclass, char *vendor, - char *pub_name, nvlist_t *attr_list, sysevent_id_t *eid); -sysevent_t *sysevent_dup(sysevent_t *ev); - -void sysevent_free(sysevent_t *ev); - -int sysevent_get_attr_list(sysevent_t *ev, nvlist_t **nvlist); - -int sysevent_lookup_attr(sysevent_t *ev, char *name, int datatype, - sysevent_value_t *se_value); - -sysevent_attr_t *sysevent_attr_next(sysevent_t *ev, sysevent_attr_t *attr); - -char *sysevent_attr_name(sysevent_attr_t *attr); - -int sysevent_attr_value(sysevent_attr_t *attr, sysevent_value_t *se_value); - -int sysevent_get_class(sysevent_t *ev); - -char *sysevent_get_class_name(sysevent_t *ev); - -int sysevent_get_subclass(sysevent_t *ev); - -char *sysevent_get_subclass_name(sysevent_t *ev); - -char *sysevent_get_pub(sysevent_t *ev); - -char *sysevent_get_vendor_name(sysevent_t *ev); - -char *sysevent_get_pub_name(sysevent_t *ev); - -void sysevent_get_pid(sysevent_t *ev, pid_t *pid); - -uint64_t sysevent_get_seq(sysevent_t *ev); - -void sysevent_get_time(sysevent_t *ev, hrtime_t *etime); - -size_t sysevent_get_size(sysevent_t *ev); - -int sysevent_send_event(sysevent_handle_t *sysevent_hdl, sysevent_t *ev); - -sysevent_t * sysevent_alloc_event(char *event_class, char *event_subclass, - char *vendor, char *pub_name, nvlist_t *attr_list); - -sysevent_handle_t * sysevent_open_channel(const char *channel); - -sysevent_handle_t * sysevent_open_channel_alt(const char *channel_path); - -void sysevent_close_channel(sysevent_handle_t *shp); - -int sysevent_bind_subscriber(sysevent_handle_t *shp, - void (*callback)(sysevent_t *data)); - -int sysevent_bind_publisher(sysevent_handle_t *shp); - -void sysevent_unbind_subscriber(sysevent_handle_t *shp); - -void sysevent_unbind_publisher(sysevent_handle_t *shp); - -int sysevent_register_event(sysevent_handle_t *shp, const char *event_class, - const char **event_subclass_list, int num_subclasses); - -void sysevent_unregister_event(sysevent_handle_t *shp, - const char *event_class); - -void sysevent_cleanup_publishers(sysevent_handle_t *shp); - -void sysevent_cleanup_subscribers(sysevent_handle_t *shp); - -sysevent_handle_t *sysevent_bind_handle(void (*event_handler)(sysevent_t *ev)); - -void sysevent_unbind_handle(sysevent_handle_t *shp); - -int sysevent_subscribe_event(sysevent_handle_t *shp, const char *event_class, - const char **event_subclass_list, int num_subclasses); - -void sysevent_unsubscribe_event(sysevent_handle_t *shp, - const char *event_class); - -void se_print(FILE *fp, sysevent_t *ev); - -int sysevent_evc_bind(const char *channel_path, evchan_t **scpp, - uint32_t flags); - -int sysevent_evc_unbind(evchan_t *scp); - -int sysevent_evc_publish(evchan_t *scp, const char *event_class, - const char *event_subclass, const char *vendor, const char *pub_name, - nvlist_t *attr_list, uint32_t flags); - -int sysevent_evc_subscribe(evchan_t *scp, const char *sid, - const char *event_class, - int (*event_handler)(sysevent_t *ev, void *cookie), - void *cookie, uint32_t flags); -int sysevent_evc_xsubscribe(evchan_t *scp, const char *sid, - const char *event_class, - int (*event_handler)(sysevent_t *ev, void *cookie), - void *cookie, uint32_t flags, - sysevent_subattr_t *xs); - -int sysevent_evc_unsubscribe(evchan_t *scp, const char *sid); - -int sysevent_evc_control(evchan_t *scp, int cmd, ...); - -sysevent_subattr_t *sysevent_subattr_alloc(void); -void sysevent_subattr_free(sysevent_subattr_t *attr); - -void sysevent_subattr_thrcreate(sysevent_subattr_t *attr, - door_xcreate_server_func_t *func, void *cookie); -void sysevent_subattr_thrsetup(sysevent_subattr_t *attr, - door_xcreate_thrsetup_func_t *func, void *cookie); - -void sysevent_subattr_thrattr(sysevent_subattr_t *attr, - pthread_attr_t *thrattr); - diff --git a/usr/src/lib/libtecla/common/llib-ltecla b/usr/src/lib/libtecla/common/llib-ltecla deleted file mode 100644 index 31cf03ec92..0000000000 --- a/usr/src/lib/libtecla/common/llib-ltecla +++ /dev/null @@ -1,32 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <libtecla.h> diff --git a/usr/src/lib/libtermcap/common/llib-ltermcap b/usr/src/lib/libtermcap/common/llib-ltermcap deleted file mode 100644 index 5ca6ced455..0000000000 --- a/usr/src/lib/libtermcap/common/llib-ltermcap +++ /dev/null @@ -1,16 +0,0 @@ -/* - * This file and its contents are supplied under the terms of the - * Common Development and Distribution License ("CDDL"), version 1.0. - * You may only use this file in accordance with the terms of version - * 1.0 of the CDDL. - * - * A full copy of the text of the CDDL should have accompanied this - * source. A copy of the CDDL is also available via the Internet at - * http://www.illumos.org/license/CDDL. - */ - -/* - * Copyright 2011 Nexenta Systems, Inc. All rights reserved. - */ - -#include <termcap.h> diff --git a/usr/src/lib/libthread/common/llib-lthread b/usr/src/lib/libthread/common/llib-lthread deleted file mode 100644 index dc50169c18..0000000000 --- a/usr/src/lib/libthread/common/llib-lthread +++ /dev/null @@ -1,32 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright (c) 1999 by Sun Microsystems, Inc. - * All rights reserved. - */ -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <thread.h> -#include <pthread.h> diff --git a/usr/src/lib/libtsnet/common/llib-ltsnet b/usr/src/lib/libtsnet/common/llib-ltsnet deleted file mode 100644 index 4dbadf3b68..0000000000 --- a/usr/src/lib/libtsnet/common/llib-ltsnet +++ /dev/null @@ -1,32 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <libtsnet.h> diff --git a/usr/src/lib/libtsol/common/llib-ltsol b/usr/src/lib/libtsol/common/llib-ltsol deleted file mode 100644 index 1d4acc5a3a..0000000000 --- a/usr/src/lib/libtsol/common/llib-ltsol +++ /dev/null @@ -1,35 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <tsol/label.h> -#include <sys/tsol/label.h> -#include <sys/tsol/priv.h> -#include <sys/tsol/label_macro.h> diff --git a/usr/src/lib/libumem/common/llib-lumem b/usr/src/lib/libumem/common/llib-lumem deleted file mode 100644 index b00bef5b0f..0000000000 --- a/usr/src/lib/libumem/common/llib-lumem +++ /dev/null @@ -1,32 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ -/* - * Copyright 2000-2002 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <sys/vmem.h> -#include <umem.h> diff --git a/usr/src/lib/libuuid/common/llib-luuid b/usr/src/lib/libuuid/common/llib-luuid deleted file mode 100644 index 04ee51367d..0000000000 --- a/usr/src/lib/libuuid/common/llib-luuid +++ /dev/null @@ -1,47 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright 2002 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <sys/uuid.h> -#include <pkginfo.h> - -/* - * usr/src/lib/libuuid - */ -/* main.c */ -void uuid_clear(uuid_t); -int uuid_compare(uuid_t, uuid_t); -void uuid_copy(uuid_t, uuid_t); -void uuid_generate(uuid_t); -void uuid_generate_random(uuid_t); -void uuid_generate_time(uuid_t); -int uuid_is_null(uuid_t); -int uuid_parse(char *, uuid_t); -time_t uuid_time(uuid_t, struct timeval *); -void uuid_unparse(uuid_t, char *); diff --git a/usr/src/lib/libuutil/common/llib-luutil b/usr/src/lib/libuutil/common/llib-luutil deleted file mode 100644 index d53a365a1d..0000000000 --- a/usr/src/lib/libuutil/common/llib-luutil +++ /dev/null @@ -1,31 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/*LINTLIBRARY*/ -/*PROTOLIB1*/ -/* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <libuutil.h> diff --git a/usr/src/lib/libv12n/common/llib-lv12n b/usr/src/lib/libv12n/common/llib-lv12n deleted file mode 100644 index 904f11528d..0000000000 --- a/usr/src/lib/libv12n/common/llib-lv12n +++ /dev/null @@ -1,29 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2010 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include "libv12n.h" diff --git a/usr/src/lib/libvolmgt/common/llib-lvolmgt b/usr/src/lib/libvolmgt/common/llib-lvolmgt deleted file mode 100644 index 1f12243534..0000000000 --- a/usr/src/lib/libvolmgt/common/llib-lvolmgt +++ /dev/null @@ -1,63 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <dirent.h> -#include <string.h> -#include <errno.h> -#include <limits.h> -#include <unistd.h> -#include <volmgt.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <sys/param.h> - -/* volmgt_fsi.c */ -int volmgt_acquire(char *, char *, int, char **, pid_t *); -int volmgt_release(char *); - -/* volattr.c */ -char *media_getattr(char *, char *); -int media_setattr(char *, char *, char *); -u_longlong_t media_getid(char *); - -/* volname.c */ -char *media_findname(char *); - -/* volutil.c */ -int volmgt_check(char *); -int volmgt_inuse(char *); -int volmgt_ownspath(char *); -const char *volmgt_root(void); -int volmgt_running(void); -char *volmgt_symdev(char *); -char *volmgt_symname(char *); -int volmgt_feature_enabled(char *); diff --git a/usr/src/lib/libvrrpadm/common/llib-lvrrpadm b/usr/src/lib/libvrrpadm/common/llib-lvrrpadm deleted file mode 100644 index 2e56d8a8ef..0000000000 --- a/usr/src/lib/libvrrpadm/common/llib-lvrrpadm +++ /dev/null @@ -1,30 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2009 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <libvrrpadm.h> -#include <netinet/vrrp.h> diff --git a/usr/src/lib/libvscan/common/llib-lvscan b/usr/src/lib/libvscan/common/llib-lvscan deleted file mode 100644 index edddd485fa..0000000000 --- a/usr/src/lib/libvscan/common/llib-lvscan +++ /dev/null @@ -1,31 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <libvscan.h> diff --git a/usr/src/lib/libwrap/llib-lwrap b/usr/src/lib/libwrap/llib-lwrap deleted file mode 100644 index 8baf1289f8..0000000000 --- a/usr/src/lib/libwrap/llib-lwrap +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright (c) 2001 by Sun Microsystems, Inc. - * All rights reserved. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <tcpd.h> - -extern int hosts_access(struct request_info *); -extern void sock_host(struct request_info *); -extern char *eval_hostname(struct host_info *); -extern char *eval_client(struct request_info *); diff --git a/usr/src/lib/libxcurses/src/libc/llib-lcurses b/usr/src/lib/libxcurses/src/libc/llib-lcurses deleted file mode 100644 index 958ff09f7f..0000000000 --- a/usr/src/lib/libxcurses/src/libc/llib-lcurses +++ /dev/null @@ -1,1040 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright (c) 1996, by Sun Microsystems, Inc. - * All rights reserved. - */ - -#ident "%Z%%M% %I% %E% SMI" - -#include <curses.h> -#include <term.h> - -/* - * lib/libxcurses/src/libc/xcurses routines - */ - -/* - * add_wch.c - */ -int add_wch(const cchar_t *); -int mvadd_wch(int, int, const cchar_t *); -int mvwadd_wch(WINDOW *, int, int, const cchar_t *); - -/* - * addch.c - */ -int addch(chtype); -int mvaddch(int, int, chtype); -int mvwaddch(WINDOW *, int, int, chtype); - -/* - * addchn.c - */ -int addchnstr(const chtype *, int); -int mvaddchnstr(int, int, const chtype *, int); -int mvwaddchnstr(WINDOW *, int, int, const chtype *, int); -int addchstr(const chtype *); -int mvaddchstr(int, int, const chtype *); -int mvwaddchstr(WINDOW *, int, int, const chtype *); -int waddchstr(WINDOW *, const chtype *); - -/* - * addnstr.c - */ -int addnstr(const char *, int); -int mvaddnstr(int, int, const char *, int); -int mvwaddnstr(WINDOW *, int, int, const char *, int); -int addstr(const char *); -int mvaddstr(int, int, const char *); -int mvwaddstr(WINDOW *, int, int, const char *); -int waddstr(WINDOW *, const char *); - -/* - * addnws.c - */ -int addnwstr(const wchar_t *, int); -int mvaddnwstr(int, int, const wchar_t *, int); -int mvwaddnwstr(WINDOW *, int, int, const wchar_t *, int); -int addwstr(const wchar_t *); -int mvaddwstr(int, int, const wchar_t *); -int mvwaddwstr(WINDOW *, int, int, const wchar_t *); -int waddwstr(WINDOW *, const wchar_t *); - -/* - * addwchn.c - */ -int add_wchnstr(const cchar_t *, int); -int mvadd_wchnstr(int, int, const cchar_t *, int); -int mvwadd_wchnstr(WINDOW *, int, int, const cchar_t *, int); -int add_wchstr(const cchar_t *); -int mvadd_wchstr(int, int, const cchar_t *); -int mvwadd_wchstr(WINDOW *, int, int, const cchar_t *); -int wadd_wchstr(WINDOW *, const cchar_t *); - -/* - * attr_on.c - */ -int attr_on(attr_t, void *); -int attr_off(attr_t, void *); -int attr_set(attr_t, short, void *); -int color_set(short, void *); -int attr_get(attr_t *, short *, void *); -int standout(void); -int standend(void); - -/* - * attron.c - */ -int attron(int); -int attroff(int); -int attrset(int); -chtype COLOR_PAIR(short); -short PAIR_NUMBER(chtype); - -/* - * baudrate.c - */ -int baudrate(void); - -/* - * beep.c - */ -int beep(void); -int flash(void); - -/* - * bkgd.c - */ -int bkgd(chtype); -int wbkgd(WINDOW *, chtype); - -/* - * bkgdset.c - */ -int bkgdset(chtype); -int wbkgdset(WINDOW *, chtype); -chtype getbkgd(WINDOW *); - -/* - * bkgrnd.c - */ -int bkgrnd(const cchar_t *); - -/* - * bkgrndst.c - */ -void bkgrndset(const cchar_t *); -void wbkgrndset(WINDOW *, const cchar_t *); -int getbkgrnd(cchar_t *); -int wgetbkgrnd(WINDOW *, cchar_t *); - -/* - * box.c - */ -int box(WINDOW *, chtype, chtype); - -/* - * box_set.c - */ -int box_set(WINDOW *, const cchar_t *, const cchar_t *); - -/* - * brdr.c - */ -int border(chtype, chtype, chtype, chtype, chtype, chtype, chtype, chtype); - -/* - * brdr_st.c - */ -int border_set(const cchar_t *, const cchar_t *, - const cchar_t *, const cchar_t *, - const cchar_t *, const cchar_t *, - const cchar_t *, const cchar_t *); - -/* - * cbreak.c - */ -int cbreak(void); -int nocbreak(void); -int halfdelay(int); -int raw(void); -int noraw(void); - -/* - * chgat.c - */ -int chgat(int, attr_t, short, const void *); -int mvchgat(int, int, int, attr_t, short, const void *); -int mvwchgat(WINDOW *, int, int, int, attr_t, short, const void *); - -/* - * clear.c - */ -int clear(void); -int erase(void); - -/* - * clearok.c - */ -int clearok(WINDOW *, bool); -void immedok(WINDOW *, bool); -int leaveok(WINDOW *, bool); -int notimeout(WINDOW *, bool); -int scrollok(WINDOW *, bool); - -/* - * clrbot.c - */ -int clrtobot(void); - -/* - * clreol.c - */ -int clrtoeol(void); - -/* - * color.c - */ -int start_color(void); -int init_color(short, short, short, short); -int init_pair(short, short, short); -int color_content(short, short *, short *, short *); -int pair_content(short, short *, short *); - -/* - * copywin.c - */ -int copywin(const WINDOW *, WINDOW *, int, int, int, int, int, int, int); - -/* - * curs_set.c - */ -int curs_set(int); - -/* - * delay.c - */ -int delay_output(int); - -/* - * delch.c - */ -int delch(void); -int mvdelch(int, int); -int mvwdelch(WINDOW *, int, int); - -/* - * deleteln.c - */ -int deleteln(void); -int insertln(void); -int insdelln(int); -int wdeleteln(WINDOW *); -int winsertln(WINDOW *); - -/* - * doupdate.c - */ -int doupdate(void); -void idcok(WINDOW *, bool); -int idlok(WINDOW *, bool); - -/* - * dupwin.c - */ -WINDOW *dupwin(WINDOW *); - -/* - * echo_wch.c - */ -int echo_wchar(const cchar_t *); -int wecho_wchar(WINDOW *, const cchar_t *); - -/* - * echochar.c - */ -int echochar(chtype); -int wechochar(WINDOW *, chtype); - -/* - * endwin.c - */ -int endwin(void); - -/* - * flushinp.c - */ -int flushinp(void); - -/* - * get_wch.c - */ -int get_wch(wint_t *); -int mvget_wch(int , int, wint_t *); -int mvwget_wch(WINDOW *, int, int, wint_t *); - -/* - * getcchar.c - */ -int getcchar(const cchar_t *, wchar_t *, attr_t *, short *, void *); - -/* - * getch.c - */ -int getch(void); -int mvgetch(int, int); -int mvwgetch(WINDOW *, int, int); - -/* - * getn_ws.c - */ -int getn_wstr(wint_t *, int); -int mvgetn_wstr(int, int, wint_t *, int); -int mvwgetn_wstr(WINDOW *, int, int, wint_t *, int); -int get_wstr(wint_t *); -int mvget_wstr(int, int, wint_t *); -int mvwget_wstr(WINDOW *, int, int, wint_t *); -int wget_wstr(WINDOW *, wint_t *); - -/* - * getnstr.c - */ -int getnstr(char *, int); -int mvgetnstr(int, int, char *, int); -int mvwgetnstr(WINDOW *, int, int, char *, int); -int getstr(char *); -int mvgetstr(int, int, char *); -int mvwgetstr(WINDOW *, int, int, char *); -int wgetstr(WINDOW *, char *); - -/* - * getwin.c - */ -WINDOW *getwin(FILE *); -int putwin(WINDOW *, FILE *); - -/* - * has.c - */ -bool has_colors(void); -bool has_ic(void); -bool has_il(void); -bool can_change_color(void); - -/* - * hln.c - */ -int hline(chtype, int); -int mvhline(int, int, chtype, int); -int mvwhline(WINDOW *, int, int, chtype, int); -int vline(chtype, int); -int mvvline(int, int, chtype, int); -int mvwvline(WINDOW *, int, int, chtype, int); - -/* - * hln_st.c - */ -int hline_set(const cchar_t *, int); -int mvhline_set(int, int, const cchar_t *, int); -int mvwhline_set(WINDOW *, int, int, const cchar_t *, int); -int vline_set(const cchar_t *, int); -int mvvline_set(int, int, const cchar_t *, int); -int mvwvline_set(WINDOW *, int, int, const cchar_t *, int); - -/* - * in_wch.c - */ -int in_wch(cchar_t *); -int mvin_wch(int, int, cchar_t *); -int mvwin_wch(WINDOW *, int, int, cchar_t *); - -/* - * in_wchn.c - */ -int in_wchnstr(cchar_t *, int); -int mvin_wchnstr(int, int, cchar_t *, int); -int mvwin_wchnstr(WINDOW *, int, int, cchar_t *, int); -int in_wchstr(cchar_t *); -int mvin_wchstr(int, int, cchar_t *); -int mvwin_wchstr(WINDOW *, int, int, cchar_t *); -int win_wchstr(WINDOW *, cchar_t *); - -/* - * inch.c - */ -chtype inch(void); -chtype mvinch(int, int); -chtype mvwinch(WINDOW *, int, int); - -/* - * inchn.c - */ -int inchnstr(chtype *, int); -int mvinchnstr(int, int, chtype *, int); -int mvwinchnstr(WINDOW *, int, int, chtype *, int); -int inchstr(chtype *); -int mvinchstr(int, int, chtype *); -int mvwinchstr(WINDOW *, int, int, chtype *); -int winchstr(WINDOW *, chtype *); - -/* - * initscr.c - */ -WINDOW *initscr(void); - -/* - * innstr.c - */ -int innstr(char *, int); -int mvinnstr(int, int, char *, int); -int mvwinnstr(WINDOW *, int, int, char *, int); -int instr(char *); -int mvinstr(int, int, char *); -int mvwinstr(WINDOW *, int, int, char *); -int winstr(WINDOW *, char *); - -/* - * innwstr.c - */ -int innwstr(wchar_t *, int); -int mvinnwstr(int, int, wchar_t *, int); -int mvwinnwstr(WINDOW *, int, int, wchar_t *, int); -int inwstr(wchar_t *); -int mvinwstr(int, int, wchar_t *); -int mvwinwstr(WINDOW *, int, int, wchar_t *); -int winwstr(WINDOW *, wchar_t *); - -/* - * ins_nws.c - */ -int ins_nwstr(const wchar_t *, int); -int mvins_nwstr(int, int, const wchar_t *, int); -int mvwins_nwstr(WINDOW *, int, int, const wchar_t *, int); -int ins_wstr(const wchar_t *); -int mvins_wstr(int, int, const wchar_t *); -int mvwins_wstr(WINDOW *, int, int, const wchar_t *); -int wins_wstr(WINDOW *, const wchar_t *); - -/* - * ins_wch.c - */ -int ins_wch(const cchar_t *); -int mvins_wch(int, int, const cchar_t *); -int mvwins_wch(WINDOW *, int, int, const cchar_t *); - -/* - * insch.c - */ -int insch(chtype); -int mvinsch(int, int, chtype); -int mvwinsch(WINDOW *, int, int, chtype); - -/* - * insnstr.c - */ -int insnstr(const char *, int); -int mvinsnstr(int, int, const char *, int); -int mvwinsnstr(WINDOW *, int, int, const char *, int); -int insstr(const char *); -int mvinsstr(int, int, const char *); -int mvwinsstr(WINDOW *, int, int, const char *); -int winsstr(WINDOW *, const char *); - -/* - * intrflsh.c - */ -int intrflush(WINDOW *, bool); - -/* - * isendwin.c - */ -bool isendwin(void); - -/* - * key_name.c - */ -const char *key_name(wchar_t); - -/* - * keyname.c - */ -const char *keyname(int); - -/* - * keypad.c - */ -int keypad(WINDOW *, bool); - -/* - * killchar.c - */ -int erasechar(void); -int killchar(void); - -/* - * killwch.c - */ -int erasewchar(wchar_t *); -int killwchar(wchar_t *); - -/* - * longname.c - */ -char *longname(void); -char *termname(void); - -/* - * meta.c - */ -int meta(WINDOW *, bool); - -/* - * move.c - */ -int move(int, int); - -/* - * mvcur.c - */ -int mvcur(int, int, int, int); - -/* - * mvwin.c - */ -int mvwin(WINDOW *, int, int); -int mvderwin(WINDOW *, int, int); - -/* - * napms.c - */ -int napms(int); - -/* - * newpad.c - */ -WINDOW *newpad(int, int); -WINDOW *subpad(WINDOW *, int, int, int, int); - -/* - * newterm.c - */ -void filter(void); -void tstp(int); -int ripoffline(int, int (*)(WINDOW *, int)); -SCREEN *newterm(char *, FILE *, FILE *); -void delscreen(SCREEN *); -SCREEN *set_term(SCREEN *); -int typeahead(int); - -/* - * newwin.c - */ -int delwin(WINDOW *); -WINDOW *derwin(WINDOW *, int, int, int, int); -WINDOW *newwin(int, int, int, int); -WINDOW *subwin(WINDOW *, int, int, int, int); - -/* - * noecho.c - */ -int echo(void); -int noecho(void); - -/* - * nonl.c - */ -int nl(void); -int nonl(void); - -/* - * overlay.c - */ -int overlay(const WINDOW *, WINDOW *); -int overwrite(const WINDOW *, WINDOW *); - -/* - * pecho_wc.c - */ -int pecho_wchar(WINDOW *, const cchar_t *); - -/* - * pechoch.c - */ -int pechochar(WINDOW *, chtype); - -/* - * prefresh.c - */ -int prefresh(WINDOW *, int, int, int, int, int, int); -int pnoutrefresh(WINDOW *, int, int, int, int, int, int); - -/* - * printw.c - */ -int printw(const char *, ...); -int mvprintw(int, int, const char *, ...); -int mvwprintw(WINDOW *, int, int, const char *, ...); -int wprintw(WINDOW *, const char *, ...); - -/* - * qiflush.c - */ -void qiflush(void); -void noqiflush(void); - -/* - * redraw.c - */ -int redrawwin(WINDOW *); - -/* - * refresh.c - */ -int refresh(void); - -/* - * savetty.c - */ -int savetty(void); -int resetty(void); - -/* - * scanw.c - */ -int scanw(const char *, ...); -int mvscanw(int, int, const char *, ...); -int mvwscanw(WINDOW *, int, int, const char *, ...); -int wscanw(WINDOW *, const char *, ...); - -/* - * scr_dump.c - */ -int scr_dump(const char *); -int scr_restore(const char *); -int scr_init(const char *); -int scr_set(const char *); - -/* - * scrl.c - */ -int scroll(WINDOW *); -int scrl(int); - -/* - * scrreg.c - */ -int setscrreg(int, int); - -/* - * setcchar.c - */ -int setcchar(cchar_t *, const wchar_t *, attr_t, short, const void *); - -/* - * setup.c - */ -void use_env(bool); -int setupterm(const char *, int, int *); -int del_curterm(TERMINAL *); -TERMINAL *set_curterm(TERMINAL *); -int restartterm(const char *, int, int *); -int def_shell_mode(void); -int def_prog_mode(void); -int reset_shell_mode(void); -int reset_prog_mode(void); - -/* - * slk.c - */ -int slk_init(int); -int slk_attron(const chtype); -int slk_attroff(const chtype); -int slk_attrset(const chtype); -int slk_attr_off(const attr_t, void *); -int slk_attr_on(const attr_t, void *); -int slk_attr_set(const attr_t, short, void *); -int slk_color(short); -int slk_touch(void); -int slk_clear(void); -int slk_restore(void); -int slk_noutrefresh(void); -int slk_refresh(void); -char *slk_label(int); -int slk_set(int, const char *, int); -int slk_wset(int, const wchar_t *, int); -int slk_color_set(short); - -/* - * termattr.c - */ -chtype termattrs(void); -attr_t term_attrs(void); - -/* - * tgetent.c - */ -int tgetent(char *, char *); - -/* - * tgetflag.c - */ -int tgetflag(const char *); - -/* - * tgetnum.c - */ -int tgetnum(const char *); - -/* - * tgetstr.c - */ -char *tgetstr(const char *, char **); - -/* - * tgoto.c - */ -char *tgoto(const char *, int, int); - -/* - * tigetfla.c - */ -int tigetflag(const char *); - -/* - * tigetnum.c - */ -int tigetnum(const char *); - -/* - * tigetstr.c - */ -char *tigetstr(const char *); - -/* - * timeout.c - */ -int nodelay(WINDOW *, bool); -void timeout(int); - -/* - * touched.c - */ -bool is_linetouched(WINDOW *, int); -bool is_wintouched(WINDOW *); - -/* - * touchwin.c - */ -int touchwin(WINDOW *); -int untouchwin(WINDOW *); -int touchline(WINDOW *, int, int); - -/* - * unctrl.c - */ -const char *unctrl(chtype); - -/* - * vid_attr.c - */ -int vid_attr(attr_t, short, void *); - -/* - * vid_puts.c - */ -int vid_puts(attr_t, short, void *, int (*)(int)); - -/* - * vidattr.c - */ -int vidattr(chtype); -int vidputs(chtype, int (*)(int)); - -/* - * vw_print.c - */ -#if defined(sun) -int vw_printw(WINDOW *, const char *, __va_list); -#else -int vw_printw(WINDOW *, const char *, void *); -#endif - -/* - * vw_scanw.c - */ -#if defined(sun) -int vw_scanw(WINDOW *, const char *, __va_list); -#else -int vw_scanw(WINDOW *, const char *, void *); -#endif - -/* - * vwprintw.c - */ -#if defined(sun) -int vwprintw(WINDOW *, const char *, __va_list); -#else -int vwprintw(WINDOW *, const char *, void *); -#endif - -/* - * vwscanw.c - */ -#if defined(sun) -int vwscanw(WINDOW *, const char *, __va_list); -#else -int vwscanw(WINDOW *, const char *, void *); -#endif - -/* - * wadd_wch.c - */ -int wadd_wch(WINDOW *, const cchar_t *); - -/* - * waddch.c - */ -int waddch(WINDOW *, chtype); - -/* - * waddchn.c - */ -int waddchnstr(WINDOW *, const chtype *, int); - -/* - * waddnstr.c - */ -int waddnstr(WINDOW *, const char *, int); - -/* - * waddnws.c - */ -int waddnwstr(WINDOW *, const wchar_t *, int); - -/* - * waddwchn.c - */ -int wadd_wchnstr(WINDOW *, const cchar_t *, int); - -/* - * wattr_on.c - */ -int wattr_on(WINDOW *, attr_t, void *); -int wattr_off(WINDOW *, attr_t, void *); -int wattr_set(WINDOW *, attr_t, short, void *); -int wattr_get(WINDOW *, attr_t *, short *, void *); -int wcolor_set(WINDOW *, short, void *); -int wstandout(WINDOW *); -int wstandend(WINDOW *); - -/* - * wattron.c - */ -int wattron(WINDOW *, int); -int wattroff(WINDOW *, int); -int wattrset(WINDOW *, int); - -/* - * wbkgrnd.c - */ -int wbkgrnd(WINDOW *, const cchar_t *); - -/* - * wbrdr.c - */ -int wborder(WINDOW *, chtype, chtype, chtype, chtype, - chtype, chtype, chtype, chtype); - -/* - * wbrdr_st.c - */ -int wborder_set(WINDOW *, const cchar_t *, const cchar_t *, - const cchar_t *, const cchar_t *, const cchar_t *, const cchar_t *, - const cchar_t *, const cchar_t *); - -/* - * wchgat.c - */ -int wchgat(WINDOW *, int, attr_t, short, const void *); - -/* - * wclear.c - */ -int wclear(WINDOW *); -int werase(WINDOW *); - -/* - * wclrbot.c - */ -int wclrtobot(WINDOW *); - -/* - * wclreol.c - */ -int wclrtoeol(WINDOW *); - -/* - * wdelch.c - */ -int wdelch(WINDOW *); - -/* - * wget_wch.c - */ -int unget_wch(const wchar_t); -int wget_wch(WINDOW *, wint_t *); - -/* - * wgetch.c - */ -int ungetch(int); -int wgetch(WINDOW *); - -/* - * wgetn_ws.c - */ -int wgetnstr(WINDOW *, char *, int); -int wgetn_wstr(WINDOW *, wint_t *, int); - -/* - * whln.c - */ -int whline(WINDOW *, chtype, int); -int wvline(WINDOW *, chtype, int); - -/* - * whln_st.c - */ -int whline_set(WINDOW *, const cchar_t *, int); -int wvline_set(WINDOW *, const cchar_t *, int); - -/* - * win_wch.c - */ -int win_wch(WINDOW *, cchar_t *); - -/* - * win_wchn.c - */ -int win_wchnstr(WINDOW *, cchar_t *, int); - -/* - * winch.c - */ -chtype winch(WINDOW *); - -/* - * winchn.c - */ -int winchnstr(WINDOW *, chtype *, int); - -/* - * winnstr.c - */ -int winnstr(WINDOW *, char *, int); - -/* - * winnwstr.c - */ -int winnwstr(WINDOW *, wchar_t *, int); - -/* - * wins_nws.c - */ -int wins_nwstr(WINDOW *, const wchar_t *, int); - -/* - * wins_wch.c - */ -int wins_wch(WINDOW *, const cchar_t *); - -/* - * winsch.c - */ -int winsch(WINDOW *, chtype); - -/* - * winsdel.c - */ -int winsdelln(WINDOW *, int); - -/* - * winsnstr.c - */ -int winsnstr(WINDOW *, const char *, int); - -/* - * wmove.c - */ -int wmove(WINDOW *, int, int); - -/* - * wredraw.c - */ -int wredrawln(WINDOW *, int, int); - -/* - * wrefresh.c - */ -int wrefresh(WINDOW *); -int wnoutrefresh(WINDOW *); - -/* - * wscrl.c - */ -int wscrl(WINDOW *, int); - -/* - * wscrreg.c - */ -int wsetscrreg(WINDOW *, int, int); - -/* - * wsyncdn.c - */ -void wsyncdown(WINDOW *); - -/* - * wsyncup.c - */ -int syncok(WINDOW *, bool); -void wsyncup(WINDOW *); -void wcursyncup(WINDOW *); - -/* - * wtimeout.c - */ -void wtimeout(WINDOW *, int); - -/* - * wtouchln.c - */ -int wtouchln(WINDOW *, int, int, int); - -/* - * wunctrl.c - */ -const wchar_t *wunctrl(const cchar_t *); diff --git a/usr/src/lib/libxcurses/src/libc/llib-lxcurses b/usr/src/lib/libxcurses/src/libc/llib-lxcurses deleted file mode 100644 index 6e12cda501..0000000000 --- a/usr/src/lib/libxcurses/src/libc/llib-lxcurses +++ /dev/null @@ -1,1024 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright (c) 1996, by Sun Microsystems, Inc. - * All rights reserved. - */ - -#ident "%Z%%M% %I% %E% SMI" - -#include <curses.h> -#include <term.h> - -/* - * lib/libxcurses/src/libc/xcurses routines - */ - -/* - * add_wch.c - */ -int add_wch(const cchar_t *); -int mvadd_wch(int, int, const cchar_t *); -int mvwadd_wch(WINDOW *, int, int, const cchar_t *); - -/* - * addch.c - */ -int addch(chtype); -int mvaddch(int, int, chtype); -int mvwaddch(WINDOW *, int, int, chtype); - -/* - * addchn.c - */ -int addchnstr(const chtype *, int); -int mvaddchnstr(int, int, const chtype *, int); -int mvwaddchnstr(WINDOW *, int, int, const chtype *, int); -int addchstr(const chtype *); -int mvaddchstr(int, int, const chtype *); -int mvwaddchstr(WINDOW *, int, int, const chtype *); -int waddchstr(WINDOW *, const chtype *); - -/* - * addnstr.c - */ -int addnstr(const char *, int); -int mvaddnstr(int, int, const char *, int); -int mvwaddnstr(WINDOW *, int, int, const char *, int); -int addstr(const char *); -int mvaddstr(int, int, const char *); -int mvwaddstr(WINDOW *, int, int, const char *); -int waddstr(WINDOW *, const char *); - -/* - * addnws.c - */ -int addnwstr(const wchar_t *, int); -int mvaddnwstr(int, int, const wchar_t *, int); -int mvwaddnwstr(WINDOW *, int, int, const wchar_t *, int); -int addwstr(const wchar_t *); -int mvaddwstr(int, int, const wchar_t *); -int mvwaddwstr(WINDOW *, int, int, const wchar_t *); -int waddwstr(WINDOW *, const wchar_t *); - -/* - * addwchn.c - */ -int add_wchnstr(const cchar_t *, int); -int mvadd_wchnstr(int, int, const cchar_t *, int); -int mvwadd_wchnstr(WINDOW *, int, int, const cchar_t *, int); -int add_wchstr(const cchar_t *); -int mvadd_wchstr(int, int, const cchar_t *); -int mvwadd_wchstr(WINDOW *, int, int, const cchar_t *); -int wadd_wchstr(WINDOW *, const cchar_t *); - -/* - * attr_on.c - */ -int attr_on(attr_t, void *); -int attr_off(attr_t, void *); -int attr_set(attr_t, short, void *); -int color_set(short, void *); -int attr_get(attr_t *, short *, void *); -int standout(void); -int standend(void); - -/* - * attron.c - */ -int attron(int); -int attroff(int); -int attrset(int); -chtype COLOR_PAIR(short); -short PAIR_NUMBER(chtype); - -/* - * baudrate.c - */ -int baudrate(void); - -/* - * beep.c - */ -int beep(void); -int flash(void); - -/* - * bkgd.c - */ -int bkgd(chtype); -int wbkgd(WINDOW *, chtype); - -/* - * bkgdset.c - */ -int bkgdset(chtype); -int wbkgdset(WINDOW *, chtype); -chtype getbkgd(WINDOW *); - -/* - * bkgrnd.c - */ -int bkgrnd(const cchar_t *); - -/* - * bkgrndst.c - */ -void bkgrndset(const cchar_t *); -void wbkgrndset(WINDOW *, const cchar_t *); -int getbkgrnd(cchar_t *); -int wgetbkgrnd(WINDOW *, cchar_t *); - -/* - * box.c - */ -int box(WINDOW *, chtype, chtype); - -/* - * box_set.c - */ -int box_set(WINDOW *, const cchar_t *, const cchar_t *); - -/* - * brdr.c - */ -int border(chtype, chtype, chtype, chtype, chtype, chtype, chtype, chtype); - -/* - * brdr_st.c - */ -int border_set(const cchar_t *, const cchar_t *, - const cchar_t *, const cchar_t *, - const cchar_t *, const cchar_t *, - const cchar_t *, const cchar_t *); - -/* - * cbreak.c - */ -int cbreak(void); -int nocbreak(void); -int halfdelay(int); -int raw(void); -int noraw(void); - -/* - * chgat.c - */ -int chgat(int, attr_t, short, const void *); -int mvchgat(int, int, int, attr_t, short, const void *); -int mvwchgat(WINDOW *, int, int, int, attr_t, short, const void *); - -/* - * clear.c - */ -int clear(void); -int erase(void); - -/* - * clearok.c - */ -int clearok(WINDOW *, bool); -void immedok(WINDOW *, bool); -int leaveok(WINDOW *, bool); -int notimeout(WINDOW *, bool); -int scrollok(WINDOW *, bool); - -/* - * clrbot.c - */ -int clrtobot(void); - -/* - * clreol.c - */ -int clrtoeol(void); - -/* - * color.c - */ -int start_color(void); -int init_color(short, short, short, short); -int init_pair(short, short, short); -int color_content(short, short *, short *, short *); -int pair_content(short, short *, short *); - -/* - * copywin.c - */ -int copywin(const WINDOW *, WINDOW *, int, int, int, int, int, int, int); - -/* - * curs_set.c - */ -int curs_set(int); - -/* - * delay.c - */ -int delay_output(int); - -/* - * delch.c - */ -int delch(void); -int mvdelch(int, int); -int mvwdelch(WINDOW *, int, int); - -/* - * deleteln.c - */ -int deleteln(void); -int insertln(void); -int insdelln(int); -int wdeleteln(WINDOW *); -int winsertln(WINDOW *); - -/* - * doupdate.c - */ -int doupdate(void); -void idcok(WINDOW *, bool); -int idlok(WINDOW *, bool); - -/* - * dupwin.c - */ -WINDOW *dupwin(WINDOW *); - -/* - * echo_wch.c - */ -int echo_wchar(const cchar_t *); -int wecho_wchar(WINDOW *, const cchar_t *); - -/* - * echochar.c - */ -int echochar(chtype); -int wechochar(WINDOW *, chtype); - -/* - * endwin.c - */ -int endwin(void); - -/* - * flushinp.c - */ -int flushinp(void); - -/* - * get_wch.c - */ -int get_wch(wint_t *); -int mvget_wch(int , int, wint_t *); -int mvwget_wch(WINDOW *, int, int, wint_t *); - -/* - * getcchar.c - */ -int getcchar(const cchar_t *, wchar_t *, attr_t *, short *, void *); - -/* - * getch.c - */ -int getch(void); -int mvgetch(int, int); -int mvwgetch(WINDOW *, int, int); - -/* - * getn_ws.c - */ -int getn_wstr(wint_t *, int); -int mvgetn_wstr(int, int, wint_t *, int); -int mvwgetn_wstr(WINDOW *, int, int, wint_t *, int); -int get_wstr(wint_t *); -int mvget_wstr(int, int, wint_t *); -int mvwget_wstr(WINDOW *, int, int, wint_t *); -int wget_wstr(WINDOW *, wint_t *); - -/* - * getnstr.c - */ -int getnstr(char *, int); -int mvgetnstr(int, int, char *, int); -int mvwgetnstr(WINDOW *, int, int, char *, int); -int getstr(char *); -int mvgetstr(int, int, char *); -int mvwgetstr(WINDOW *, int, int, char *); -int wgetstr(WINDOW *, char *); - -/* - * getwin.c - */ -WINDOW *getwin(FILE *); -int putwin(WINDOW *, FILE *); - -/* - * has.c - */ -bool has_colors(void); -bool has_ic(void); -bool has_il(void); -bool can_change_color(void); - -/* - * hln.c - */ -int hline(chtype, int); -int mvhline(int, int, chtype, int); -int mvwhline(WINDOW *, int, int, chtype, int); -int vline(chtype, int); -int mvvline(int, int, chtype, int); -int mvwvline(WINDOW *, int, int, chtype, int); - -/* - * hln_st.c - */ -int hline_set(const cchar_t *, int); -int mvhline_set(int, int, const cchar_t *, int); -int mvwhline_set(WINDOW *, int, int, const cchar_t *, int); -int vline_set(const cchar_t *, int); -int mvvline_set(int, int, const cchar_t *, int); -int mvwvline_set(WINDOW *, int, int, const cchar_t *, int); - -/* - * in_wch.c - */ -int in_wch(cchar_t *); -int mvin_wch(int, int, cchar_t *); -int mvwin_wch(WINDOW *, int, int, cchar_t *); - -/* - * in_wchn.c - */ -int in_wchnstr(cchar_t *, int); -int mvin_wchnstr(int, int, cchar_t *, int); -int mvwin_wchnstr(WINDOW *, int, int, cchar_t *, int); -int in_wchstr(cchar_t *); -int mvin_wchstr(int, int, cchar_t *); -int mvwin_wchstr(WINDOW *, int, int, cchar_t *); -int win_wchstr(WINDOW *, cchar_t *); - -/* - * inch.c - */ -chtype inch(void); -chtype mvinch(int, int); -chtype mvwinch(WINDOW *, int, int); - -/* - * inchn.c - */ -int inchnstr(chtype *, int); -int mvinchnstr(int, int, chtype *, int); -int mvwinchnstr(WINDOW *, int, int, chtype *, int); -int inchstr(chtype *); -int mvinchstr(int, int, chtype *); -int mvwinchstr(WINDOW *, int, int, chtype *); -int winchstr(WINDOW *, chtype *); - -/* - * initscr.c - */ -WINDOW *initscr(void); - -/* - * innstr.c - */ -int innstr(char *, int); -int mvinnstr(int, int, char *, int); -int mvwinnstr(WINDOW *, int, int, char *, int); -int instr(char *); -int mvinstr(int, int, char *); -int mvwinstr(WINDOW *, int, int, char *); -int winstr(WINDOW *, char *); - -/* - * innwstr.c - */ -int innwstr(wchar_t *, int); -int mvinnwstr(int, int, wchar_t *, int); -int mvwinnwstr(WINDOW *, int, int, wchar_t *, int); -int inwstr(wchar_t *); -int mvinwstr(int, int, wchar_t *); -int mvwinwstr(WINDOW *, int, int, wchar_t *); -int winwstr(WINDOW *, wchar_t *); - -/* - * ins_nws.c - */ -int ins_nwstr(const wchar_t *, int); -int mvins_nwstr(int, int, const wchar_t *, int); -int mvwins_nwstr(WINDOW *, int, int, const wchar_t *, int); -int ins_wstr(const wchar_t *); -int mvins_wstr(int, int, const wchar_t *); -int mvwins_wstr(WINDOW *, int, int, const wchar_t *); -int wins_wstr(WINDOW *, const wchar_t *); - -/* - * ins_wch.c - */ -int ins_wch(const cchar_t *); -int mvins_wch(int, int, const cchar_t *); -int mvwins_wch(WINDOW *, int, int, const cchar_t *); - -/* - * insch.c - */ -int insch(chtype); -int mvinsch(int, int, chtype); -int mvwinsch(WINDOW *, int, int, chtype); - -/* - * insnstr.c - */ -int insnstr(const char *, int); -int mvinsnstr(int, int, const char *, int); -int mvwinsnstr(WINDOW *, int, int, const char *, int); -int insstr(const char *); -int mvinsstr(int, int, const char *); -int mvwinsstr(WINDOW *, int, int, const char *); -int winsstr(WINDOW *, const char *); - -/* - * intrflsh.c - */ -int intrflush(WINDOW *, bool); - -/* - * isendwin.c - */ -bool isendwin(void); - -/* - * key_name.c - */ -const char *key_name(wchar_t); - -/* - * keyname.c - */ -const char *keyname(int); - -/* - * keypad.c - */ -int keypad(WINDOW *, bool); - -/* - * killchar.c - */ -int erasechar(void); -int killchar(void); - -/* - * killwch.c - */ -int erasewchar(wchar_t *); -int killwchar(wchar_t *); - -/* - * longname.c - */ -char *longname(void); -char *termname(void); - -/* - * meta.c - */ -int meta(WINDOW *, bool); - -/* - * move.c - */ -int move(int, int); - -/* - * mvcur.c - */ -int mvcur(int, int, int, int); - -/* - * mvwin.c - */ -int mvwin(WINDOW *, int, int); -int mvderwin(WINDOW *, int, int); - -/* - * napms.c - */ -int napms(int); - -/* - * newpad.c - */ -WINDOW *newpad(int, int); -WINDOW *subpad(WINDOW *, int, int, int, int); - -/* - * newterm.c - */ -void filter(void); -void tstp(int); -int ripoffline(int, int (*)(WINDOW *, int)); -SCREEN *newterm(char *, FILE *, FILE *); -void delscreen(SCREEN *); -SCREEN *set_term(SCREEN *); -int typeahead(int); - -/* - * newwin.c - */ -int delwin(WINDOW *); -WINDOW *derwin(WINDOW *, int, int, int, int); -WINDOW *newwin(int, int, int, int); -WINDOW *subwin(WINDOW *, int, int, int, int); - -/* - * noecho.c - */ -int echo(void); -int noecho(void); - -/* - * nonl.c - */ -int nl(void); -int nonl(void); - -/* - * overlay.c - */ -int overlay(const WINDOW *, WINDOW *); -int overwrite(const WINDOW *, WINDOW *); - -/* - * pecho_wc.c - */ -int pecho_wchar(WINDOW *, const cchar_t *); - -/* - * pechoch.c - */ -int pechochar(WINDOW *, chtype); - -/* - * prefresh.c - */ -int prefresh(WINDOW *, int, int, int, int, int, int); -int pnoutrefresh(WINDOW *, int, int, int, int, int, int); - -/* - * printw.c - */ -int printw(const char *, ...); -int mvprintw(int, int, const char *, ...); -int mvwprintw(WINDOW *, int, int, const char *, ...); -int wprintw(WINDOW *, const char *, ...); - -/* - * qiflush.c - */ -void qiflush(void); -void noqiflush(void); - -/* - * redraw.c - */ -int redrawwin(WINDOW *); - -/* - * refresh.c - */ -int refresh(void); - -/* - * savetty.c - */ -int savetty(void); -int resetty(void); - -/* - * scanw.c - */ -int scanw(const char *, ...); -int mvscanw(int, int, const char *, ...); -int mvwscanw(WINDOW *, int, int, const char *, ...); -int wscanw(WINDOW *, const char *, ...); - -/* - * scr_dump.c - */ -int scr_dump(const char *); -int scr_restore(const char *); -int scr_init(const char *); -int scr_set(const char *); - -/* - * scrl.c - */ -int scroll(WINDOW *); -int scrl(int); - -/* - * scrreg.c - */ -int setscrreg(int, int); - -/* - * setcchar.c - */ -int setcchar(cchar_t *, const wchar_t *, attr_t, short, const void *); - -/* - * setup.c - */ -void use_env(bool); -int setupterm(const char *, int, int *); -int del_curterm(TERMINAL *); -TERMINAL *set_curterm(TERMINAL *); -int restartterm(const char *, int, int *); -int def_shell_mode(void); -int def_prog_mode(void); -int reset_shell_mode(void); -int reset_prog_mode(void); - -/* - * slk.c - */ -int slk_init(int); -int slk_attron(const chtype); -int slk_attroff(const chtype); -int slk_attrset(const chtype); -int slk_attr_off(const attr_t, void *); -int slk_attr_on(const attr_t, void *); -int slk_attr_set(const attr_t, short, void *); -int slk_color(short); -int slk_touch(void); -int slk_clear(void); -int slk_restore(void); -int slk_noutrefresh(void); -int slk_refresh(void); -char *slk_label(int); -int slk_set(int, const char *, int); -int slk_wset(int, const wchar_t *, int); -int slk_color_set(short); - -/* - * termattr.c - */ -chtype termattrs(void); -attr_t term_attrs(void); - -/* - * tgetent.c - */ -int tgetent(char *, char *); - -/* - * tgetflag.c - */ -int tgetflag(const char *); - -/* - * tgetnum.c - */ -int tgetnum(const char *); - -/* - * tgetstr.c - */ -char *tgetstr(const char *, char **); - -/* - * tgoto.c - */ -char *tgoto(const char *, int, int); - -/* - * tigetfla.c - */ -int tigetflag(const char *); - -/* - * tigetnum.c - */ -int tigetnum(const char *); - -/* - * tigetstr.c - */ -char *tigetstr(const char *); - -/* - * timeout.c - */ -int nodelay(WINDOW *, bool); -void timeout(int); - -/* - * touched.c - */ -bool is_linetouched(WINDOW *, int); -bool is_wintouched(WINDOW *); - -/* - * touchwin.c - */ -int touchwin(WINDOW *); -int untouchwin(WINDOW *); -int touchline(WINDOW *, int, int); - -/* - * unctrl.c - */ -const char *unctrl(chtype); - -/* - * vid_attr.c - */ -int vid_attr(attr_t, short, void *); - -/* - * vid_puts.c - */ -int vid_puts(attr_t, short, void *, int (*)(int)); - -/* - * vidattr.c - */ -int vidattr(chtype); -int vidputs(chtype, int (*)(int)); - -/* - * vw_print.c - */ -int vw_printw(WINDOW *, const char *, void *); - -/* - * vw_scanw.c - */ -int vw_scanw(WINDOW *, const char *, void *); - -/* - * vwprintw.c - */ -int vwprintw(WINDOW *, const char *, void *); - -/* - * vwscanw.c - */ -int vwscanw(WINDOW *, const char *, void *); - -/* - * wadd_wch.c - */ -int wadd_wch(WINDOW *, const cchar_t *); - -/* - * waddch.c - */ -int waddch(WINDOW *, chtype); - -/* - * waddchn.c - */ -int waddchnstr(WINDOW *, const chtype *, int); - -/* - * waddnstr.c - */ -int waddnstr(WINDOW *, const char *, int); - -/* - * waddnws.c - */ -int waddnwstr(WINDOW *, const wchar_t *, int); - -/* - * waddwchn.c - */ -int wadd_wchnstr(WINDOW *, const cchar_t *, int); - -/* - * wattr_on.c - */ -int wattr_on(WINDOW *, attr_t, void *); -int wattr_off(WINDOW *, attr_t, void *); -int wattr_set(WINDOW *, attr_t, short, void *); -int wattr_get(WINDOW *, attr_t *, short *, void *); -int wcolor_set(WINDOW *, short, void *); -int wstandout(WINDOW *); -int wstandend(WINDOW *); - -/* - * wattron.c - */ -int wattron(WINDOW *, int); -int wattroff(WINDOW *, int); -int wattrset(WINDOW *, int); - -/* - * wbkgrnd.c - */ -int wbkgrnd(WINDOW *, const cchar_t *); - -/* - * wbrdr.c - */ -int wborder(WINDOW *, chtype, chtype, chtype, chtype, - chtype, chtype, chtype, chtype); - -/* - * wbrdr_st.c - */ -int wborder_set(WINDOW *, const cchar_t *, const cchar_t *, - const cchar_t *, const cchar_t *, const cchar_t *, const cchar_t *, - const cchar_t *, const cchar_t *); - -/* - * wchgat.c - */ -int wchgat(WINDOW *, int, attr_t, short, const void *); - -/* - * wclear.c - */ -int wclear(WINDOW *); -int werase(WINDOW *); - -/* - * wclrbot.c - */ -int wclrtobot(WINDOW *); - -/* - * wclreol.c - */ -int wclrtoeol(WINDOW *); - -/* - * wdelch.c - */ -int wdelch(WINDOW *); - -/* - * wget_wch.c - */ -int unget_wch(const wchar_t); -int wget_wch(WINDOW *, wint_t *); - -/* - * wgetch.c - */ -int ungetch(int); -int wgetch(WINDOW *); - -/* - * wgetn_ws.c - */ -int wgetnstr(WINDOW *, char *, int); -int wgetn_wstr(WINDOW *, wint_t *, int); - -/* - * whln.c - */ -int whline(WINDOW *, chtype, int); -int wvline(WINDOW *, chtype, int); - -/* - * whln_st.c - */ -int whline_set(WINDOW *, const cchar_t *, int); -int wvline_set(WINDOW *, const cchar_t *, int); - -/* - * win_wch.c - */ -int win_wch(WINDOW *, cchar_t *); - -/* - * win_wchn.c - */ -int win_wchnstr(WINDOW *, cchar_t *, int); - -/* - * winch.c - */ -chtype winch(WINDOW *); - -/* - * winchn.c - */ -int winchnstr(WINDOW *, chtype *, int); - -/* - * winnstr.c - */ -int winnstr(WINDOW *, char *, int); - -/* - * winnwstr.c - */ -int winnwstr(WINDOW *, wchar_t *, int); - -/* - * wins_nws.c - */ -int wins_nwstr(WINDOW *, const wchar_t *, int); - -/* - * wins_wch.c - */ -int wins_wch(WINDOW *, const cchar_t *); - -/* - * winsch.c - */ -int winsch(WINDOW *, chtype); - -/* - * winsdel.c - */ -int winsdelln(WINDOW *, int); - -/* - * winsnstr.c - */ -int winsnstr(WINDOW *, const char *, int); - -/* - * wmove.c - */ -int wmove(WINDOW *, int, int); - -/* - * wredraw.c - */ -int wredrawln(WINDOW *, int, int); - -/* - * wrefresh.c - */ -int wrefresh(WINDOW *); -int wnoutrefresh(WINDOW *); - -/* - * wscrl.c - */ -int wscrl(WINDOW *, int); - -/* - * wscrreg.c - */ -int wsetscrreg(WINDOW *, int, int); - -/* - * wsyncdn.c - */ -void wsyncdown(WINDOW *); - -/* - * wsyncup.c - */ -int syncok(WINDOW *, bool); -void wsyncup(WINDOW *); -void wcursyncup(WINDOW *); - -/* - * wtimeout.c - */ -void wtimeout(WINDOW *, int); - -/* - * wtouchln.c - */ -int wtouchln(WINDOW *, int, int, int); - -/* - * wunctrl.c - */ -const wchar_t *wunctrl(const cchar_t *); diff --git a/usr/src/lib/libxcurses2/src/libc/llib-lcurses b/usr/src/lib/libxcurses2/src/libc/llib-lcurses deleted file mode 100644 index 082dd7f8c6..0000000000 --- a/usr/src/lib/libxcurses2/src/libc/llib-lcurses +++ /dev/null @@ -1,1024 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright (c) 1996-1998 by Sun Microsystems, Inc. - * All rights reserved. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <curses.h> -#include <term.h> - -/* - * lib/libxcurses/src/libc/xcurses routines - */ - -/* - * add_wch.c - */ -int add_wch(const cchar_t *); -int mvadd_wch(int, int, const cchar_t *); -int mvwadd_wch(WINDOW *, int, int, const cchar_t *); - -/* - * addch.c - */ -int addch(chtype); -int mvaddch(int, int, chtype); -int mvwaddch(WINDOW *, int, int, chtype); - -/* - * addchn.c - */ -int addchnstr(const chtype *, int); -int mvaddchnstr(int, int, const chtype *, int); -int mvwaddchnstr(WINDOW *, int, int, const chtype *, int); -int addchstr(const chtype *); -int mvaddchstr(int, int, const chtype *); -int mvwaddchstr(WINDOW *, int, int, const chtype *); -int waddchstr(WINDOW *, const chtype *); - -/* - * addnstr.c - */ -int addnstr(const char *, int); -int mvaddnstr(int, int, const char *, int); -int mvwaddnstr(WINDOW *, int, int, const char *, int); -int addstr(const char *); -int mvaddstr(int, int, const char *); -int mvwaddstr(WINDOW *, int, int, const char *); -int waddstr(WINDOW *, const char *); - -/* - * addnws.c - */ -int addnwstr(const wchar_t *, int); -int mvaddnwstr(int, int, const wchar_t *, int); -int mvwaddnwstr(WINDOW *, int, int, const wchar_t *, int); -int addwstr(const wchar_t *); -int mvaddwstr(int, int, const wchar_t *); -int mvwaddwstr(WINDOW *, int, int, const wchar_t *); -int waddwstr(WINDOW *, const wchar_t *); - -/* - * addwchn.c - */ -int add_wchnstr(const cchar_t *, int); -int mvadd_wchnstr(int, int, const cchar_t *, int); -int mvwadd_wchnstr(WINDOW *, int, int, const cchar_t *, int); -int add_wchstr(const cchar_t *); -int mvadd_wchstr(int, int, const cchar_t *); -int mvwadd_wchstr(WINDOW *, int, int, const cchar_t *); -int wadd_wchstr(WINDOW *, const cchar_t *); - -/* - * attr_on.c - */ -int attr_on(attr_t, void *); -int attr_off(attr_t, void *); -int attr_set(attr_t, short, void *); -int color_set(short, void *); -int attr_get(attr_t *, short *, void *); -int standout(void); -int standend(void); - -/* - * attron.c - */ -int attron(int); -int attroff(int); -int attrset(int); -int COLOR_PAIR(int); -int PAIR_NUMBER(int); - -/* - * baudrate.c - */ -int baudrate(void); - -/* - * beep.c - */ -int beep(void); -int flash(void); - -/* - * bkgd.c - */ -int bkgd(chtype); -int wbkgd(WINDOW *, chtype); - -/* - * bkgdset.c - */ -void bkgdset(chtype); -void wbkgdset(WINDOW *, chtype); -chtype getbkgd(WINDOW *); - -/* - * bkgrnd.c - */ -int bkgrnd(const cchar_t *); - -/* - * bkgrndst.c - */ -void bkgrndset(const cchar_t *); -void wbkgrndset(WINDOW *, const cchar_t *); -int getbkgrnd(cchar_t *); -int wgetbkgrnd(WINDOW *, cchar_t *); - -/* - * box.c - */ -int box(WINDOW *, chtype, chtype); - -/* - * box_set.c - */ -int box_set(WINDOW *, const cchar_t *, const cchar_t *); - -/* - * brdr.c - */ -int border(chtype, chtype, chtype, chtype, chtype, chtype, chtype, chtype); - -/* - * brdr_st.c - */ -int border_set(const cchar_t *, const cchar_t *, - const cchar_t *, const cchar_t *, - const cchar_t *, const cchar_t *, - const cchar_t *, const cchar_t *); - -/* - * cbreak.c - */ -int cbreak(void); -int nocbreak(void); -int halfdelay(int); -int raw(void); -int noraw(void); - -/* - * chgat.c - */ -int chgat(int, attr_t, short, const void *); -int mvchgat(int, int, int, attr_t, short, const void *); -int mvwchgat(WINDOW *, int, int, int, attr_t, short, const void *); - -/* - * clear.c - */ -int clear(void); -int erase(void); - -/* - * clearok.c - */ -int clearok(WINDOW *, bool); -void immedok(WINDOW *, bool); -int leaveok(WINDOW *, bool); -int notimeout(WINDOW *, bool); -int scrollok(WINDOW *, bool); - -/* - * clrbot.c - */ -int clrtobot(void); - -/* - * clreol.c - */ -int clrtoeol(void); - -/* - * color.c - */ -int start_color(void); -int init_color(short, short, short, short); -int init_pair(short, short, short); -int color_content(short, short *, short *, short *); -int pair_content(short, short *, short *); - -/* - * copywin.c - */ -int copywin(const WINDOW *, WINDOW *, int, int, int, int, int, int, int); - -/* - * curs_set.c - */ -int curs_set(int); - -/* - * delay.c - */ -int delay_output(int); - -/* - * delch.c - */ -int delch(void); -int mvdelch(int, int); -int mvwdelch(WINDOW *, int, int); - -/* - * deleteln.c - */ -int deleteln(void); -int insertln(void); -int insdelln(int); -int wdeleteln(WINDOW *); -int winsertln(WINDOW *); - -/* - * doupdate.c - */ -int doupdate(void); -void idcok(WINDOW *, bool); -int idlok(WINDOW *, bool); - -/* - * dupwin.c - */ -WINDOW *dupwin(WINDOW *); - -/* - * echo_wch.c - */ -int echo_wchar(const cchar_t *); -int wecho_wchar(WINDOW *, const cchar_t *); - -/* - * echochar.c - */ -int echochar(chtype); -int wechochar(WINDOW *, chtype); - -/* - * endwin.c - */ -int endwin(void); - -/* - * flushinp.c - */ -int flushinp(void); - -/* - * get_wch.c - */ -int get_wch(wint_t *); -int mvget_wch(int, int, wint_t *); -int mvwget_wch(WINDOW *, int, int, wint_t *); - -/* - * getcchar.c - */ -int getcchar(const cchar_t *, wchar_t *, attr_t *, short *, void *); - -/* - * getch.c - */ -int getch(void); -int mvgetch(int, int); -int mvwgetch(WINDOW *, int, int); - -/* - * getn_ws.c - */ -int getn_wstr(wint_t *, int); -int mvgetn_wstr(int, int, wint_t *, int); -int mvwgetn_wstr(WINDOW *, int, int, wint_t *, int); -int get_wstr(wint_t *); -int mvget_wstr(int, int, wint_t *); -int mvwget_wstr(WINDOW *, int, int, wint_t *); -int wget_wstr(WINDOW *, wint_t *); - -/* - * getnstr.c - */ -int getnstr(char *, int); -int mvgetnstr(int, int, char *, int); -int mvwgetnstr(WINDOW *, int, int, char *, int); -int getstr(char *); -int mvgetstr(int, int, char *); -int mvwgetstr(WINDOW *, int, int, char *); -int wgetstr(WINDOW *, char *); - -/* - * getwin.c - */ -WINDOW *getwin(FILE *); -int putwin(WINDOW *, FILE *); - -/* - * has.c - */ -bool has_colors(void); -bool has_ic(void); -bool has_il(void); -bool can_change_color(void); - -/* - * hln.c - */ -int hline(chtype, int); -int mvhline(int, int, chtype, int); -int mvwhline(WINDOW *, int, int, chtype, int); -int vline(chtype, int); -int mvvline(int, int, chtype, int); -int mvwvline(WINDOW *, int, int, chtype, int); - -/* - * hln_st.c - */ -int hline_set(const cchar_t *, int); -int mvhline_set(int, int, const cchar_t *, int); -int mvwhline_set(WINDOW *, int, int, const cchar_t *, int); -int vline_set(const cchar_t *, int); -int mvvline_set(int, int, const cchar_t *, int); -int mvwvline_set(WINDOW *, int, int, const cchar_t *, int); - -/* - * in_wch.c - */ -int in_wch(cchar_t *); -int mvin_wch(int, int, cchar_t *); -int mvwin_wch(WINDOW *, int, int, cchar_t *); - -/* - * in_wchn.c - */ -int in_wchnstr(cchar_t *, int); -int mvin_wchnstr(int, int, cchar_t *, int); -int mvwin_wchnstr(WINDOW *, int, int, cchar_t *, int); -int in_wchstr(cchar_t *); -int mvin_wchstr(int, int, cchar_t *); -int mvwin_wchstr(WINDOW *, int, int, cchar_t *); -int win_wchstr(WINDOW *, cchar_t *); - -/* - * inch.c - */ -chtype inch(void); -chtype mvinch(int, int); -chtype mvwinch(WINDOW *, int, int); - -/* - * inchn.c - */ -int inchnstr(chtype *, int); -int mvinchnstr(int, int, chtype *, int); -int mvwinchnstr(WINDOW *, int, int, chtype *, int); -int inchstr(chtype *); -int mvinchstr(int, int, chtype *); -int mvwinchstr(WINDOW *, int, int, chtype *); -int winchstr(WINDOW *, chtype *); - -/* - * initscr.c - */ -WINDOW *initscr(void); - -/* - * innstr.c - */ -int innstr(char *, int); -int mvinnstr(int, int, char *, int); -int mvwinnstr(WINDOW *, int, int, char *, int); -int instr(char *); -int mvinstr(int, int, char *); -int mvwinstr(WINDOW *, int, int, char *); -int winstr(WINDOW *, char *); - -/* - * innwstr.c - */ -int innwstr(wchar_t *, int); -int mvinnwstr(int, int, wchar_t *, int); -int mvwinnwstr(WINDOW *, int, int, wchar_t *, int); -int inwstr(wchar_t *); -int mvinwstr(int, int, wchar_t *); -int mvwinwstr(WINDOW *, int, int, wchar_t *); -int winwstr(WINDOW *, wchar_t *); - -/* - * ins_nws.c - */ -int ins_nwstr(const wchar_t *, int); -int mvins_nwstr(int, int, const wchar_t *, int); -int mvwins_nwstr(WINDOW *, int, int, const wchar_t *, int); -int ins_wstr(const wchar_t *); -int mvins_wstr(int, int, const wchar_t *); -int mvwins_wstr(WINDOW *, int, int, const wchar_t *); -int wins_wstr(WINDOW *, const wchar_t *); - -/* - * ins_wch.c - */ -int ins_wch(const cchar_t *); -int mvins_wch(int, int, const cchar_t *); -int mvwins_wch(WINDOW *, int, int, const cchar_t *); - -/* - * insch.c - */ -int insch(chtype); -int mvinsch(int, int, chtype); -int mvwinsch(WINDOW *, int, int, chtype); - -/* - * insnstr.c - */ -int insnstr(const char *, int); -int mvinsnstr(int, int, const char *, int); -int mvwinsnstr(WINDOW *, int, int, const char *, int); -int insstr(const char *); -int mvinsstr(int, int, const char *); -int mvwinsstr(WINDOW *, int, int, const char *); -int winsstr(WINDOW *, const char *); - -/* - * intrflsh.c - */ -int intrflush(WINDOW *, bool); - -/* - * isendwin.c - */ -bool isendwin(void); - -/* - * key_name.c - */ -char *key_name(wchar_t); - -/* - * keyname.c - */ -char *keyname(int); - -/* - * keypad.c - */ -int keypad(WINDOW *, bool); - -/* - * killchar.c - */ -char erasechar(void); -char killchar(void); - -/* - * killwch.c - */ -int erasewchar(wchar_t *); -int killwchar(wchar_t *); - -/* - * longname.c - */ -char *longname(void); -char *termname(void); - -/* - * meta.c - */ -int meta(WINDOW *, bool); - -/* - * move.c - */ -int move(int, int); - -/* - * mvcur.c - */ -int mvcur(int, int, int, int); - -/* - * mvwin.c - */ -int mvwin(WINDOW *, int, int); -int mvderwin(WINDOW *, int, int); - -/* - * napms.c - */ -int napms(int); - -/* - * newpad.c - */ -WINDOW *newpad(int, int); -WINDOW *subpad(WINDOW *, int, int, int, int); - -/* - * newterm.c - */ -void filter(void); -void tstp(int); -int ripoffline(int, int (*)(WINDOW *, int)); -SCREEN *newterm(char *, FILE *, FILE *); -void delscreen(SCREEN *); -SCREEN *set_term(SCREEN *); -int typeahead(int); - -/* - * newwin.c - */ -int delwin(WINDOW *); -WINDOW *derwin(WINDOW *, int, int, int, int); -WINDOW *newwin(int, int, int, int); -WINDOW *subwin(WINDOW *, int, int, int, int); - -/* - * noecho.c - */ -int echo(void); -int noecho(void); - -/* - * nonl.c - */ -int nl(void); -int nonl(void); - -/* - * overlay.c - */ -int overlay(const WINDOW *, WINDOW *); -int overwrite(const WINDOW *, WINDOW *); - -/* - * pecho_wc.c - */ -int pecho_wchar(WINDOW *, const cchar_t *); - -/* - * pechoch.c - */ -int pechochar(WINDOW *, chtype); - -/* - * prefresh.c - */ -int prefresh(WINDOW *, int, int, int, int, int, int); -int pnoutrefresh(WINDOW *, int, int, int, int, int, int); - -/* - * printw.c - */ -int printw(char *, ...); -int mvprintw(int, int, char *, ...); -int mvwprintw(WINDOW *, int, int, char *, ...); -int wprintw(WINDOW *, char *, ...); - -/* - * qiflush.c - */ -void qiflush(void); -void noqiflush(void); - -/* - * redraw.c - */ -int redrawwin(WINDOW *); - -/* - * refresh.c - */ -int refresh(void); - -/* - * savetty.c - */ -int savetty(void); -int resetty(void); - -/* - * scanw.c - */ -int scanw(char *, ...); -int mvscanw(int, int, char *, ...); -int mvwscanw(WINDOW *, int, int, char *, ...); -int wscanw(WINDOW *, char *, ...); - -/* - * scr_dump.c - */ -int scr_dump(const char *); -int scr_restore(const char *); -int scr_init(const char *); -int scr_set(const char *); - -/* - * scrl.c - */ -int scroll(WINDOW *); -int scrl(int); - -/* - * scrreg.c - */ -int setscrreg(int, int); - -/* - * setcchar.c - */ -int setcchar(cchar_t *, const wchar_t *, attr_t, short, const void *); - -/* - * setup.c - */ -void use_env(bool); -int setupterm(char *, int, int *); -int del_curterm(TERMINAL *); -TERMINAL *set_curterm(TERMINAL *); -int restartterm(char *, int, int *); -int def_shell_mode(void); -int def_prog_mode(void); -int reset_shell_mode(void); -int reset_prog_mode(void); - -/* - * slk.c - */ -int slk_init(int); -int slk_attron(const chtype); -int slk_attroff(const chtype); -int slk_attrset(const chtype); -int slk_attr_off(const attr_t, void *); -int slk_attr_on(const attr_t, void *); -int slk_attr_set(const attr_t, short, void *); -int slk_color(short); -int slk_touch(void); -int slk_clear(void); -int slk_restore(void); -int slk_noutrefresh(void); -int slk_refresh(void); -char *slk_label(int); -int slk_set(int, const char *, int); -int slk_wset(int, const wchar_t *, int); -int slk_color_set(short); - -/* - * termattr.c - */ -chtype termattrs(void); -attr_t term_attrs(void); - -/* - * tgetent.c - */ -int tgetent(char *, const char *); - -/* - * tgetflag.c - */ -int tgetflag(char *); - -/* - * tgetnum.c - */ -int tgetnum(char *); - -/* - * tgetstr.c - */ -char *tgetstr(char *, char **); - -/* - * tgoto.c - */ -char *tgoto(char *, int, int); - -/* - * tigetfla.c - */ -int tigetflag(char *); - -/* - * tigetnum.c - */ -int tigetnum(char *); - -/* - * tigetstr.c - */ -char *tigetstr(char *); - -/* - * timeout.c - */ -int nodelay(WINDOW *, bool); -void timeout(int); - -/* - * touched.c - */ -bool is_linetouched(WINDOW *, int); -bool is_wintouched(WINDOW *); - -/* - * touchwin.c - */ -int touchwin(WINDOW *); -int untouchwin(WINDOW *); -int touchline(WINDOW *, int, int); - -/* - * unctrl.c - */ -char *unctrl(chtype); - -/* - * vid_attr.c - */ -int vid_attr(attr_t, short, void *); - -/* - * vid_puts.c - */ -int vid_puts(attr_t, short, void *, int (*)(int)); - -/* - * vidattr.c - */ -int vidattr(chtype); -int vidputs(chtype, int (*)(int)); - -/* - * vw_print.c - */ -int vw_printw(WINDOW *, char *, __va_list); - -/* - * vw_scanw.c - */ -int vw_scanw(WINDOW *, char *, __va_list); - -/* - * vwprintw.c - */ -int vwprintw(WINDOW *, char *, __va_list); - -/* - * vwscanw.c - */ -int vwscanw(WINDOW *, char *, __va_list); - -/* - * wadd_wch.c - */ -int wadd_wch(WINDOW *, const cchar_t *); - -/* - * waddch.c - */ -int waddch(WINDOW *, chtype); - -/* - * waddchn.c - */ -int waddchnstr(WINDOW *, const chtype *, int); - -/* - * waddnstr.c - */ -int waddnstr(WINDOW *, const char *, int); - -/* - * waddnws.c - */ -int waddnwstr(WINDOW *, const wchar_t *, int); - -/* - * waddwchn.c - */ -int wadd_wchnstr(WINDOW *, const cchar_t *, int); - -/* - * wattr_on.c - */ -int wattr_on(WINDOW *, attr_t, void *); -int wattr_off(WINDOW *, attr_t, void *); -int wattr_set(WINDOW *, attr_t, short, void *); -int wattr_get(WINDOW *, attr_t *, short *, void *); -int wcolor_set(WINDOW *, short, void *); -int wstandout(WINDOW *); -int wstandend(WINDOW *); - -/* - * wattron.c - */ -int wattron(WINDOW *, int); -int wattroff(WINDOW *, int); -int wattrset(WINDOW *, int); - -/* - * wbkgrnd.c - */ -int wbkgrnd(WINDOW *, const cchar_t *); - -/* - * wbrdr.c - */ -int wborder(WINDOW *, chtype, chtype, chtype, chtype, - chtype, chtype, chtype, chtype); - -/* - * wbrdr_st.c - */ -int wborder_set(WINDOW *, const cchar_t *, const cchar_t *, - const cchar_t *, const cchar_t *, const cchar_t *, const cchar_t *, - const cchar_t *, const cchar_t *); - -/* - * wchgat.c - */ -int wchgat(WINDOW *, int, attr_t, short, const void *); - -/* - * wclear.c - */ -int wclear(WINDOW *); -int werase(WINDOW *); - -/* - * wclrbot.c - */ -int wclrtobot(WINDOW *); - -/* - * wclreol.c - */ -int wclrtoeol(WINDOW *); - -/* - * wdelch.c - */ -int wdelch(WINDOW *); - -/* - * wget_wch.c - */ -int unget_wch(const wchar_t); -int wget_wch(WINDOW *, wint_t *); - -/* - * wgetch.c - */ -int ungetch(int); -int wgetch(WINDOW *); - -/* - * wgetn_ws.c - */ -int wgetnstr(WINDOW *, char *, int); -int wgetn_wstr(WINDOW *, wint_t *, int); - -/* - * whln.c - */ -int whline(WINDOW *, chtype, int); -int wvline(WINDOW *, chtype, int); - -/* - * whln_st.c - */ -int whline_set(WINDOW *, const cchar_t *, int); -int wvline_set(WINDOW *, const cchar_t *, int); - -/* - * win_wch.c - */ -int win_wch(WINDOW *, cchar_t *); - -/* - * win_wchn.c - */ -int win_wchnstr(WINDOW *, cchar_t *, int); - -/* - * winch.c - */ -chtype winch(WINDOW *); - -/* - * winchn.c - */ -int winchnstr(WINDOW *, chtype *, int); - -/* - * winnstr.c - */ -int winnstr(WINDOW *, char *, int); - -/* - * winnwstr.c - */ -int winnwstr(WINDOW *, wchar_t *, int); - -/* - * wins_nws.c - */ -int wins_nwstr(WINDOW *, const wchar_t *, int); - -/* - * wins_wch.c - */ -int wins_wch(WINDOW *, const cchar_t *); - -/* - * winsch.c - */ -int winsch(WINDOW *, chtype); - -/* - * winsdel.c - */ -int winsdelln(WINDOW *, int); - -/* - * winsnstr.c - */ -int winsnstr(WINDOW *, const char *, int); - -/* - * wmove.c - */ -int wmove(WINDOW *, int, int); - -/* - * wredraw.c - */ -int wredrawln(WINDOW *, int, int); - -/* - * wrefresh.c - */ -int wrefresh(WINDOW *); -int wnoutrefresh(WINDOW *); - -/* - * wscrl.c - */ -int wscrl(WINDOW *, int); - -/* - * wscrreg.c - */ -int wsetscrreg(WINDOW *, int, int); - -/* - * wsyncdn.c - */ -void wsyncdown(WINDOW *); - -/* - * wsyncup.c - */ -int syncok(WINDOW *, bool); -void wsyncup(WINDOW *); -void wcursyncup(WINDOW *); - -/* - * wtimeout.c - */ -void wtimeout(WINDOW *, int); - -/* - * wtouchln.c - */ -int wtouchln(WINDOW *, int, int, int); - -/* - * wunctrl.c - */ -wchar_t *wunctrl(cchar_t *); diff --git a/usr/src/lib/libxcurses2/src/libc/llib-lxcurses b/usr/src/lib/libxcurses2/src/libc/llib-lxcurses deleted file mode 100644 index 082dd7f8c6..0000000000 --- a/usr/src/lib/libxcurses2/src/libc/llib-lxcurses +++ /dev/null @@ -1,1024 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright (c) 1996-1998 by Sun Microsystems, Inc. - * All rights reserved. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <curses.h> -#include <term.h> - -/* - * lib/libxcurses/src/libc/xcurses routines - */ - -/* - * add_wch.c - */ -int add_wch(const cchar_t *); -int mvadd_wch(int, int, const cchar_t *); -int mvwadd_wch(WINDOW *, int, int, const cchar_t *); - -/* - * addch.c - */ -int addch(chtype); -int mvaddch(int, int, chtype); -int mvwaddch(WINDOW *, int, int, chtype); - -/* - * addchn.c - */ -int addchnstr(const chtype *, int); -int mvaddchnstr(int, int, const chtype *, int); -int mvwaddchnstr(WINDOW *, int, int, const chtype *, int); -int addchstr(const chtype *); -int mvaddchstr(int, int, const chtype *); -int mvwaddchstr(WINDOW *, int, int, const chtype *); -int waddchstr(WINDOW *, const chtype *); - -/* - * addnstr.c - */ -int addnstr(const char *, int); -int mvaddnstr(int, int, const char *, int); -int mvwaddnstr(WINDOW *, int, int, const char *, int); -int addstr(const char *); -int mvaddstr(int, int, const char *); -int mvwaddstr(WINDOW *, int, int, const char *); -int waddstr(WINDOW *, const char *); - -/* - * addnws.c - */ -int addnwstr(const wchar_t *, int); -int mvaddnwstr(int, int, const wchar_t *, int); -int mvwaddnwstr(WINDOW *, int, int, const wchar_t *, int); -int addwstr(const wchar_t *); -int mvaddwstr(int, int, const wchar_t *); -int mvwaddwstr(WINDOW *, int, int, const wchar_t *); -int waddwstr(WINDOW *, const wchar_t *); - -/* - * addwchn.c - */ -int add_wchnstr(const cchar_t *, int); -int mvadd_wchnstr(int, int, const cchar_t *, int); -int mvwadd_wchnstr(WINDOW *, int, int, const cchar_t *, int); -int add_wchstr(const cchar_t *); -int mvadd_wchstr(int, int, const cchar_t *); -int mvwadd_wchstr(WINDOW *, int, int, const cchar_t *); -int wadd_wchstr(WINDOW *, const cchar_t *); - -/* - * attr_on.c - */ -int attr_on(attr_t, void *); -int attr_off(attr_t, void *); -int attr_set(attr_t, short, void *); -int color_set(short, void *); -int attr_get(attr_t *, short *, void *); -int standout(void); -int standend(void); - -/* - * attron.c - */ -int attron(int); -int attroff(int); -int attrset(int); -int COLOR_PAIR(int); -int PAIR_NUMBER(int); - -/* - * baudrate.c - */ -int baudrate(void); - -/* - * beep.c - */ -int beep(void); -int flash(void); - -/* - * bkgd.c - */ -int bkgd(chtype); -int wbkgd(WINDOW *, chtype); - -/* - * bkgdset.c - */ -void bkgdset(chtype); -void wbkgdset(WINDOW *, chtype); -chtype getbkgd(WINDOW *); - -/* - * bkgrnd.c - */ -int bkgrnd(const cchar_t *); - -/* - * bkgrndst.c - */ -void bkgrndset(const cchar_t *); -void wbkgrndset(WINDOW *, const cchar_t *); -int getbkgrnd(cchar_t *); -int wgetbkgrnd(WINDOW *, cchar_t *); - -/* - * box.c - */ -int box(WINDOW *, chtype, chtype); - -/* - * box_set.c - */ -int box_set(WINDOW *, const cchar_t *, const cchar_t *); - -/* - * brdr.c - */ -int border(chtype, chtype, chtype, chtype, chtype, chtype, chtype, chtype); - -/* - * brdr_st.c - */ -int border_set(const cchar_t *, const cchar_t *, - const cchar_t *, const cchar_t *, - const cchar_t *, const cchar_t *, - const cchar_t *, const cchar_t *); - -/* - * cbreak.c - */ -int cbreak(void); -int nocbreak(void); -int halfdelay(int); -int raw(void); -int noraw(void); - -/* - * chgat.c - */ -int chgat(int, attr_t, short, const void *); -int mvchgat(int, int, int, attr_t, short, const void *); -int mvwchgat(WINDOW *, int, int, int, attr_t, short, const void *); - -/* - * clear.c - */ -int clear(void); -int erase(void); - -/* - * clearok.c - */ -int clearok(WINDOW *, bool); -void immedok(WINDOW *, bool); -int leaveok(WINDOW *, bool); -int notimeout(WINDOW *, bool); -int scrollok(WINDOW *, bool); - -/* - * clrbot.c - */ -int clrtobot(void); - -/* - * clreol.c - */ -int clrtoeol(void); - -/* - * color.c - */ -int start_color(void); -int init_color(short, short, short, short); -int init_pair(short, short, short); -int color_content(short, short *, short *, short *); -int pair_content(short, short *, short *); - -/* - * copywin.c - */ -int copywin(const WINDOW *, WINDOW *, int, int, int, int, int, int, int); - -/* - * curs_set.c - */ -int curs_set(int); - -/* - * delay.c - */ -int delay_output(int); - -/* - * delch.c - */ -int delch(void); -int mvdelch(int, int); -int mvwdelch(WINDOW *, int, int); - -/* - * deleteln.c - */ -int deleteln(void); -int insertln(void); -int insdelln(int); -int wdeleteln(WINDOW *); -int winsertln(WINDOW *); - -/* - * doupdate.c - */ -int doupdate(void); -void idcok(WINDOW *, bool); -int idlok(WINDOW *, bool); - -/* - * dupwin.c - */ -WINDOW *dupwin(WINDOW *); - -/* - * echo_wch.c - */ -int echo_wchar(const cchar_t *); -int wecho_wchar(WINDOW *, const cchar_t *); - -/* - * echochar.c - */ -int echochar(chtype); -int wechochar(WINDOW *, chtype); - -/* - * endwin.c - */ -int endwin(void); - -/* - * flushinp.c - */ -int flushinp(void); - -/* - * get_wch.c - */ -int get_wch(wint_t *); -int mvget_wch(int, int, wint_t *); -int mvwget_wch(WINDOW *, int, int, wint_t *); - -/* - * getcchar.c - */ -int getcchar(const cchar_t *, wchar_t *, attr_t *, short *, void *); - -/* - * getch.c - */ -int getch(void); -int mvgetch(int, int); -int mvwgetch(WINDOW *, int, int); - -/* - * getn_ws.c - */ -int getn_wstr(wint_t *, int); -int mvgetn_wstr(int, int, wint_t *, int); -int mvwgetn_wstr(WINDOW *, int, int, wint_t *, int); -int get_wstr(wint_t *); -int mvget_wstr(int, int, wint_t *); -int mvwget_wstr(WINDOW *, int, int, wint_t *); -int wget_wstr(WINDOW *, wint_t *); - -/* - * getnstr.c - */ -int getnstr(char *, int); -int mvgetnstr(int, int, char *, int); -int mvwgetnstr(WINDOW *, int, int, char *, int); -int getstr(char *); -int mvgetstr(int, int, char *); -int mvwgetstr(WINDOW *, int, int, char *); -int wgetstr(WINDOW *, char *); - -/* - * getwin.c - */ -WINDOW *getwin(FILE *); -int putwin(WINDOW *, FILE *); - -/* - * has.c - */ -bool has_colors(void); -bool has_ic(void); -bool has_il(void); -bool can_change_color(void); - -/* - * hln.c - */ -int hline(chtype, int); -int mvhline(int, int, chtype, int); -int mvwhline(WINDOW *, int, int, chtype, int); -int vline(chtype, int); -int mvvline(int, int, chtype, int); -int mvwvline(WINDOW *, int, int, chtype, int); - -/* - * hln_st.c - */ -int hline_set(const cchar_t *, int); -int mvhline_set(int, int, const cchar_t *, int); -int mvwhline_set(WINDOW *, int, int, const cchar_t *, int); -int vline_set(const cchar_t *, int); -int mvvline_set(int, int, const cchar_t *, int); -int mvwvline_set(WINDOW *, int, int, const cchar_t *, int); - -/* - * in_wch.c - */ -int in_wch(cchar_t *); -int mvin_wch(int, int, cchar_t *); -int mvwin_wch(WINDOW *, int, int, cchar_t *); - -/* - * in_wchn.c - */ -int in_wchnstr(cchar_t *, int); -int mvin_wchnstr(int, int, cchar_t *, int); -int mvwin_wchnstr(WINDOW *, int, int, cchar_t *, int); -int in_wchstr(cchar_t *); -int mvin_wchstr(int, int, cchar_t *); -int mvwin_wchstr(WINDOW *, int, int, cchar_t *); -int win_wchstr(WINDOW *, cchar_t *); - -/* - * inch.c - */ -chtype inch(void); -chtype mvinch(int, int); -chtype mvwinch(WINDOW *, int, int); - -/* - * inchn.c - */ -int inchnstr(chtype *, int); -int mvinchnstr(int, int, chtype *, int); -int mvwinchnstr(WINDOW *, int, int, chtype *, int); -int inchstr(chtype *); -int mvinchstr(int, int, chtype *); -int mvwinchstr(WINDOW *, int, int, chtype *); -int winchstr(WINDOW *, chtype *); - -/* - * initscr.c - */ -WINDOW *initscr(void); - -/* - * innstr.c - */ -int innstr(char *, int); -int mvinnstr(int, int, char *, int); -int mvwinnstr(WINDOW *, int, int, char *, int); -int instr(char *); -int mvinstr(int, int, char *); -int mvwinstr(WINDOW *, int, int, char *); -int winstr(WINDOW *, char *); - -/* - * innwstr.c - */ -int innwstr(wchar_t *, int); -int mvinnwstr(int, int, wchar_t *, int); -int mvwinnwstr(WINDOW *, int, int, wchar_t *, int); -int inwstr(wchar_t *); -int mvinwstr(int, int, wchar_t *); -int mvwinwstr(WINDOW *, int, int, wchar_t *); -int winwstr(WINDOW *, wchar_t *); - -/* - * ins_nws.c - */ -int ins_nwstr(const wchar_t *, int); -int mvins_nwstr(int, int, const wchar_t *, int); -int mvwins_nwstr(WINDOW *, int, int, const wchar_t *, int); -int ins_wstr(const wchar_t *); -int mvins_wstr(int, int, const wchar_t *); -int mvwins_wstr(WINDOW *, int, int, const wchar_t *); -int wins_wstr(WINDOW *, const wchar_t *); - -/* - * ins_wch.c - */ -int ins_wch(const cchar_t *); -int mvins_wch(int, int, const cchar_t *); -int mvwins_wch(WINDOW *, int, int, const cchar_t *); - -/* - * insch.c - */ -int insch(chtype); -int mvinsch(int, int, chtype); -int mvwinsch(WINDOW *, int, int, chtype); - -/* - * insnstr.c - */ -int insnstr(const char *, int); -int mvinsnstr(int, int, const char *, int); -int mvwinsnstr(WINDOW *, int, int, const char *, int); -int insstr(const char *); -int mvinsstr(int, int, const char *); -int mvwinsstr(WINDOW *, int, int, const char *); -int winsstr(WINDOW *, const char *); - -/* - * intrflsh.c - */ -int intrflush(WINDOW *, bool); - -/* - * isendwin.c - */ -bool isendwin(void); - -/* - * key_name.c - */ -char *key_name(wchar_t); - -/* - * keyname.c - */ -char *keyname(int); - -/* - * keypad.c - */ -int keypad(WINDOW *, bool); - -/* - * killchar.c - */ -char erasechar(void); -char killchar(void); - -/* - * killwch.c - */ -int erasewchar(wchar_t *); -int killwchar(wchar_t *); - -/* - * longname.c - */ -char *longname(void); -char *termname(void); - -/* - * meta.c - */ -int meta(WINDOW *, bool); - -/* - * move.c - */ -int move(int, int); - -/* - * mvcur.c - */ -int mvcur(int, int, int, int); - -/* - * mvwin.c - */ -int mvwin(WINDOW *, int, int); -int mvderwin(WINDOW *, int, int); - -/* - * napms.c - */ -int napms(int); - -/* - * newpad.c - */ -WINDOW *newpad(int, int); -WINDOW *subpad(WINDOW *, int, int, int, int); - -/* - * newterm.c - */ -void filter(void); -void tstp(int); -int ripoffline(int, int (*)(WINDOW *, int)); -SCREEN *newterm(char *, FILE *, FILE *); -void delscreen(SCREEN *); -SCREEN *set_term(SCREEN *); -int typeahead(int); - -/* - * newwin.c - */ -int delwin(WINDOW *); -WINDOW *derwin(WINDOW *, int, int, int, int); -WINDOW *newwin(int, int, int, int); -WINDOW *subwin(WINDOW *, int, int, int, int); - -/* - * noecho.c - */ -int echo(void); -int noecho(void); - -/* - * nonl.c - */ -int nl(void); -int nonl(void); - -/* - * overlay.c - */ -int overlay(const WINDOW *, WINDOW *); -int overwrite(const WINDOW *, WINDOW *); - -/* - * pecho_wc.c - */ -int pecho_wchar(WINDOW *, const cchar_t *); - -/* - * pechoch.c - */ -int pechochar(WINDOW *, chtype); - -/* - * prefresh.c - */ -int prefresh(WINDOW *, int, int, int, int, int, int); -int pnoutrefresh(WINDOW *, int, int, int, int, int, int); - -/* - * printw.c - */ -int printw(char *, ...); -int mvprintw(int, int, char *, ...); -int mvwprintw(WINDOW *, int, int, char *, ...); -int wprintw(WINDOW *, char *, ...); - -/* - * qiflush.c - */ -void qiflush(void); -void noqiflush(void); - -/* - * redraw.c - */ -int redrawwin(WINDOW *); - -/* - * refresh.c - */ -int refresh(void); - -/* - * savetty.c - */ -int savetty(void); -int resetty(void); - -/* - * scanw.c - */ -int scanw(char *, ...); -int mvscanw(int, int, char *, ...); -int mvwscanw(WINDOW *, int, int, char *, ...); -int wscanw(WINDOW *, char *, ...); - -/* - * scr_dump.c - */ -int scr_dump(const char *); -int scr_restore(const char *); -int scr_init(const char *); -int scr_set(const char *); - -/* - * scrl.c - */ -int scroll(WINDOW *); -int scrl(int); - -/* - * scrreg.c - */ -int setscrreg(int, int); - -/* - * setcchar.c - */ -int setcchar(cchar_t *, const wchar_t *, attr_t, short, const void *); - -/* - * setup.c - */ -void use_env(bool); -int setupterm(char *, int, int *); -int del_curterm(TERMINAL *); -TERMINAL *set_curterm(TERMINAL *); -int restartterm(char *, int, int *); -int def_shell_mode(void); -int def_prog_mode(void); -int reset_shell_mode(void); -int reset_prog_mode(void); - -/* - * slk.c - */ -int slk_init(int); -int slk_attron(const chtype); -int slk_attroff(const chtype); -int slk_attrset(const chtype); -int slk_attr_off(const attr_t, void *); -int slk_attr_on(const attr_t, void *); -int slk_attr_set(const attr_t, short, void *); -int slk_color(short); -int slk_touch(void); -int slk_clear(void); -int slk_restore(void); -int slk_noutrefresh(void); -int slk_refresh(void); -char *slk_label(int); -int slk_set(int, const char *, int); -int slk_wset(int, const wchar_t *, int); -int slk_color_set(short); - -/* - * termattr.c - */ -chtype termattrs(void); -attr_t term_attrs(void); - -/* - * tgetent.c - */ -int tgetent(char *, const char *); - -/* - * tgetflag.c - */ -int tgetflag(char *); - -/* - * tgetnum.c - */ -int tgetnum(char *); - -/* - * tgetstr.c - */ -char *tgetstr(char *, char **); - -/* - * tgoto.c - */ -char *tgoto(char *, int, int); - -/* - * tigetfla.c - */ -int tigetflag(char *); - -/* - * tigetnum.c - */ -int tigetnum(char *); - -/* - * tigetstr.c - */ -char *tigetstr(char *); - -/* - * timeout.c - */ -int nodelay(WINDOW *, bool); -void timeout(int); - -/* - * touched.c - */ -bool is_linetouched(WINDOW *, int); -bool is_wintouched(WINDOW *); - -/* - * touchwin.c - */ -int touchwin(WINDOW *); -int untouchwin(WINDOW *); -int touchline(WINDOW *, int, int); - -/* - * unctrl.c - */ -char *unctrl(chtype); - -/* - * vid_attr.c - */ -int vid_attr(attr_t, short, void *); - -/* - * vid_puts.c - */ -int vid_puts(attr_t, short, void *, int (*)(int)); - -/* - * vidattr.c - */ -int vidattr(chtype); -int vidputs(chtype, int (*)(int)); - -/* - * vw_print.c - */ -int vw_printw(WINDOW *, char *, __va_list); - -/* - * vw_scanw.c - */ -int vw_scanw(WINDOW *, char *, __va_list); - -/* - * vwprintw.c - */ -int vwprintw(WINDOW *, char *, __va_list); - -/* - * vwscanw.c - */ -int vwscanw(WINDOW *, char *, __va_list); - -/* - * wadd_wch.c - */ -int wadd_wch(WINDOW *, const cchar_t *); - -/* - * waddch.c - */ -int waddch(WINDOW *, chtype); - -/* - * waddchn.c - */ -int waddchnstr(WINDOW *, const chtype *, int); - -/* - * waddnstr.c - */ -int waddnstr(WINDOW *, const char *, int); - -/* - * waddnws.c - */ -int waddnwstr(WINDOW *, const wchar_t *, int); - -/* - * waddwchn.c - */ -int wadd_wchnstr(WINDOW *, const cchar_t *, int); - -/* - * wattr_on.c - */ -int wattr_on(WINDOW *, attr_t, void *); -int wattr_off(WINDOW *, attr_t, void *); -int wattr_set(WINDOW *, attr_t, short, void *); -int wattr_get(WINDOW *, attr_t *, short *, void *); -int wcolor_set(WINDOW *, short, void *); -int wstandout(WINDOW *); -int wstandend(WINDOW *); - -/* - * wattron.c - */ -int wattron(WINDOW *, int); -int wattroff(WINDOW *, int); -int wattrset(WINDOW *, int); - -/* - * wbkgrnd.c - */ -int wbkgrnd(WINDOW *, const cchar_t *); - -/* - * wbrdr.c - */ -int wborder(WINDOW *, chtype, chtype, chtype, chtype, - chtype, chtype, chtype, chtype); - -/* - * wbrdr_st.c - */ -int wborder_set(WINDOW *, const cchar_t *, const cchar_t *, - const cchar_t *, const cchar_t *, const cchar_t *, const cchar_t *, - const cchar_t *, const cchar_t *); - -/* - * wchgat.c - */ -int wchgat(WINDOW *, int, attr_t, short, const void *); - -/* - * wclear.c - */ -int wclear(WINDOW *); -int werase(WINDOW *); - -/* - * wclrbot.c - */ -int wclrtobot(WINDOW *); - -/* - * wclreol.c - */ -int wclrtoeol(WINDOW *); - -/* - * wdelch.c - */ -int wdelch(WINDOW *); - -/* - * wget_wch.c - */ -int unget_wch(const wchar_t); -int wget_wch(WINDOW *, wint_t *); - -/* - * wgetch.c - */ -int ungetch(int); -int wgetch(WINDOW *); - -/* - * wgetn_ws.c - */ -int wgetnstr(WINDOW *, char *, int); -int wgetn_wstr(WINDOW *, wint_t *, int); - -/* - * whln.c - */ -int whline(WINDOW *, chtype, int); -int wvline(WINDOW *, chtype, int); - -/* - * whln_st.c - */ -int whline_set(WINDOW *, const cchar_t *, int); -int wvline_set(WINDOW *, const cchar_t *, int); - -/* - * win_wch.c - */ -int win_wch(WINDOW *, cchar_t *); - -/* - * win_wchn.c - */ -int win_wchnstr(WINDOW *, cchar_t *, int); - -/* - * winch.c - */ -chtype winch(WINDOW *); - -/* - * winchn.c - */ -int winchnstr(WINDOW *, chtype *, int); - -/* - * winnstr.c - */ -int winnstr(WINDOW *, char *, int); - -/* - * winnwstr.c - */ -int winnwstr(WINDOW *, wchar_t *, int); - -/* - * wins_nws.c - */ -int wins_nwstr(WINDOW *, const wchar_t *, int); - -/* - * wins_wch.c - */ -int wins_wch(WINDOW *, const cchar_t *); - -/* - * winsch.c - */ -int winsch(WINDOW *, chtype); - -/* - * winsdel.c - */ -int winsdelln(WINDOW *, int); - -/* - * winsnstr.c - */ -int winsnstr(WINDOW *, const char *, int); - -/* - * wmove.c - */ -int wmove(WINDOW *, int, int); - -/* - * wredraw.c - */ -int wredrawln(WINDOW *, int, int); - -/* - * wrefresh.c - */ -int wrefresh(WINDOW *); -int wnoutrefresh(WINDOW *); - -/* - * wscrl.c - */ -int wscrl(WINDOW *, int); - -/* - * wscrreg.c - */ -int wsetscrreg(WINDOW *, int, int); - -/* - * wsyncdn.c - */ -void wsyncdown(WINDOW *); - -/* - * wsyncup.c - */ -int syncok(WINDOW *, bool); -void wsyncup(WINDOW *); -void wcursyncup(WINDOW *); - -/* - * wtimeout.c - */ -void wtimeout(WINDOW *, int); - -/* - * wtouchln.c - */ -int wtouchln(WINDOW *, int, int, int); - -/* - * wunctrl.c - */ -wchar_t *wunctrl(cchar_t *); diff --git a/usr/src/lib/libxnet/common/llib-lxnet b/usr/src/lib/libxnet/common/llib-lxnet deleted file mode 100644 index 21baebd9b2..0000000000 --- a/usr/src/lib/libxnet/common/llib-lxnet +++ /dev/null @@ -1,44 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright (c) 2001 by Sun Microsystems, Inc. - * All rights reserved. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Set up the UNIX98 compilation environment. - */ -#define _XOPEN_SOURCE 500 -#include <sys/feature_tests.h> - -/* - * Slurp the interfaces out of the official UNIX98 networking headers. - */ -#include <sys/socket.h> -#include <arpa/inet.h> -#include <netinet/in.h> -#include <netdb.h> diff --git a/usr/src/lib/libzfs/common/llib-lzfs b/usr/src/lib/libzfs/common/llib-lzfs deleted file mode 100644 index 3552601183..0000000000 --- a/usr/src/lib/libzfs/common/llib-lzfs +++ /dev/null @@ -1,39 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2009 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/* - * Copyright 2010 Nexenta Systems, Inc. All rights reserved. - * Copyright (c) 2012 by Delphix. All rights reserved. - */ - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <libzfs.h> -#include <libzfs_core.h> -#include "../../../common/zfs/zfs_comutil.h" -#include "../../../common/zfs/zfs_fletcher.h" -#include "../../../common/zfs/zfs_prop.h" -#include "../../../common/zfs/zfeature_common.h" diff --git a/usr/src/lib/libzfs_core/common/llib-lzfs_core b/usr/src/lib/libzfs_core/common/llib-lzfs_core deleted file mode 100644 index 55f5d4e5e6..0000000000 --- a/usr/src/lib/libzfs_core/common/llib-lzfs_core +++ /dev/null @@ -1,28 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright (c) 2012 by Delphix. All rights reserved. - */ - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <libzfs_core.h> diff --git a/usr/src/lib/libzfs_jni/common/llib-lzfs_jni b/usr/src/lib/libzfs_jni/common/llib-lzfs_jni deleted file mode 100644 index 3e7aa11d57..0000000000 --- a/usr/src/lib/libzfs_jni/common/llib-lzfs_jni +++ /dev/null @@ -1,33 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <libzfs_jni_main.h> -#include <libzfs_jni_diskmgt.h> diff --git a/usr/src/lib/libzonecfg/common/llib-lzonecfg b/usr/src/lib/libzonecfg/common/llib-lzonecfg deleted file mode 100644 index ca868ee546..0000000000 --- a/usr/src/lib/libzonecfg/common/llib-lzonecfg +++ /dev/null @@ -1,32 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2003 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <libzonecfg.h> diff --git a/usr/src/lib/libzoneinfo/common/llib-lzoneinfo b/usr/src/lib/libzoneinfo/common/llib-lzoneinfo deleted file mode 100644 index ffc38c7c8d..0000000000 --- a/usr/src/lib/libzoneinfo/common/llib-lzoneinfo +++ /dev/null @@ -1,32 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright (c) 2001 by Sun Microsystems, Inc. - * All rights reserved. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <libzoneinfo.h> diff --git a/usr/src/lib/libzonestat/common/llib-lzonestat b/usr/src/lib/libzonestat/common/llib-lzonestat deleted file mode 100644 index 189214ce22..0000000000 --- a/usr/src/lib/libzonestat/common/llib-lzonestat +++ /dev/null @@ -1,30 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. - */ - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <zonestat.h> - diff --git a/usr/src/lib/libzpool/common/llib-lzpool b/usr/src/lib/libzpool/common/llib-lzpool deleted file mode 100644 index 43938533ca..0000000000 --- a/usr/src/lib/libzpool/common/llib-lzpool +++ /dev/null @@ -1,76 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2010 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/* - * Copyright (c) 2012, 2018 by Delphix. All rights reserved. - */ - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <sys/zfs_context.h> -#include <sys/list.h> -#include <sys/list_impl.h> -#include <sys/sysmacros.h> -#include <sys/debug.h> -#include <sys/dmu_traverse.h> -#include <sys/dnode.h> -#include <sys/dsl_prop.h> -#include <sys/dsl_dataset.h> -#include <sys/dsl_scan.h> -#include <sys/spa.h> -#include <sys/spa_impl.h> -#include <sys/space_map.h> -#include <sys/vdev.h> -#include <sys/vdev_impl.h> -#include <sys/vdev_initialize.h> -#include <sys/zap.h> -#include <sys/zio.h> -#include <sys/zio_compress.h> -#include <sys/zil.h> -#include <sys/bplist.h> -#include <sys/zfs_znode.h> -#include <sys/arc.h> -#include <sys/dbuf.h> -#include <sys/zio_checksum.h> -#include <sys/ddt.h> -#include <sys/sa.h> -#include <sys/zfs_sa.h> -#include <sys/zfeature.h> -#include <sys/dmu_tx.h> -#include <sys/dsl_destroy.h> -#include <sys/dsl_userhold.h> -#include <sys/blkptr.h> -#include <sys/abd.h> -#include <libcmdutils.h> - -extern uint64_t metaslab_force_ganging; -extern uint64_t metaslab_df_alloc_threshold; -extern boolean_t zfeature_checks_disable; -extern uint64_t zfs_deadman_synctime_ms; -extern int metaslab_preload_limit; -extern boolean_t zfs_compressed_arc_enabled; -extern boolean_t zfs_abd_scatter_enabled; -extern boolean_t zfs_force_some_double_word_sm_entries; diff --git a/usr/src/lib/mpapi/libmpapi/common/llib-lMPAPI b/usr/src/lib/mpapi/libmpapi/common/llib-lMPAPI deleted file mode 100644 index 5fe92023db..0000000000 --- a/usr/src/lib/mpapi/libmpapi/common/llib-lMPAPI +++ /dev/null @@ -1,31 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <mpapi.h> -#include <mpapi-sun.h> diff --git a/usr/src/lib/passwdutil/llib-lpasswdutil b/usr/src/lib/passwdutil/llib-lpasswdutil deleted file mode 100644 index d01280531e..0000000000 --- a/usr/src/lib/passwdutil/llib-lpasswdutil +++ /dev/null @@ -1,32 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright (c) 2001 by Sun Microsystems, Inc. - * All rights reserved. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <passwdutil.h> diff --git a/usr/src/lib/pkcs11/libkcfd/common/llib-lkcfd b/usr/src/lib/pkcs11/libkcfd/common/llib-lkcfd deleted file mode 100644 index e0bf5cac2d..0000000000 --- a/usr/src/lib/pkcs11/libkcfd/common/llib-lkcfd +++ /dev/null @@ -1,34 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * Copyright 2009 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/* - * usr/src/lib/pkcs11/libkcfd - * EMPTY library - */ - -#include <security/cryptoki.h> diff --git a/usr/src/lib/pkcs11/libpkcs11/common/llib-lpkcs11 b/usr/src/lib/pkcs11/libpkcs11/common/llib-lpkcs11 deleted file mode 100644 index 9c23f35ffc..0000000000 --- a/usr/src/lib/pkcs11/libpkcs11/common/llib-lpkcs11 +++ /dev/null @@ -1,32 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2003 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <security/cryptoki.h> diff --git a/usr/src/lib/pkcs11/libsoftcrypto/common/llib-lsoftcrypto b/usr/src/lib/pkcs11/libsoftcrypto/common/llib-lsoftcrypto deleted file mode 100644 index a32a15a267..0000000000 --- a/usr/src/lib/pkcs11/libsoftcrypto/common/llib-lsoftcrypto +++ /dev/null @@ -1,42 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. - */ - - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <bignum.h> -#include <aes_cbc_crypt.h> -#include <aes_impl.h> -#include <arcfour.h> -#include <blowfish_cbc_crypt.h> -#include <blowfish_impl.h> -#include <des_cbc_crypt.h> -#include <des_impl.h> -#include <dh_impl.h> -#include <dsa_impl.h> -#include <modes.h> -#include <padding.h> -#include <rsa_impl.h> diff --git a/usr/src/lib/policykit/libpolkit/common/llib-lpolkit b/usr/src/lib/policykit/libpolkit/common/llib-lpolkit deleted file mode 100644 index 5762753ad8..0000000000 --- a/usr/src/lib/policykit/libpolkit/common/llib-lpolkit +++ /dev/null @@ -1,30 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <libpolkit/libpolkit.h> diff --git a/usr/src/lib/print/libprint/common/llib-lprint b/usr/src/lib/print/libprint/common/llib-lprint deleted file mode 100644 index c52143e527..0000000000 --- a/usr/src/lib/print/libprint/common/llib-lprint +++ /dev/null @@ -1,141 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <arpa/inet.h> -#include <dirent.h> -#include <dlfcn.h> -#include <errno.h> -#include <fcntl.h> -#include <libintl.h> -#include <netdb.h> -#include <netinet/in.h> -#include <pwd.h> -#include <rpc/rpc.h> -#include <rpcsvc/yp_prot.h> -#include <rpcsvc/ypclnt.h> -#include <signal.h> -#include <stdarg.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <sys/mman.h> -#include <sys/socket.h> -#include <sys/stat.h> -#include <sys/systeminfo.h> -#include <sys/types.h> -#include <syslog.h> -#include <unistd.h> - -void **list_append(void **, void *); -void **list_append_unique(void **, void *, int (*)(void *, void*)); -void **list_concatenate(void **, void **); -void * list_locate(void **, int (*)(void *, void *), void *); -int list_iterate(void **, int (*)(void *, __va_list), ...); - -void *dynamic_function(const char *, const char *); - -struct ns_bsd_addr { - char *server; /* server name */ - char *printer; /* printer name or NULL */ - char *extension; /* RFC-1179 conformance */ - char *pname; /* Local printer name */ -}; -typedef struct ns_bsd_addr ns_bsd_addr_t; - -/* Key/Value pair structure */ -struct ns_kvp { - char *key; /* key */ - char *value; /* value string */ -}; -typedef struct ns_kvp ns_kvp_t; - -/* Printer Object structure */ -struct ns_printer { - char *name; /* primary name of printer */ - char **aliases; /* aliases for printer */ - char *source; /* name service derived from */ - ns_kvp_t **attributes; /* key/value pairs. */ -}; -typedef struct ns_printer ns_printer_t; - -/* functions to get/put printer objects */ -ns_printer_t *ns_printer_create(char *, char **, char *, ns_kvp_t **); -ns_printer_t *ns_printer_get_name(const char *, const char *); -ns_printer_t **ns_printer_get_list(const char *); -int ns_printer_put(const ns_printer_t *); -void ns_printer_destroy(ns_printer_t *); - -/* functions to manipulate key/value pairs */ -void *ns_get_value(const char *, const ns_printer_t *); -char *ns_get_value_string(const char *, const ns_printer_t *); -int ns_set_value(const char *, const void *, ns_printer_t *); -int ns_set_value_from_string(const char *, const char *, - ns_printer_t *); -ns_kvp_t *ns_kvp_create(const char *, const char *); - -/* for BSD bindings only */ -ns_bsd_addr_t *ns_bsd_addr_get_default(void); -ns_bsd_addr_t *ns_bsd_addr_get_name(char *name); -ns_bsd_addr_t **ns_bsd_addr_get_all(int); -ns_bsd_addr_t **ns_bsd_addr_get_list(int); - -/* others */ -ns_printer_t *posix_name(const char *); -int ns_printer_match_name(ns_printer_t *, const char *); -char *ns_printer_name_list(const ns_printer_t *); -char *value_to_string(const char *, void *); -void *string_to_value(const char *, char *); - - -ns_printer_t *_cvt_pconf_entry_to_printer(char *, char *); -char *_cvt_printer_to_pconf_entry(ns_printer_t *); - -ns_printer_t *_cvt_user_string_to_printer(char *, char *); -char *_cvt_printer_to_user_string(ns_printer_t *); - - -ns_printer_t *_file_get_name(const char *, const char *, - ns_printer_t *(*)(char *, char *), char *); - -ns_printer_t **_file_get_list(const char *, - ns_printer_t *(*)(char *, char *), char *); - -int _file_put_printer(const char *, const ns_printer_t *, - ns_printer_t *(*)(char *, char *), char *, char *(*)(ns_printer_t *)); - - -ns_printer_t *_nis_get_name(const char *, const char *, - ns_printer_t *(*)(char *, char *), char *); - -ns_printer_t **_nis_get_list(const char *, - ns_printer_t *(*)(char *, char *), char *); - -int _nis_put_printer(const char *, const ns_printer_t *, - ns_printer_t *(*)(char *, char *), char *, char *(*)(ns_printer_t *)); diff --git a/usr/src/lib/scsi/libscsi/llib-lscsi b/usr/src/lib/scsi/libscsi/llib-lscsi deleted file mode 100644 index 2c7111c8d1..0000000000 --- a/usr/src/lib/scsi/libscsi/llib-lscsi +++ /dev/null @@ -1,32 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <scsi/libscsi.h> diff --git a/usr/src/lib/scsi/libses/llib-lses b/usr/src/lib/scsi/libses/llib-lses deleted file mode 100644 index c274b8ad3b..0000000000 --- a/usr/src/lib/scsi/libses/llib-lses +++ /dev/null @@ -1,32 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <scsi/libses.h> diff --git a/usr/src/lib/scsi/libsmp/llib-lsmp b/usr/src/lib/scsi/libsmp/llib-lsmp deleted file mode 100644 index 3beb22f496..0000000000 --- a/usr/src/lib/scsi/libsmp/llib-lsmp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. - */ - - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <scsi/libsmp.h> -#include <scsi/libsmp_plugin.h> diff --git a/usr/src/lib/smbsrv/libfksmbsrv/common/llib-lfksmbsrv b/usr/src/lib/smbsrv/libfksmbsrv/common/llib-lfksmbsrv deleted file mode 100644 index d18f2c6186..0000000000 --- a/usr/src/lib/smbsrv/libfksmbsrv/common/llib-lfksmbsrv +++ /dev/null @@ -1,19 +0,0 @@ -/* - * This file and its contents are supplied under the terms of the - * Common Development and Distribution License ("CDDL"), version 1.0. - * You may only use this file in accordance with the terms of version - * 1.0 of the CDDL. - * - * A full copy of the text of the CDDL should have accompanied this - * source. A copy of the CDDL is also available via the Internet at - * http://www.illumos.org/license/CDDL. - */ - -/* - * Copyright 2013 Nexenta Systems, Inc. All rights reserved. - */ - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <smbsrv/smb_ioctl.h> diff --git a/usr/src/lib/smbsrv/libmlsvc/common/llib-lmlsvc b/usr/src/lib/smbsrv/libmlsvc/common/llib-lmlsvc deleted file mode 100644 index 412e13d740..0000000000 --- a/usr/src/lib/smbsrv/libmlsvc/common/llib-lmlsvc +++ /dev/null @@ -1,31 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <smbsrv/libmlsvc.h> diff --git a/usr/src/lib/smbsrv/libsmb/common/llib-lsmb b/usr/src/lib/smbsrv/libsmb/common/llib-lsmb deleted file mode 100644 index e900ce8047..0000000000 --- a/usr/src/lib/smbsrv/libsmb/common/llib-lsmb +++ /dev/null @@ -1,31 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <smbsrv/libsmb.h> diff --git a/usr/src/lib/smbsrv/libsmbns/common/llib-lsmbns b/usr/src/lib/smbsrv/libsmbns/common/llib-lsmbns deleted file mode 100644 index 5420d543b5..0000000000 --- a/usr/src/lib/smbsrv/libsmbns/common/llib-lsmbns +++ /dev/null @@ -1,31 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <smbsrv/libsmbns.h> diff --git a/usr/src/lib/smbsrv/libsmbrp/common/llib-lreparse_smb b/usr/src/lib/smbsrv/libsmbrp/common/llib-lreparse_smb deleted file mode 100644 index 34f650da59..0000000000 --- a/usr/src/lib/smbsrv/libsmbrp/common/llib-lreparse_smb +++ /dev/null @@ -1,29 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2010 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <smbsrv/smb_dfs.h> diff --git a/usr/src/lib/smhba/common/llib-lSMHBAAPI b/usr/src/lib/smhba/common/llib-lSMHBAAPI deleted file mode 100644 index 18e4b625cb..0000000000 --- a/usr/src/lib/smhba/common/llib-lSMHBAAPI +++ /dev/null @@ -1,30 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ - -/* - * Copyright 2009 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <smhbaapi.h> diff --git a/usr/src/lib/storage/liba5k/common/llib-la5k b/usr/src/lib/storage/liba5k/common/llib-la5k deleted file mode 100644 index 23cd8ccb73..0000000000 --- a/usr/src/lib/storage/liba5k/common/llib-la5k +++ /dev/null @@ -1,46 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <stdlib.h> -#include <stdio.h> -#include <sys/file.h> -#include <sys/types.h> -#include <sys/param.h> -#include <fcntl.h> -#include <unistd.h> -#include <errno.h> -#include <string.h> -#include <sys/scsi/scsi.h> -#include <nl_types.h> -#include <strings.h> -#include <sys/ddi.h> /* for max */ -#include <l_common.h> -#include <stgcom.h> -#include <l_error.h> -#include <a_state.h> -#include <a5k.h> diff --git a/usr/src/lib/storage/libg_fc/common/llib-lg_fc b/usr/src/lib/storage/libg_fc/common/llib-lg_fc deleted file mode 100644 index a631a610fe..0000000000 --- a/usr/src/lib/storage/libg_fc/common/llib-lg_fc +++ /dev/null @@ -1,29 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -/*LINTLIBRARY*/ -/*PROTOLIB1*/ - -#include <gfc.h> diff --git a/usr/src/lib/udapl/libdat/common/llib-ldat b/usr/src/lib/udapl/libdat/common/llib-ldat deleted file mode 100644 index 4bb868f403..0000000000 --- a/usr/src/lib/udapl/libdat/common/llib-ldat +++ /dev/null @@ -1,29 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2003 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -#include <dat/udat.h> diff --git a/usr/src/man/man5/zpool-features.5 b/usr/src/man/man5/zpool-features.5 index e825955380..26e8a357f0 100644 --- a/usr/src/man/man5/zpool-features.5 +++ b/usr/src/man/man5/zpool-features.5 @@ -533,6 +533,30 @@ set larger than 128KB, and will return to being \fBenabled\fR once all filesystems that have ever had their recordsize larger than 128KB are destroyed. .RE +.ne 2 +.na +\fB\fBlarge_dnode\fR\fR +.ad +.RS 4n +.TS +l l . +GUID org.zfsonlinux:large_dnode +READ\-ONLY COMPATIBLE no +DEPENDENCIES extensible_dataset +.TE + +The \fBlarge_dnode\fR feature allows the size of dnodes in a dataset to be +set larger than 512B. + +This feature becomes \fBactive\fR once a dataset contains an object with a +dnode larger than 512B, which occurs as a result of setting the \fBdnodesize\fR +dataset property to a value other than \fBlegacy\fR. The feature will return to +being \fBenabled\fR once all filesystems that have ever contained a dnode larger +than 512B are destroyed. Large dnodes allow more data to be stored in the +bonus buffer, thus potentially improving performance by avoiding the use of +spill blocks. +.RE + .sp .ne 2 .na diff --git a/usr/src/pkg/manifests/developer-dtrace.mf b/usr/src/pkg/manifests/developer-dtrace.mf index c6aa48f53b..cf98c41b84 100644 --- a/usr/src/pkg/manifests/developer-dtrace.mf +++ b/usr/src/pkg/manifests/developer-dtrace.mf @@ -21,6 +21,7 @@ # # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # # @@ -181,7 +182,6 @@ file path=usr/include/sys/lockstat.h file path=usr/include/sys/sdt.h file path=usr/lib/$(ARCH64)/libdtrace.so.1 file path=usr/lib/$(ARCH64)/libdtrace_jni.so.1 -file path=usr/lib/$(ARCH64)/llib-ldtrace.ln file path=usr/lib/devfsadm/linkmod/SUNW_dtrace_link.so group=sys file path=usr/lib/dtrace/64/drti.o mode=0444 file path=usr/lib/dtrace/64/libdtrace_forceload.so mode=0555 @@ -207,8 +207,6 @@ file path=usr/lib/dtrace/udp.d mode=0444 file path=usr/lib/dtrace/unistd.d mode=0444 file path=usr/lib/libdtrace.so.1 file path=usr/lib/libdtrace_jni.so.1 -file path=usr/lib/llib-ldtrace -file path=usr/lib/llib-ldtrace.ln file path=usr/lib/mdb/kvm/$(ARCH64)/dtrace.so group=sys mode=0555 file path=usr/lib/mdb/raw/$(ARCH64)/dof.so group=sys mode=0555 file path=usr/lib/mdb/raw/dof.so group=sys mode=0555 diff --git a/usr/src/pkg/manifests/developer-library-lint.mf b/usr/src/pkg/manifests/developer-library-lint.mf index 909091933c..ed375ca578 100644 --- a/usr/src/pkg/manifests/developer-library-lint.mf +++ b/usr/src/pkg/manifests/developer-library-lint.mf @@ -27,493 +27,5 @@ # set name=pkg.fmri value=pkg:/developer/library/lint@$(PKGVERS) -set name=pkg.description value="lint libraries for software development" -set name=pkg.summary value="Lint Libraries" -set name=info.classification value=org.opensolaris.category.2008:Development/C +set name=pkg.obsolete value=true set name=variant.arch value=$(ARCH) -dir path=lib -dir path=lib/$(ARCH64) -dir path=usr group=sys -dir path=usr/ccs -dir path=usr/ccs/lib -dir path=usr/ccs/lib/$(ARCH64) -dir path=usr/lib -dir path=usr/lib/$(ARCH64) -dir path=usr/lib/scsi -dir path=usr/lib/scsi/$(ARCH64) -dir path=usr/xpg4 -dir path=usr/xpg4/lib -dir path=usr/xpg4/lib/$(ARCH64) -file path=lib/$(ARCH64)/llib-ladm.ln -file path=lib/$(ARCH64)/llib-laio.ln -file path=lib/$(ARCH64)/llib-lavl.ln -file path=lib/$(ARCH64)/llib-lbsm.ln -file path=lib/$(ARCH64)/llib-lc_db.ln -file path=lib/$(ARCH64)/llib-lcontract.ln -file path=lib/$(ARCH64)/llib-lcryptoutil.ln -file path=lib/$(ARCH64)/llib-lctf.ln -file path=lib/$(ARCH64)/llib-lcurses.ln -file path=lib/$(ARCH64)/llib-ldevice.ln -file path=lib/$(ARCH64)/llib-ldevid.ln -file path=lib/$(ARCH64)/llib-ldevinfo.ln -file path=lib/$(ARCH64)/llib-ldladm.ln -file path=lib/$(ARCH64)/llib-ldlpi.ln -file path=lib/$(ARCH64)/llib-ldoor.ln -file path=lib/$(ARCH64)/llib-lefi.ln -$(i386_ONLY)file path=lib/$(ARCH64)/llib-lfdisk.ln -file path=lib/$(ARCH64)/llib-lgen.ln -file path=lib/$(ARCH64)/llib-lintl.ln -file path=lib/$(ARCH64)/llib-lkmf.ln -file path=lib/$(ARCH64)/llib-lkmfberder.ln -file path=lib/$(ARCH64)/llib-lkstat.ln -file path=lib/$(ARCH64)/llib-lmd.ln -file path=lib/$(ARCH64)/llib-lmd5.ln -file path=lib/$(ARCH64)/llib-lnsl.ln -file path=lib/$(ARCH64)/llib-lnvpair.ln -file path=lib/$(ARCH64)/llib-lofmt.ln -file path=lib/$(ARCH64)/llib-lpam.ln -file path=lib/$(ARCH64)/llib-lproc.ln -file path=lib/$(ARCH64)/llib-lpthread.ln -file path=lib/$(ARCH64)/llib-lrcm.ln -file path=lib/$(ARCH64)/llib-lresolv.ln -file path=lib/$(ARCH64)/llib-lrpcsvc.ln -file path=lib/$(ARCH64)/llib-lrt.ln -file path=lib/$(ARCH64)/llib-lscf.ln -file path=lib/$(ARCH64)/llib-lsec.ln -file path=lib/$(ARCH64)/llib-lsecdb.ln -file path=lib/$(ARCH64)/llib-lsendfile.ln -file path=lib/$(ARCH64)/llib-lsocket.ln -file path=lib/$(ARCH64)/llib-lsysevent.ln -file path=lib/$(ARCH64)/llib-ltermcap.ln -file path=lib/$(ARCH64)/llib-lthread.ln -file path=lib/$(ARCH64)/llib-ltsnet.ln -file path=lib/$(ARCH64)/llib-ltsol.ln -file path=lib/$(ARCH64)/llib-lumem.ln -file path=lib/$(ARCH64)/llib-luuid.ln -$(i386_ONLY)file path=lib/$(ARCH64)/llib-luutil.ln -file path=lib/$(ARCH64)/llib-lxnet.ln -file path=lib/llib-ladm -file path=lib/llib-ladm.ln -file path=lib/llib-laio -file path=lib/llib-laio.ln -file path=lib/llib-lavl -file path=lib/llib-lavl.ln -file path=lib/llib-lbsm -file path=lib/llib-lbsm.ln -file path=lib/llib-lc_db -file path=lib/llib-lc_db.ln -file path=lib/llib-lcontract -file path=lib/llib-lcontract.ln -file path=lib/llib-lcryptoutil -file path=lib/llib-lcryptoutil.ln -file path=lib/llib-lctf -file path=lib/llib-lctf.ln -file path=lib/llib-lcurses -file path=lib/llib-lcurses.ln -file path=lib/llib-ldevice -file path=lib/llib-ldevice.ln -file path=lib/llib-ldevid -file path=lib/llib-ldevid.ln -file path=lib/llib-ldevinfo -file path=lib/llib-ldevinfo.ln -file path=lib/llib-ldladm -file path=lib/llib-ldladm.ln -file path=lib/llib-ldlpi -file path=lib/llib-ldlpi.ln -file path=lib/llib-ldoor -file path=lib/llib-ldoor.ln -file path=lib/llib-lefi -file path=lib/llib-lefi.ln -$(i386_ONLY)file path=lib/llib-lfdisk -$(i386_ONLY)file path=lib/llib-lfdisk.ln -file path=lib/llib-lgen -file path=lib/llib-lgen.ln -file path=lib/llib-lintl -file path=lib/llib-lintl.ln -file path=lib/llib-lipmp -file path=lib/llib-lipmp.ln -file path=lib/llib-lkmf.ln -file path=lib/llib-lkmfberder.ln -file path=lib/llib-lkstat -file path=lib/llib-lkstat.ln -file path=lib/llib-lmd -file path=lib/llib-lmd.ln -file path=lib/llib-lmd5 -file path=lib/llib-lmd5.ln -file path=lib/llib-lnsl -file path=lib/llib-lnsl.ln -file path=lib/llib-lnvpair -file path=lib/llib-lnvpair.ln -file path=lib/llib-lnwam -file path=lib/llib-lnwam.ln -file path=lib/llib-lofmt -file path=lib/llib-lofmt.ln -file path=lib/llib-lpam -file path=lib/llib-lpam.ln -file path=lib/llib-lproc -file path=lib/llib-lproc.ln -file path=lib/llib-lpthread -file path=lib/llib-lpthread.ln -file path=lib/llib-lrcm -file path=lib/llib-lrcm.ln -file path=lib/llib-lresolv -file path=lib/llib-lresolv.ln -file path=lib/llib-lrpcsvc -file path=lib/llib-lrpcsvc.ln -file path=lib/llib-lrt -file path=lib/llib-lrt.ln -file path=lib/llib-lscf -file path=lib/llib-lscf.ln -file path=lib/llib-lsec -file path=lib/llib-lsec.ln -file path=lib/llib-lsecdb -file path=lib/llib-lsecdb.ln -file path=lib/llib-lsendfile -file path=lib/llib-lsendfile.ln -file path=lib/llib-lsocket -file path=lib/llib-lsocket.ln -file path=lib/llib-lsysevent -file path=lib/llib-lsysevent.ln -file path=lib/llib-ltermcap -file path=lib/llib-ltermcap.ln -file path=lib/llib-lthread -file path=lib/llib-lthread.ln -file path=lib/llib-ltsnet -file path=lib/llib-ltsnet.ln -file path=lib/llib-ltsol -file path=lib/llib-ltsol.ln -file path=lib/llib-lumem -file path=lib/llib-lumem.ln -file path=lib/llib-luuid -file path=lib/llib-luuid.ln -file path=lib/llib-lxnet -file path=lib/llib-lxnet.ln -file path=usr/lib/$(ARCH64)/llib-lads.ln -file path=usr/lib/$(ARCH64)/llib-ladutils.ln -file path=usr/lib/$(ARCH64)/llib-lbsdmalloc.ln -file path=usr/lib/$(ARCH64)/llib-lcfgadm.ln -file path=usr/lib/$(ARCH64)/llib-lcommputil.ln -file path=usr/lib/$(ARCH64)/llib-lcrypt.ln -file path=usr/lib/$(ARCH64)/llib-lexacct.ln -file path=usr/lib/$(ARCH64)/llib-lform.ln -file path=usr/lib/$(ARCH64)/llib-lfstyp.ln -file path=usr/lib/$(ARCH64)/llib-lgss.ln -file path=usr/lib/$(ARCH64)/llib-lhotplug.ln -file path=usr/lib/$(ARCH64)/llib-lidmap.ln -file path=usr/lib/$(ARCH64)/llib-lipmi.ln -file path=usr/lib/$(ARCH64)/llib-lipp.ln -file path=usr/lib/$(ARCH64)/llib-lkvm.ln -file path=usr/lib/$(ARCH64)/llib-lldap.ln -file path=usr/lib/$(ARCH64)/llib-llgrp.ln -file path=usr/lib/$(ARCH64)/llib-lmail.ln -file path=usr/lib/$(ARCH64)/llib-lmalloc.ln -file path=usr/lib/$(ARCH64)/llib-lmapmalloc.ln -file path=usr/lib/$(ARCH64)/llib-lmenu.ln -file path=usr/lib/$(ARCH64)/llib-lmtmalloc.ln -file path=usr/lib/$(ARCH64)/llib-lnls.ln -file path=usr/lib/$(ARCH64)/llib-lpanel.ln -file path=usr/lib/$(ARCH64)/llib-lpasswdutil.ln -file path=usr/lib/$(ARCH64)/llib-lpkcs11.ln -file path=usr/lib/$(ARCH64)/llib-lproject.ln -file path=usr/lib/$(ARCH64)/llib-lreparse.ln -file path=usr/lib/$(ARCH64)/llib-lsasl.ln -file path=usr/lib/$(ARCH64)/llib-lsched.ln -file path=usr/lib/$(ARCH64)/llib-lsctp.ln -file path=usr/lib/$(ARCH64)/llib-lshare.ln -file path=usr/lib/$(ARCH64)/llib-lsip.ln -file path=usr/lib/$(ARCH64)/llib-lsldap.ln -file path=usr/lib/$(ARCH64)/llib-lsmbios.ln -$(sparc_ONLY)file path=usr/lib/$(ARCH64)/llib-lv12n.ln -file path=usr/lib/$(ARCH64)/llib-lvolmgt.ln -file path=usr/lib/$(ARCH64)/llib-lwrap.ln -file path=usr/lib/$(ARCH64)/llib-lzoneinfo.ln -file path=usr/lib/llib-lads -file path=usr/lib/llib-lads.ln -file path=usr/lib/llib-ladutils -file path=usr/lib/llib-ladutils.ln -file path=usr/lib/llib-lbsdmalloc -file path=usr/lib/llib-lbsdmalloc.ln -file path=usr/lib/llib-lcfgadm -file path=usr/lib/llib-lcfgadm.ln -file path=usr/lib/llib-lcommputil -file path=usr/lib/llib-lcommputil.ln -file path=usr/lib/llib-lcrypt -file path=usr/lib/llib-lcrypt.ln -file path=usr/lib/llib-lexacct -file path=usr/lib/llib-lexacct.ln -file path=usr/lib/llib-lform -file path=usr/lib/llib-lform.ln -file path=usr/lib/llib-lfstyp -file path=usr/lib/llib-lfstyp.ln -file path=usr/lib/llib-lgss -file path=usr/lib/llib-lgss.ln -file path=usr/lib/llib-lhotplug -file path=usr/lib/llib-lhotplug.ln -file path=usr/lib/llib-lidmap -file path=usr/lib/llib-lidmap.ln -file path=usr/lib/llib-lipmi -file path=usr/lib/llib-lipmi.ln -file path=usr/lib/llib-lipp -file path=usr/lib/llib-lipp.ln -file path=usr/lib/llib-lkvm -file path=usr/lib/llib-lkvm.ln -file path=usr/lib/llib-lldap -file path=usr/lib/llib-lldap.ln -file path=usr/lib/llib-llgrp -file path=usr/lib/llib-llgrp.ln -file path=usr/lib/llib-lmail -file path=usr/lib/llib-lmail.ln -file path=usr/lib/llib-lmalloc -file path=usr/lib/llib-lmalloc.ln -file path=usr/lib/llib-lmapmalloc -file path=usr/lib/llib-lmapmalloc.ln -file path=usr/lib/llib-lmenu -file path=usr/lib/llib-lmenu.ln -file path=usr/lib/llib-lmtmalloc.ln -file path=usr/lib/llib-lnls -file path=usr/lib/llib-lnls.ln -file path=usr/lib/llib-lpanel -file path=usr/lib/llib-lpanel.ln -file path=usr/lib/llib-lpasswdutil -file path=usr/lib/llib-lpasswdutil.ln -file path=usr/lib/llib-lpkcs11 -file path=usr/lib/llib-lpkcs11.ln -file path=usr/lib/llib-lproject -file path=usr/lib/llib-lproject.ln -file path=usr/lib/llib-lreparse -file path=usr/lib/llib-lreparse.ln -file path=usr/lib/llib-lsasl -file path=usr/lib/llib-lsasl.ln -file path=usr/lib/llib-lsched -file path=usr/lib/llib-lsched.ln -file path=usr/lib/llib-lsctp -file path=usr/lib/llib-lsctp.ln -file path=usr/lib/llib-lshare -file path=usr/lib/llib-lshare.ln -file path=usr/lib/llib-lsip -file path=usr/lib/llib-lsip.ln -file path=usr/lib/llib-lsldap -file path=usr/lib/llib-lsldap.ln -file path=usr/lib/llib-lsmbios -file path=usr/lib/llib-lsmbios.ln -$(sparc_ONLY)file path=usr/lib/llib-lv12n -$(sparc_ONLY)file path=usr/lib/llib-lv12n.ln -file path=usr/lib/llib-lvolmgt -file path=usr/lib/llib-lvolmgt.ln -file path=usr/lib/llib-lwrap -file path=usr/lib/llib-lwrap.ln -file path=usr/lib/llib-lzoneinfo -file path=usr/lib/llib-lzoneinfo.ln -file path=usr/lib/scsi/$(ARCH64)/llib-lscsi.ln -file path=usr/lib/scsi/$(ARCH64)/llib-lses.ln -file path=usr/lib/scsi/$(ARCH64)/llib-lsmp.ln -file path=usr/lib/scsi/llib-lscsi -file path=usr/lib/scsi/llib-lscsi.ln -file path=usr/lib/scsi/llib-lses -file path=usr/lib/scsi/llib-lses.ln -file path=usr/lib/scsi/llib-lsmp -file path=usr/lib/scsi/llib-lsmp.ln -file path=usr/xpg4/lib/$(ARCH64)/llib-lcurses.ln -file path=usr/xpg4/lib/llib-lcurses -file path=usr/xpg4/lib/llib-lcurses.ln -legacy pkg=SUNWarc \ - desc="lint libraries and startup objects for software development" \ - name="Lint Libraries (usr)" -legacy pkg=SUNWarcr desc="lint libraries for software development" \ - name="Lint Libraries (root)" -license cr_Sun license=cr_Sun -license lic_CDDL license=lic_CDDL -link path=lib/$(ARCH64)/llib-lposix4.ln target=./llib-lrt.ln -link path=lib/$(ARCH64)/llib-ltermlib.ln target=./llib-lcurses.ln -link path=lib/llib-lposix4 target=./llib-lrt -link path=lib/llib-lposix4.ln target=./llib-lrt.ln -link path=lib/llib-ltermlib target=./llib-lcurses -link path=lib/llib-ltermlib.ln target=./llib-lcurses.ln -link path=usr/ccs/lib/$(ARCH64)/llib-lcurses.ln \ - target=../../../../lib/$(ARCH64)/llib-lcurses.ln -link path=usr/ccs/lib/$(ARCH64)/llib-lform.ln \ - target=../../../lib/$(ARCH64)/llib-lform.ln -link path=usr/ccs/lib/$(ARCH64)/llib-lgen.ln \ - target=../../../../lib/$(ARCH64)/llib-lgen.ln -link path=usr/ccs/lib/$(ARCH64)/llib-lmenu.ln \ - target=../../../lib/$(ARCH64)/llib-lmenu.ln -link path=usr/ccs/lib/$(ARCH64)/llib-lpanel.ln \ - target=../../../lib/$(ARCH64)/llib-lpanel.ln -link path=usr/ccs/lib/$(ARCH64)/llib-ltermcap.ln \ - target=../../../../lib/$(ARCH64)/llib-ltermcap.ln -link path=usr/ccs/lib/$(ARCH64)/llib-ltermlib.ln \ - target=../../../../lib/$(ARCH64)/llib-lcurses.ln -link path=usr/ccs/lib/llib-lcurses target=../../../lib/llib-lcurses -link path=usr/ccs/lib/llib-lcurses.ln target=../../../lib/llib-lcurses.ln -link path=usr/ccs/lib/llib-lform target=../../lib/llib-lform -link path=usr/ccs/lib/llib-lform.ln target=../../lib/llib-lform.ln -link path=usr/ccs/lib/llib-lgen target=../../../lib/llib-lgen -link path=usr/ccs/lib/llib-lgen.ln target=../../../lib/llib-lgen.ln -link path=usr/ccs/lib/llib-lmenu target=../../lib/llib-lmenu -link path=usr/ccs/lib/llib-lmenu.ln target=../../lib/llib-lmenu.ln -link path=usr/ccs/lib/llib-lpanel target=../../lib/llib-lpanel -link path=usr/ccs/lib/llib-lpanel.ln target=../../lib/llib-lpanel.ln -link path=usr/ccs/lib/llib-ltermcap target=../../../lib/llib-ltermcap -link path=usr/ccs/lib/llib-ltermcap.ln target=../../../lib/llib-ltermcap.ln -link path=usr/ccs/lib/llib-ltermlib target=../../../lib/llib-lcurses -link path=usr/ccs/lib/llib-ltermlib.ln target=../../../lib/llib-lcurses.ln -link path=usr/lib/$(ARCH64)/llib-ladm.ln \ - target=../../../lib/$(ARCH64)/llib-ladm.ln -link path=usr/lib/$(ARCH64)/llib-laio.ln \ - target=../../../lib/$(ARCH64)/llib-laio.ln -link path=usr/lib/$(ARCH64)/llib-lavl.ln \ - target=../../../lib/$(ARCH64)/llib-lavl.ln -link path=usr/lib/$(ARCH64)/llib-lbsm.ln \ - target=../../../lib/$(ARCH64)/llib-lbsm.ln -link path=usr/lib/$(ARCH64)/llib-lcontract.ln \ - target=../../../lib/$(ARCH64)/llib-lcontract.ln -link path=usr/lib/$(ARCH64)/llib-lctf.ln \ - target=../../../lib/$(ARCH64)/llib-lctf.ln -link path=usr/lib/$(ARCH64)/llib-lcurses.ln \ - target=../../../lib/$(ARCH64)/llib-lcurses.ln -link path=usr/lib/$(ARCH64)/llib-ldevice.ln \ - target=../../../lib/$(ARCH64)/llib-ldevice.ln -link path=usr/lib/$(ARCH64)/llib-ldevid.ln \ - target=../../../lib/$(ARCH64)/llib-ldevid.ln -link path=usr/lib/$(ARCH64)/llib-ldevinfo.ln \ - target=../../../lib/$(ARCH64)/llib-ldevinfo.ln -link path=usr/lib/$(ARCH64)/llib-ldoor.ln \ - target=../../../lib/$(ARCH64)/llib-ldoor.ln -link path=usr/lib/$(ARCH64)/llib-lefi.ln \ - target=../../../lib/$(ARCH64)/llib-lefi.ln -$(i386_ONLY)link path=usr/lib/$(ARCH64)/llib-lfdisk.ln \ - target=../../../lib/$(ARCH64)/llib-lfdisk.ln -link path=usr/lib/$(ARCH64)/llib-lgen.ln \ - target=../../../lib/$(ARCH64)/llib-lgen.ln -link path=usr/lib/$(ARCH64)/llib-lintl.ln \ - target=../../../lib/$(ARCH64)/llib-lintl.ln -link path=usr/lib/$(ARCH64)/llib-lkstat.ln \ - target=../../../lib/$(ARCH64)/llib-lkstat.ln -link path=usr/lib/$(ARCH64)/llib-lmd5.ln \ - target=../../../lib/$(ARCH64)/llib-lmd5.ln -link path=usr/lib/$(ARCH64)/llib-lnsl.ln \ - target=../../../lib/$(ARCH64)/llib-lnsl.ln -link path=usr/lib/$(ARCH64)/llib-lnvpair.ln \ - target=../../../lib/$(ARCH64)/llib-lnvpair.ln -link path=usr/lib/$(ARCH64)/llib-lpam.ln \ - target=../../../lib/$(ARCH64)/llib-lpam.ln -link path=usr/lib/$(ARCH64)/llib-lposix4.ln \ - target=../../../lib/$(ARCH64)/llib-lrt.ln -link path=usr/lib/$(ARCH64)/llib-lpthread.ln \ - target=../../../lib/$(ARCH64)/llib-lpthread.ln -link path=usr/lib/$(ARCH64)/llib-lresolv.ln \ - target=../../../lib/$(ARCH64)/llib-lresolv.ln -link path=usr/lib/$(ARCH64)/llib-lrpcsvc.ln \ - target=../../../lib/$(ARCH64)/llib-lrpcsvc.ln -link path=usr/lib/$(ARCH64)/llib-lrt.ln \ - target=../../../lib/$(ARCH64)/llib-lrt.ln -link path=usr/lib/$(ARCH64)/llib-lscf.ln \ - target=../../../lib/$(ARCH64)/llib-lscf.ln -link path=usr/lib/$(ARCH64)/llib-lsec.ln \ - target=../../../lib/$(ARCH64)/llib-lsec.ln -link path=usr/lib/$(ARCH64)/llib-lsecdb.ln \ - target=../../../lib/$(ARCH64)/llib-lsecdb.ln -link path=usr/lib/$(ARCH64)/llib-lsendfile.ln \ - target=../../../lib/$(ARCH64)/llib-lsendfile.ln -link path=usr/lib/$(ARCH64)/llib-lsocket.ln \ - target=../../../lib/$(ARCH64)/llib-lsocket.ln -link path=usr/lib/$(ARCH64)/llib-lsysevent.ln \ - target=../../../lib/$(ARCH64)/llib-lsysevent.ln -link path=usr/lib/$(ARCH64)/llib-ltermcap.ln \ - target=../../../lib/$(ARCH64)/llib-ltermcap.ln -link path=usr/lib/$(ARCH64)/llib-ltermlib.ln \ - target=../../../lib/$(ARCH64)/llib-lcurses.ln -link path=usr/lib/$(ARCH64)/llib-lthread.ln \ - target=../../../lib/$(ARCH64)/llib-lthread.ln -link path=usr/lib/$(ARCH64)/llib-lthread_db.ln \ - target=../../../lib/$(ARCH64)/llib-lc_db.ln -link path=usr/lib/$(ARCH64)/llib-ltsnet.ln \ - target=../../../lib/$(ARCH64)/llib-ltsnet.ln -link path=usr/lib/$(ARCH64)/llib-ltsol.ln \ - target=../../../lib/$(ARCH64)/llib-ltsol.ln -link path=usr/lib/$(ARCH64)/llib-lumem.ln \ - target=../../../lib/$(ARCH64)/llib-lumem.ln -link path=usr/lib/$(ARCH64)/llib-luuid.ln \ - target=../../../lib/$(ARCH64)/llib-luuid.ln -link path=usr/lib/$(ARCH64)/llib-lxnet.ln \ - target=../../../lib/$(ARCH64)/llib-lxnet.ln -link path=usr/lib/llib-ladm target=../../lib/llib-ladm -link path=usr/lib/llib-ladm.ln target=../../lib/llib-ladm.ln -link path=usr/lib/llib-laio target=../../lib/llib-laio -link path=usr/lib/llib-laio.ln target=../../lib/llib-laio.ln -link path=usr/lib/llib-lavl target=../../lib/llib-lavl -link path=usr/lib/llib-lavl.ln target=../../lib/llib-lavl.ln -link path=usr/lib/llib-lbsm target=../../lib/llib-lbsm -link path=usr/lib/llib-lbsm.ln target=../../lib/llib-lbsm.ln -link path=usr/lib/llib-lcontract target=../../lib/llib-lcontract -link path=usr/lib/llib-lcontract.ln target=../../lib/llib-lcontract.ln -link path=usr/lib/llib-lctf target=../../lib/llib-lctf -link path=usr/lib/llib-lctf.ln target=../../lib/llib-lctf.ln -link path=usr/lib/llib-lcurses target=../../lib/llib-lcurses -link path=usr/lib/llib-lcurses.ln target=../../lib/llib-lcurses.ln -link path=usr/lib/llib-ldevice target=../../lib/llib-ldevice -link path=usr/lib/llib-ldevice.ln target=../../lib/llib-ldevice.ln -link path=usr/lib/llib-ldevid target=../../lib/llib-ldevid -link path=usr/lib/llib-ldevid.ln target=../../lib/llib-ldevid.ln -link path=usr/lib/llib-ldevinfo target=../../lib/llib-ldevinfo -link path=usr/lib/llib-ldevinfo.ln target=../../lib/llib-ldevinfo.ln -link path=usr/lib/llib-ldoor target=../../lib/llib-ldoor -link path=usr/lib/llib-ldoor.ln target=../../lib/llib-ldoor.ln -link path=usr/lib/llib-lefi target=../../lib/llib-lefi -link path=usr/lib/llib-lefi.ln target=../../lib/llib-lefi.ln -$(i386_ONLY)link path=usr/lib/llib-lfdisk target=../../lib/llib-lfdisk -$(i386_ONLY)link path=usr/lib/llib-lfdisk.ln target=../../lib/llib-lfdisk.ln -link path=usr/lib/llib-lgen target=../../lib/llib-lgen -link path=usr/lib/llib-lgen.ln target=../../lib/llib-lgen.ln -link path=usr/lib/llib-lintl target=../../lib/llib-lintl -link path=usr/lib/llib-lintl.ln target=../../lib/llib-lintl.ln -link path=usr/lib/llib-lkstat target=../../lib/llib-lkstat -link path=usr/lib/llib-lkstat.ln target=../../lib/llib-lkstat.ln -link path=usr/lib/llib-lmd5 target=../../lib/llib-lmd5 -link path=usr/lib/llib-lmd5.ln target=../../lib/llib-lmd5.ln -link path=usr/lib/llib-lnsl target=../../lib/llib-lnsl -link path=usr/lib/llib-lnsl.ln target=../../lib/llib-lnsl.ln -link path=usr/lib/llib-lnvpair target=../../lib/llib-lnvpair -link path=usr/lib/llib-lnvpair.ln target=../../lib/llib-lnvpair.ln -link path=usr/lib/llib-lpam target=../../lib/llib-lpam -link path=usr/lib/llib-lpam.ln target=../../lib/llib-lpam.ln -link path=usr/lib/llib-lposix4 target=../../lib/llib-lrt -link path=usr/lib/llib-lposix4.ln target=../../lib/llib-lrt.ln -link path=usr/lib/llib-lpthread target=../../lib/llib-lpthread -link path=usr/lib/llib-lpthread.ln target=../../lib/llib-lpthread.ln -link path=usr/lib/llib-lresolv target=../../lib/llib-lresolv -link path=usr/lib/llib-lresolv.ln target=../../lib/llib-lresolv.ln -link path=usr/lib/llib-lrpcsvc target=../../lib/llib-lrpcsvc -link path=usr/lib/llib-lrpcsvc.ln target=../../lib/llib-lrpcsvc.ln -link path=usr/lib/llib-lrt target=../../lib/llib-lrt -link path=usr/lib/llib-lrt.ln target=../../lib/llib-lrt.ln -link path=usr/lib/llib-lscf target=../../lib/llib-lscf -link path=usr/lib/llib-lscf.ln target=../../lib/llib-lscf.ln -link path=usr/lib/llib-lsec target=../../lib/llib-lsec -link path=usr/lib/llib-lsec.ln target=../../lib/llib-lsec.ln -link path=usr/lib/llib-lsecdb target=../../lib/llib-lsecdb -link path=usr/lib/llib-lsecdb.ln target=../../lib/llib-lsecdb.ln -link path=usr/lib/llib-lsendfile target=../../lib/llib-lsendfile -link path=usr/lib/llib-lsendfile.ln target=../../lib/llib-lsendfile.ln -link path=usr/lib/llib-lsocket target=../../lib/llib-lsocket -link path=usr/lib/llib-lsocket.ln target=../../lib/llib-lsocket.ln -link path=usr/lib/llib-lsysevent target=../../lib/llib-lsysevent -link path=usr/lib/llib-lsysevent.ln target=../../lib/llib-lsysevent.ln -link path=usr/lib/llib-ltermcap target=../../lib/llib-ltermcap -link path=usr/lib/llib-ltermcap.ln target=../../lib/llib-ltermcap.ln -link path=usr/lib/llib-ltermlib target=../../lib/llib-lcurses -link path=usr/lib/llib-ltermlib.ln target=../../lib/llib-lcurses.ln -link path=usr/lib/llib-lthread target=../../lib/llib-lthread -link path=usr/lib/llib-lthread.ln target=../../lib/llib-lthread.ln -link path=usr/lib/llib-lthread_db target=../../lib/llib-lc_db -link path=usr/lib/llib-lthread_db.ln target=../../lib/llib-lc_db.ln -link path=usr/lib/llib-ltsnet.ln target=../../lib/llib-ltsnet.ln -link path=usr/lib/llib-ltsol.ln target=../../lib/llib-ltsol.ln -link path=usr/lib/llib-lumem target=../../lib/llib-lumem -link path=usr/lib/llib-lumem.ln target=../../lib/llib-lumem.ln -link path=usr/lib/llib-luuid target=../../lib/llib-luuid -link path=usr/lib/llib-luuid.ln target=../../lib/llib-luuid.ln -link path=usr/lib/llib-lxnet target=../../lib/llib-lxnet -link path=usr/lib/llib-lxnet.ln target=../../lib/llib-lxnet.ln -# Used to be incorrectly in this package, pull it in for compatibility -depend fmri=system/library/c-runtime type=group diff --git a/usr/src/pkg/manifests/diagnostic-cpu-counters.mf b/usr/src/pkg/manifests/diagnostic-cpu-counters.mf index e6c5fbb3ae..07364899d0 100644 --- a/usr/src/pkg/manifests/diagnostic-cpu-counters.mf +++ b/usr/src/pkg/manifests/diagnostic-cpu-counters.mf @@ -22,6 +22,7 @@ # # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # Copyright 2012 Nexenta Systems, Inc. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # set name=pkg.fmri value=pkg:/diagnostic/cpu-counters@$(PKGVERS) @@ -60,14 +61,8 @@ $(i386_ONLY)file path=usr/kernel/pcbe/$(ARCH64)/pcbe.GenuineIntel.6.15 \ group=sys mode=0755 file path=usr/lib/$(ARCH64)/libcpc.so.1 file path=usr/lib/$(ARCH64)/libpctx.so.1 -file path=usr/lib/$(ARCH64)/llib-lcpc.ln -file path=usr/lib/$(ARCH64)/llib-lpctx.ln file path=usr/lib/libcpc.so.1 file path=usr/lib/libpctx.so.1 -file path=usr/lib/llib-lcpc -file path=usr/lib/llib-lcpc.ln -file path=usr/lib/llib-lpctx -file path=usr/lib/llib-lpctx.ln file path=usr/sbin/cpustat mode=0555 file path=usr/share/man/man1/cputrack.1 file path=usr/share/man/man1m/cpustat.1m diff --git a/usr/src/pkg/manifests/driver-network-srpt.mf b/usr/src/pkg/manifests/driver-network-srpt.mf index f65b003834..d318e30d94 100644 --- a/usr/src/pkg/manifests/driver-network-srpt.mf +++ b/usr/src/pkg/manifests/driver-network-srpt.mf @@ -21,6 +21,7 @@ # # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # set name=pkg.fmri value=pkg:/driver/network/srpt@$(PKGVERS) @@ -60,10 +61,7 @@ file path=lib/svc/manifest/system/ibsrp/target.xml group=sys mode=0444 \ file path=lib/svc/method/svc-srpt mode=0555 variant.opensolaris.zone=global file path=usr/include/libsrpt.h file path=usr/lib/$(ARCH64)/libsrpt.so.1 -file path=usr/lib/$(ARCH64)/llib-lsrpt.ln file path=usr/lib/libsrpt.so.1 -file path=usr/lib/llib-lsrpt -file path=usr/lib/llib-lsrpt.ln file path=usr/lib/mdb/kvm/$(ARCH64)/srpt.so group=sys mode=0555 file path=usr/sbin/srptadm mode=0555 file path=usr/share/man/man7d/srpt.7d diff --git a/usr/src/pkg/manifests/install-beadm.mf b/usr/src/pkg/manifests/install-beadm.mf index 9234f3f3f6..cd04217a8d 100644 --- a/usr/src/pkg/manifests/install-beadm.mf +++ b/usr/src/pkg/manifests/install-beadm.mf @@ -22,7 +22,7 @@ # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # Copyright 2010 Nexenta Systems, Inc. All rights reserved. # Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. -# Copyright 2018 OmniOS Community Edition (OmniOSce) Association. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # set name=pkg.fmri value=pkg:/install/beadm@$(PKGVERS) @@ -42,10 +42,7 @@ dir path=usr/share/man/man1m file path=sbin/beadm mode=0555 file path=usr/include/libbe.h file path=usr/lib/$(ARCH64)/libbe.so.1 -file path=usr/lib/$(ARCH64)/llib-lbe.ln file path=usr/lib/libbe.so.1 -file path=usr/lib/llib-lbe -file path=usr/lib/llib-lbe.ln file path=usr/share/man/man1m/beadm.1m license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/library-libadt_jni.mf b/usr/src/pkg/manifests/library-libadt_jni.mf index 0342836132..910f2bf706 100644 --- a/usr/src/pkg/manifests/library-libadt_jni.mf +++ b/usr/src/pkg/manifests/library-libadt_jni.mf @@ -21,6 +21,7 @@ # # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # set name=pkg.fmri value=pkg:/library/libadt_jni@$(PKGVERS) @@ -35,10 +36,8 @@ dir path=usr/lib dir path=usr/lib/$(ARCH64) dir path=usr/lib/audit file path=usr/lib/$(ARCH64)/libadt_jni.so.1 -file path=usr/lib/$(ARCH64)/llib-ladt_jni.ln file path=usr/lib/audit/Audit.jar file path=usr/lib/libadt_jni.so.1 -file path=usr/lib/llib-ladt_jni.ln legacy pkg=SUNWaudit \ desc="Java Solaris Auditing interface / AuditService Implementation" \ name="AuditService Implementation" diff --git a/usr/src/pkg/manifests/library-libtecla.mf b/usr/src/pkg/manifests/library-libtecla.mf index 6a5c90fa53..f9a3442a01 100644 --- a/usr/src/pkg/manifests/library-libtecla.mf +++ b/usr/src/pkg/manifests/library-libtecla.mf @@ -22,6 +22,7 @@ # # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # Copyright 2012 Nexenta Systems, Inc. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # set name=pkg.fmri \ @@ -44,10 +45,7 @@ dir path=usr/share/man/man5 file path=usr/bin/enhance mode=0555 file path=usr/include/libtecla.h file path=usr/lib/$(ARCH64)/libtecla.so.1 -file path=usr/lib/$(ARCH64)/llib-ltecla.ln file path=usr/lib/libtecla.so.1 -file path=usr/lib/llib-ltecla -file path=usr/lib/llib-ltecla.ln file path=usr/share/man/man1/enhance.1 file path=usr/share/man/man3lib/libtecla.3lib file path=usr/share/man/man3tecla/cpl_complete_word.3tecla diff --git a/usr/src/pkg/manifests/network-ipd.mf b/usr/src/pkg/manifests/network-ipd.mf index c36323227e..41491375aa 100644 --- a/usr/src/pkg/manifests/network-ipd.mf +++ b/usr/src/pkg/manifests/network-ipd.mf @@ -11,6 +11,7 @@ # # Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # set name=pkg.fmri value=pkg:/network/ipd@$(PKGVERS) @@ -33,10 +34,7 @@ file path=kernel/drv/ipd.conf group=sys file path=usr/include/libipd.h file path=usr/include/sys/ipd.h file path=usr/lib/$(ARCH64)/libipd.so.1 -file path=usr/lib/$(ARCH64)/llib-lipd.ln file path=usr/lib/libipd.so.1 -file path=usr/lib/llib-lipd -file path=usr/lib/llib-lipd.ln file path=usr/sbin/ipdadm mode=0555 file path=usr/share/man/man1m/ipdadm.1m license cr_Sun license=cr_Sun diff --git a/usr/src/pkg/manifests/network-iscsi-target.mf b/usr/src/pkg/manifests/network-iscsi-target.mf index fe959e64ba..df7fb67717 100644 --- a/usr/src/pkg/manifests/network-iscsi-target.mf +++ b/usr/src/pkg/manifests/network-iscsi-target.mf @@ -22,6 +22,7 @@ # # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # Copyright 2012 Nexenta Systems, Inc. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # set name=pkg.fmri value=pkg:/network/iscsi/target@$(PKGVERS) @@ -60,10 +61,7 @@ file path=lib/svc/method/iscsi-target mode=0555 \ file path=usr/include/libiscsit.h file path=usr/include/sys/iscsit/iscsit_common.h file path=usr/lib/$(ARCH64)/libiscsit.so.1 -file path=usr/lib/$(ARCH64)/llib-liscsit.ln file path=usr/lib/libiscsit.so.1 -file path=usr/lib/llib-liscsit -file path=usr/lib/llib-liscsit.ln file path=usr/sbin/itadm mode=0555 file path=usr/share/man/man1m/itadm.1m file path=usr/share/man/man3iscsit/it_config_load.3iscsit diff --git a/usr/src/pkg/manifests/service-fault-management.mf b/usr/src/pkg/manifests/service-fault-management.mf index 062e69e07d..4573535048 100644 --- a/usr/src/pkg/manifests/service-fault-management.mf +++ b/usr/src/pkg/manifests/service-fault-management.mf @@ -22,6 +22,7 @@ # # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2019, Joyent, Inc. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # # @@ -270,11 +271,7 @@ file path=kernel/drv/fm.conf group=sys # file path=lib/fm/$(ARCH64)/libfmevent.so.1 \ variant.opensolaris.zone=__NODEFAULT -file path=lib/fm/$(ARCH64)/llib-lfmevent.ln \ - variant.opensolaris.zone=__NODEFAULT file path=lib/fm/libfmevent.so.1 variant.opensolaris.zone=__NODEFAULT -file path=lib/fm/llib-lfmevent variant.opensolaris.zone=__NODEFAULT -file path=lib/fm/llib-lfmevent.ln variant.opensolaris.zone=__NODEFAULT # # Service manifests are common to both global and non-global zones # @@ -329,30 +326,6 @@ file path=usr/lib/fm/$(ARCH64)/libseslog.so.1 file path=usr/lib/fm/$(ARCH64)/libtopo.so.1 \ variant.opensolaris.zone=__NODEFAULT # -# 64-bit lint libraries -# -file path=usr/lib/fm/$(ARCH64)/llib-ldiagcode.ln \ - variant.opensolaris.zone=__NODEFAULT -file path=usr/lib/fm/$(ARCH64)/llib-ldiskstatus.ln \ - variant.opensolaris.zone=__NODEFAULT -file path=usr/lib/fm/$(ARCH64)/llib-lfmd_adm.ln \ - variant.opensolaris.zone=__NODEFAULT -file path=usr/lib/fm/$(ARCH64)/llib-lfmd_agent.ln \ - variant.opensolaris.zone=__NODEFAULT -file path=usr/lib/fm/$(ARCH64)/llib-lfmd_log.ln \ - variant.opensolaris.zone=__NODEFAULT -file path=usr/lib/fm/$(ARCH64)/llib-lfmd_msg.ln \ - variant.opensolaris.zone=__NODEFAULT -file path=usr/lib/fm/$(ARCH64)/llib-lfmd_snmp.ln \ - variant.opensolaris.zone=__NODEFAULT -file path=usr/lib/fm/$(ARCH64)/llib-lfmnotify.ln \ - variant.opensolaris.zone=__NODEFAULT -$(sparc_ONLY)file path=usr/lib/fm/$(ARCH64)/llib-lldom.ln -$(sparc_ONLY)file path=usr/lib/fm/$(ARCH64)/llib-lmdesc.ln -file path=usr/lib/fm/$(ARCH64)/llib-lseslog.ln -file path=usr/lib/fm/$(ARCH64)/llib-ltopo.ln \ - variant.opensolaris.zone=__NODEFAULT -# # Dictionaries, whether they are hardware-specific or not, are # common to both global and non-global zones. # @@ -535,33 +508,6 @@ $(sparc_ONLY)file path=usr/lib/fm/libmdesc.so.1 file path=usr/lib/fm/libseslog.so.1 file path=usr/lib/fm/libtopo.so.1 variant.opensolaris.zone=__NODEFAULT # -# 32-bit lint libraries -# -file path=usr/lib/fm/llib-ldiagcode variant.opensolaris.zone=__NODEFAULT -file path=usr/lib/fm/llib-ldiagcode.ln variant.opensolaris.zone=__NODEFAULT -file path=usr/lib/fm/llib-ldiskstatus variant.opensolaris.zone=__NODEFAULT -file path=usr/lib/fm/llib-ldiskstatus.ln variant.opensolaris.zone=__NODEFAULT -file path=usr/lib/fm/llib-lfmd_adm variant.opensolaris.zone=__NODEFAULT -file path=usr/lib/fm/llib-lfmd_adm.ln variant.opensolaris.zone=__NODEFAULT -file path=usr/lib/fm/llib-lfmd_agent variant.opensolaris.zone=__NODEFAULT -file path=usr/lib/fm/llib-lfmd_agent.ln variant.opensolaris.zone=__NODEFAULT -file path=usr/lib/fm/llib-lfmd_log variant.opensolaris.zone=__NODEFAULT -file path=usr/lib/fm/llib-lfmd_log.ln variant.opensolaris.zone=__NODEFAULT -file path=usr/lib/fm/llib-lfmd_msg variant.opensolaris.zone=__NODEFAULT -file path=usr/lib/fm/llib-lfmd_msg.ln variant.opensolaris.zone=__NODEFAULT -file path=usr/lib/fm/llib-lfmd_snmp variant.opensolaris.zone=__NODEFAULT -file path=usr/lib/fm/llib-lfmd_snmp.ln variant.opensolaris.zone=__NODEFAULT -file path=usr/lib/fm/llib-lfmnotify variant.opensolaris.zone=__NODEFAULT -file path=usr/lib/fm/llib-lfmnotify.ln variant.opensolaris.zone=__NODEFAULT -$(sparc_ONLY)file path=usr/lib/fm/llib-lldom -$(sparc_ONLY)file path=usr/lib/fm/llib-lldom.ln -$(sparc_ONLY)file path=usr/lib/fm/llib-lmdesc -$(sparc_ONLY)file path=usr/lib/fm/llib-lmdesc.ln -file path=usr/lib/fm/llib-lseslog -file path=usr/lib/fm/llib-lseslog.ln -file path=usr/lib/fm/llib-ltopo variant.opensolaris.zone=__NODEFAULT -file path=usr/lib/fm/llib-ltopo.ln variant.opensolaris.zone=__NODEFAULT -# # Topo xml maps are all global-zone only # file path=usr/lib/fm/topo/maps/xfp-hc-topology.xml mode=0444 @@ -1018,8 +964,6 @@ $(sparc_ONLY)link path=usr/lib/fm/$(ARCH64)/libmdesc.so target=libmdesc.so.1 link path=usr/lib/fm/$(ARCH64)/libseslog.so target=./libseslog.so.1 link path=usr/lib/fm/$(ARCH64)/libtopo.so target=libtopo.so.1 \ variant.opensolaris.zone=__NODEFAULT -link path=usr/lib/fm/$(ARCH64)/llib-lfmevent.ln \ - target=../../../../lib/fm/$(ARCH64)/llib-lfmevent.ln # # 32-bit .so symlinks # @@ -1048,8 +992,6 @@ $(sparc_ONLY)link path=usr/lib/fm/libmdesc.so target=libmdesc.so.1 link path=usr/lib/fm/libseslog.so target=libseslog.so.1 link path=usr/lib/fm/libtopo.so target=libtopo.so.1 \ variant.opensolaris.zone=__NODEFAULT -link path=usr/lib/fm/llib-lfmevent target=../../../lib/fm/llib-lfmevent -link path=usr/lib/fm/llib-lfmevent.ln target=../../../lib/fm/llib-lfmevent.ln # # symlinks for fmd plugins for particular platforms # diff --git a/usr/src/pkg/manifests/service-hal.mf b/usr/src/pkg/manifests/service-hal.mf index 2fdec3d01f..c13b9cab1d 100644 --- a/usr/src/pkg/manifests/service-hal.mf +++ b/usr/src/pkg/manifests/service-hal.mf @@ -22,6 +22,7 @@ # # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # Copyright 2012 Nexenta Systems, Inc. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # set name=pkg.fmri value=pkg:/service/hal@$(PKGVERS) @@ -116,8 +117,6 @@ file path=lib/svc/method/svc-network-discovery mode=0555 \ variant.opensolaris.zone=global file path=usr/lib/$(ARCH64)/libhal-storage.so.1.0.0 file path=usr/lib/$(ARCH64)/libhal.so.1.0.0 -file path=usr/lib/$(ARCH64)/llib-lhal-storage.ln -file path=usr/lib/$(ARCH64)/llib-lhal.ln file path=usr/lib/$(ARCH64)/pkgconfig/hal-storage.pc file path=usr/lib/$(ARCH64)/pkgconfig/hal.pc file path=usr/lib/hal/hal-functions mode=0555 @@ -156,10 +155,6 @@ file path=usr/lib/hal/sunos/hal-system-power-shutdown-sunos mode=0555 file path=usr/lib/hal/sunos/hal-system-power-suspend-sunos mode=0555 file path=usr/lib/libhal-storage.so.1.0.0 file path=usr/lib/libhal.so.1.0.0 -file path=usr/lib/llib-lhal -file path=usr/lib/llib-lhal-storage -file path=usr/lib/llib-lhal-storage.ln -file path=usr/lib/llib-lhal.ln file path=usr/lib/pkgconfig/hal-storage.pc file path=usr/lib/pkgconfig/hal.pc file path=usr/sbin/hal-device mode=0555 diff --git a/usr/src/pkg/manifests/service-network-load-balancer-ilb.mf b/usr/src/pkg/manifests/service-network-load-balancer-ilb.mf index cfde5082ca..c114056998 100644 --- a/usr/src/pkg/manifests/service-network-load-balancer-ilb.mf +++ b/usr/src/pkg/manifests/service-network-load-balancer-ilb.mf @@ -21,6 +21,7 @@ # # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # set name=pkg.fmri value=pkg:/service/network/load-balancer/ilb@$(PKGVERS) @@ -45,12 +46,9 @@ dir path=usr/sbin file path=lib/svc/manifest/network/loadbalancer/ilbd.xml group=sys mode=0444 file path=usr/include/libilb.h file path=usr/lib/$(ARCH64)/libilb.so.1 -file path=usr/lib/$(ARCH64)/llib-lilb.ln file path=usr/lib/inet/ilb/ilb_probe mode=0555 file path=usr/lib/inet/ilbd mode=0555 file path=usr/lib/libilb.so.1 -file path=usr/lib/llib-lilb -file path=usr/lib/llib-lilb.ln file path=usr/sbin/ilbadm mode=0555 legacy pkg=SUNWilb \ desc="Integrated IP layer 3/4 load balancer for Solaris (usr)" \ diff --git a/usr/src/pkg/manifests/service-network-slp.mf b/usr/src/pkg/manifests/service-network-slp.mf index d1a24bb500..4f76f131ca 100644 --- a/usr/src/pkg/manifests/service-network-slp.mf +++ b/usr/src/pkg/manifests/service-network-slp.mf @@ -22,6 +22,7 @@ # # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # Copyright 2015 Nexenta Systems, Inc. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # set name=pkg.fmri value=pkg:/service/network/slp@$(PKGVERS) @@ -57,11 +58,8 @@ file path=lib/svc/manifest/network/slp.xml group=sys mode=0444 file path=lib/svc/method/slp mode=0555 file path=usr/include/slp.h file path=usr/lib/$(ARCH64)/libslp.so.1 -file path=usr/lib/$(ARCH64)/llib-lslp.ln file path=usr/lib/inet/slpd mode=0555 file path=usr/lib/libslp.so.1 -file path=usr/lib/llib-lslp -file path=usr/lib/llib-lslp.ln file path=usr/share/lib/slp/slp.jar group=sys file path=usr/share/lib/slp/slpd.jar group=sys mode=0600 file path=usr/share/man/man1m/slpd.1m diff --git a/usr/src/pkg/manifests/service-network-smtp-sendmail.mf b/usr/src/pkg/manifests/service-network-smtp-sendmail.mf index 0688fd1c10..b8097de72e 100644 --- a/usr/src/pkg/manifests/service-network-smtp-sendmail.mf +++ b/usr/src/pkg/manifests/service-network-smtp-sendmail.mf @@ -22,6 +22,7 @@ # # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # Copyright 2015 Nexenta Systems, Inc. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # set name=pkg.fmri \ @@ -177,8 +178,6 @@ file path=usr/include/libmilter/mfdef.h file path=usr/lib/help/auths/locale/C/MailHeader.html file path=usr/lib/help/auths/locale/C/MailQueue.html file path=usr/lib/libmilter.so.1 -file path=usr/lib/llib-lmilter -file path=usr/lib/llib-lmilter.ln file path=usr/lib/mail.local mode=0555 file path=usr/lib/smrsh mode=0555 file path=usr/lib/smtp/sendmail/mailq mode=4555 diff --git a/usr/src/pkg/manifests/service-picl.mf b/usr/src/pkg/manifests/service-picl.mf index b727a168d4..7c15402da5 100644 --- a/usr/src/pkg/manifests/service-picl.mf +++ b/usr/src/pkg/manifests/service-picl.mf @@ -22,6 +22,7 @@ # # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # Copyright 2012 Nexenta Systems, Inc. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # set name=pkg.fmri value=pkg:/service/picl@$(PKGVERS) @@ -155,16 +156,9 @@ dir path=usr/share/man/man3picltree file path=lib/svc/manifest/system/picl.xml group=sys mode=0444 \ variant.opensolaris.zone=global file path=usr/lib/$(ARCH64)/libpicl.so.1 -file path=usr/lib/$(ARCH64)/llib-lpicl.ln file path=usr/lib/libpicl.so.1 file path=usr/lib/libpicld_pluginutil.so.1 file path=usr/lib/libpicltree.so.1 -file path=usr/lib/llib-lpicl -file path=usr/lib/llib-lpicl.ln -file path=usr/lib/llib-lpicld_pluginutil -file path=usr/lib/llib-lpicld_pluginutil.ln -file path=usr/lib/llib-lpicltree -file path=usr/lib/llib-lpicltree.ln file path=usr/lib/picl/picld mode=0555 file path=usr/lib/picl/plugins/libpicldevtree.so.1 group=sys file path=usr/lib/picl/plugins/libpiclevent.so.1 group=sys diff --git a/usr/src/pkg/manifests/service-resource-pools.mf b/usr/src/pkg/manifests/service-resource-pools.mf index c0fa8e43f2..6171e626fd 100644 --- a/usr/src/pkg/manifests/service-resource-pools.mf +++ b/usr/src/pkg/manifests/service-resource-pools.mf @@ -22,6 +22,7 @@ # # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # Copyright 2012 Nexenta Systems, Inc. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # set name=pkg.fmri value=pkg:/service/resource-pools@$(PKGVERS) @@ -65,10 +66,7 @@ file path=usr/include/pool.h file path=usr/kernel/drv/$(ARCH64)/pool group=sys file path=usr/kernel/drv/pool.conf group=sys file path=usr/lib/$(ARCH64)/libpool.so.1 -file path=usr/lib/$(ARCH64)/llib-lpool.ln file path=usr/lib/libpool.so.1 -file path=usr/lib/llib-lpool -file path=usr/lib/llib-lpool.ln file path=usr/lib/rcm/modules/SUNW_pool_rcm.so mode=0555 file path=usr/sbin/pooladm mode=0555 file path=usr/sbin/poolbind mode=0555 diff --git a/usr/src/pkg/manifests/service-storage-ndmp.mf b/usr/src/pkg/manifests/service-storage-ndmp.mf index 3abd836ed9..b41732f92f 100644 --- a/usr/src/pkg/manifests/service-storage-ndmp.mf +++ b/usr/src/pkg/manifests/service-storage-ndmp.mf @@ -21,6 +21,7 @@ # # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # # @@ -54,10 +55,7 @@ file path=lib/svc/manifest/system/ndmp.xml group=sys mode=0444 file path=lib/svc/method/svc-ndmp mode=0555 file path=usr/include/libndmp.h file path=usr/lib/$(ARCH64)/libndmp.so.1 -file path=usr/lib/$(ARCH64)/llib-lndmp.ln file path=usr/lib/libndmp.so.1 -file path=usr/lib/llib-lndmp -file path=usr/lib/llib-lndmp.ln file path=usr/lib/ndmp/ndmpd mode=0555 file path=usr/sbin/ndmpadm mode=0555 file path=usr/sbin/ndmpstat mode=0555 diff --git a/usr/src/pkg/manifests/service-storage-removable-media.mf b/usr/src/pkg/manifests/service-storage-removable-media.mf index f7f16b2d22..6760885417 100644 --- a/usr/src/pkg/manifests/service-storage-removable-media.mf +++ b/usr/src/pkg/manifests/service-storage-removable-media.mf @@ -22,6 +22,7 @@ # # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # Copyright 2013 Garrett D'Amore <garrett@damore.org> +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # set name=pkg.fmri value=pkg:/service/storage/removable-media@$(PKGVERS) @@ -43,10 +44,7 @@ dir path=usr/lib/smedia/$(ARCH64) dir path=usr/share/man/man1m file path=lib/svc/manifest/network/rpc/smserver.xml group=sys mode=0444 file path=usr/lib/$(ARCH64)/libsmedia.so.1 -file path=usr/lib/$(ARCH64)/llib-lsmedia.ln file path=usr/lib/libsmedia.so.1 -file path=usr/lib/llib-lsmedia -file path=usr/lib/llib-lsmedia.ln file path=usr/lib/smedia/$(ARCH64)/sm_blkdev.so.1 mode=0555 file path=usr/lib/smedia/$(ARCH64)/sm_fd.so.1 mode=0555 file path=usr/lib/smedia/$(ARCH64)/sm_scsi.so.1 mode=0555 diff --git a/usr/src/pkg/manifests/storage-stmf.mf b/usr/src/pkg/manifests/storage-stmf.mf index f8aa612d63..2c5feefc83 100644 --- a/usr/src/pkg/manifests/storage-stmf.mf +++ b/usr/src/pkg/manifests/storage-stmf.mf @@ -22,6 +22,7 @@ # # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # Copyright 2012 Nexenta Systems, Inc. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # set name=pkg.fmri value=pkg:/storage/stmf@$(PKGVERS) @@ -92,11 +93,8 @@ file path=usr/include/sys/stmf_defines.h file path=usr/include/sys/stmf_ioctl.h file path=usr/lib/$(ARCH64)/libstmf.so.1 file path=usr/lib/$(ARCH64)/libstmfproxy.so.1 -file path=usr/lib/$(ARCH64)/llib-lstmf.ln file path=usr/lib/libstmf.so.1 file path=usr/lib/libstmfproxy.so.1 -file path=usr/lib/llib-lstmf -file path=usr/lib/llib-lstmf.ln file path=usr/lib/mdb/kvm/$(ARCH64)/stmf.so group=sys mode=0555 file path=usr/lib/mdb/kvm/$(ARCH64)/stmf_sbd.so group=sys mode=0555 file path=usr/sbin/sbdadm mode=0555 diff --git a/usr/src/pkg/manifests/system-boot-grub.mf b/usr/src/pkg/manifests/system-boot-grub.mf index 9323cf0fae..d70338c334 100644 --- a/usr/src/pkg/manifests/system-boot-grub.mf +++ b/usr/src/pkg/manifests/system-boot-grub.mf @@ -21,6 +21,7 @@ # # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # # @@ -70,8 +71,6 @@ $(i386_ONLY)file path=boot/grub/vstafs_stage1_5 group=sys $(i386_ONLY)file path=boot/grub/xfs_stage1_5 group=sys $(i386_ONLY)file path=boot/grub/zfs_stage1_5 group=sys file path=lib/libgrubmgmt.so.1 -file path=lib/llib-lgrubmgmt -file path=lib/llib-lgrubmgmt.ln file path=usr/share/man/man5/grub.5 $(i386_ONLY)legacy pkg=SUNWgrub desc="Multiboot Boot Loader" \ name="GNU GRUB - GNU GRand Unified Bootloader" diff --git a/usr/src/pkg/manifests/system-domain-service-processor-protocol-sparc-enterprise.mf b/usr/src/pkg/manifests/system-domain-service-processor-protocol-sparc-enterprise.mf index bf454c87e0..d48e4a4355 100644 --- a/usr/src/pkg/manifests/system-domain-service-processor-protocol-sparc-enterprise.mf +++ b/usr/src/pkg/manifests/system-domain-service-processor-protocol-sparc-enterprise.mf @@ -21,6 +21,7 @@ # # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # # @@ -68,7 +69,6 @@ file path=platform/SUNW,SPARC-Enterprise/kernel/drv/oplkmdrv.conf group=sys file path=usr/platform/SUNW,SPARC-Enterprise/lib/dscp.ppp.options group=sys \ mode=0555 file path=usr/platform/SUNW,SPARC-Enterprise/lib/libdscp.so.1 -file path=usr/platform/SUNW,SPARC-Enterprise/lib/llib-ldscp.ln group=sys file path=usr/platform/SUNW,SPARC-Enterprise/sbin/prtdscp mode=0755 file path=usr/share/man/man1m/prtdscp.1m file path=usr/share/man/man7d/dm2s.7d diff --git a/usr/src/pkg/manifests/system-file-system-nfs.mf b/usr/src/pkg/manifests/system-file-system-nfs.mf index ab6330f834..7c4e786f97 100644 --- a/usr/src/pkg/manifests/system-file-system-nfs.mf +++ b/usr/src/pkg/manifests/system-file-system-nfs.mf @@ -21,6 +21,7 @@ # # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # set name=pkg.fmri value=pkg:/system/file-system/nfs@$(PKGVERS) @@ -84,8 +85,6 @@ file path=usr/lib/fs/nfs/nfsfind group=sys mode=0555 file path=usr/lib/fs/nfs/showmount mode=0555 file path=usr/lib/fs/nfs/umount mode=0555 file path=usr/lib/nfs/libmapid.so.1 -file path=usr/lib/nfs/llib-lmapid -file path=usr/lib/nfs/llib-lmapid.ln file path=usr/lib/nfs/lockd mode=0555 file path=usr/lib/nfs/nfs4cbd mode=0555 file path=usr/lib/nfs/nfsmapid mode=0555 diff --git a/usr/src/pkg/manifests/system-file-system-zfs.mf b/usr/src/pkg/manifests/system-file-system-zfs.mf index 69f9c71fcc..6032e99675 100644 --- a/usr/src/pkg/manifests/system-file-system-zfs.mf +++ b/usr/src/pkg/manifests/system-file-system-zfs.mf @@ -23,7 +23,7 @@ # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2012, 2017 by Delphix. All rights reserved. # Copyright (c) 2013 by Saso Kiselkov. All rights reserved. -# Copyright 2018 OmniOS Community Edition (OmniOSce) Association. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # set name=pkg.fmri value=pkg:/system/file-system/zfs@$(PKGVERS) @@ -77,14 +77,8 @@ file path=kernel/drv/zfs.conf group=sys file path=kernel/kmdb/$(ARCH64)/zfs group=sys mode=0555 file path=lib/$(ARCH64)/libzfs.so.1 file path=lib/$(ARCH64)/libzfs_core.so.1 -file path=lib/$(ARCH64)/llib-lzfs.ln -file path=lib/$(ARCH64)/llib-lzfs_core.ln file path=lib/libzfs.so.1 file path=lib/libzfs_core.so.1 -file path=lib/llib-lzfs -file path=lib/llib-lzfs.ln -file path=lib/llib-lzfs_core -file path=lib/llib-lzfs_core.ln file path=sbin/zfs mode=0555 file path=sbin/zpool mode=0555 file path=usr/lib/$(ARCH64)/libzfs_jni.so.1 @@ -139,10 +133,6 @@ link path=usr/lib/$(ARCH64)/libzfs_core.so.1 \ target=../../../lib/$(ARCH64)/libzfs_core.so.1 link path=usr/lib/$(ARCH64)/libzfs_jni.so target=libzfs_jni.so.1 link path=usr/lib/$(ARCH64)/libzpool.so target=libzpool.so.1 -link path=usr/lib/$(ARCH64)/llib-lzfs.ln \ - target=../../../lib/$(ARCH64)/llib-lzfs.ln -link path=usr/lib/$(ARCH64)/llib-lzfs_core.ln \ - target=../../../lib/$(ARCH64)/llib-lzfs_core.ln link path=usr/lib/fs/zfs/mount target=../../../../sbin/zfs link path=usr/lib/fs/zfs/umount target=../../../../sbin/zfs link path=usr/lib/libzfs.so target=../../lib/libzfs.so.1 @@ -151,10 +141,6 @@ link path=usr/lib/libzfs_core.so target=../../lib/libzfs_core.so.1 link path=usr/lib/libzfs_core.so.1 target=../../lib/libzfs_core.so.1 link path=usr/lib/libzfs_jni.so target=libzfs_jni.so.1 $(i386_ONLY)link path=usr/lib/libzpool.so target=libzpool.so.1 -link path=usr/lib/llib-lzfs target=../../lib/llib-lzfs -link path=usr/lib/llib-lzfs.ln target=../../lib/llib-lzfs.ln -link path=usr/lib/llib-lzfs_core target=../../lib/llib-lzfs_core -link path=usr/lib/llib-lzfs_core.ln target=../../lib/llib-lzfs_core.ln link path=usr/sbin/zfs target=../../sbin/zfs link path=usr/sbin/zpool target=../../sbin/zpool $(python3_ONLY)depend fmri=system/library/python/zfs$(PYTHON3_PKGVERS) \ diff --git a/usr/src/pkg/manifests/system-library-demangle.mf b/usr/src/pkg/manifests/system-library-demangle.mf index 7944764394..47d153b96d 100644 --- a/usr/src/pkg/manifests/system-library-demangle.mf +++ b/usr/src/pkg/manifests/system-library-demangle.mf @@ -21,6 +21,7 @@ # # Copyright 2018 Jason King +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # set name=pkg.fmri value=pkg:/system/library/demangle@$(PKGVERS) @@ -32,10 +33,7 @@ dir path=usr group=sys dir path=usr/lib dir path=usr/lib/$(ARCH64) file path=usr/lib/$(ARCH64)/libdemangle-sys.so.1 -file path=usr/lib/$(ARCH64)/llib-ldemangle-sys.ln file path=usr/lib/libdemangle-sys.so.1 -file path=usr/lib/llib-ldemangle-sys -file path=usr/lib/llib-ldemangle-sys.ln license lic_CDDL license=lic_CDDL license usr/src/lib/libdemangle/THIRDPARTYLICENSE \ license=usr/src/lib/libdemangle/THIRDPARTYLICENSE diff --git a/usr/src/pkg/manifests/system-library-libdiskmgt.mf b/usr/src/pkg/manifests/system-library-libdiskmgt.mf index 84bf811b47..dbbcb3f79a 100644 --- a/usr/src/pkg/manifests/system-library-libdiskmgt.mf +++ b/usr/src/pkg/manifests/system-library-libdiskmgt.mf @@ -21,6 +21,7 @@ # # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # set name=pkg.fmri value=pkg:/system/library/libdiskmgt@$(PKGVERS) @@ -33,10 +34,7 @@ dir path=usr group=sys dir path=usr/lib dir path=usr/lib/$(ARCH64) file path=usr/lib/$(ARCH64)/libdiskmgt.so.1 -file path=usr/lib/$(ARCH64)/llib-ldiskmgt.ln file path=usr/lib/libdiskmgt.so.1 -file path=usr/lib/llib-ldiskmgt -file path=usr/lib/llib-ldiskmgt.ln legacy pkg=SUNWsmapi desc="Software libraries for storage management" \ name="Storage Management APIs" license cr_Sun license=cr_Sun diff --git a/usr/src/pkg/manifests/system-library-libfcoe.mf b/usr/src/pkg/manifests/system-library-libfcoe.mf index 94e8c8e7b9..8b628442d2 100644 --- a/usr/src/pkg/manifests/system-library-libfcoe.mf +++ b/usr/src/pkg/manifests/system-library-libfcoe.mf @@ -21,6 +21,7 @@ # # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # set name=pkg.fmri value=pkg:/system/library/libfcoe@$(PKGVERS) @@ -38,10 +39,7 @@ dir path=usr/share/man/man3fcoe dir path=usr/share/man/man3lib file path=usr/include/libfcoe.h file path=usr/lib/$(ARCH64)/libfcoe.so.1 -file path=usr/lib/$(ARCH64)/llib-lfcoe.ln file path=usr/lib/libfcoe.so.1 -file path=usr/lib/llib-lfcoe -file path=usr/lib/llib-lfcoe.ln file path=usr/share/man/man3fcoe/FCOE_CreatePort.3fcoe file path=usr/share/man/man3fcoe/FCOE_DeletePort.3fcoe file path=usr/share/man/man3fcoe/FCOE_GetPortList.3fcoe diff --git a/usr/src/pkg/manifests/system-library-math.mf b/usr/src/pkg/manifests/system-library-math.mf index e05221bdd1..453a3ba585 100644 --- a/usr/src/pkg/manifests/system-library-math.mf +++ b/usr/src/pkg/manifests/system-library-math.mf @@ -11,6 +11,7 @@ # # Copyright (c) 2012, Igor Kozhukhov <ikozhukhov@gmail.com>. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # <include system-library-math.man3m.inc> @@ -43,7 +44,6 @@ dir path=usr/share/man/man3mvec file path=lib/$(ARCH64)/libm.so.1 file path=lib/$(ARCH64)/libm.so.2 file path=lib/$(ARCH64)/libmvec.so.1 -file path=lib/$(ARCH64)/llib-lm.ln $(sparc_ONLY)file path=lib/cpu/sparcv8plus+vis/libmvec_isa.so.1 $(sparc_ONLY)file path=lib/cpu/sparcv9+vis/$(ARCH64)/libmvec_isa.so.1 $(sparc_ONLY)file path=lib/cpu/sparcv9+vis2/$(ARCH64)/libmvec_isa.so.1 @@ -52,8 +52,6 @@ file path=lib/libm.so.1 file path=lib/libm.so.2 file path=lib/libmvec.so.1 $(i386_ONLY)file path=lib/libmvec/libmvec_hwcap1.so.1 -file path=lib/llib-lm -file path=lib/llib-lm.ln file path=usr/include/complex.h file path=usr/include/fenv.h file path=usr/include/floatingpoint.h @@ -81,12 +79,8 @@ link path=usr/lib/$(ARCH64)/libmvec.so \ target=../../../lib/$(ARCH64)/libmvec.so.1 link path=usr/lib/$(ARCH64)/libmvec.so.1 \ target=../../../lib/$(ARCH64)/libmvec.so.1 -link path=usr/lib/$(ARCH64)/llib-lm.ln \ - target=../../../lib/$(ARCH64)/llib-lm.ln link path=usr/lib/libm.so target=../../lib/libm.so.2 link path=usr/lib/libm.so.1 target=../../lib/libm.so.1 link path=usr/lib/libm.so.2 target=../../lib/libm.so.2 link path=usr/lib/libmvec.so target=../../lib/libmvec.so.1 link path=usr/lib/libmvec.so.1 target=../../lib/libmvec.so.1 -link path=usr/lib/llib-lm target=../../lib/llib-lm -link path=usr/lib/llib-lm.ln target=../../lib/llib-lm.ln diff --git a/usr/src/pkg/manifests/system-library-platform.mf b/usr/src/pkg/manifests/system-library-platform.mf index 4ce4012eb5..a68cd5d59f 100644 --- a/usr/src/pkg/manifests/system-library-platform.mf +++ b/usr/src/pkg/manifests/system-library-platform.mf @@ -166,7 +166,6 @@ $(sparc_ONLY)file path=usr/platform/SUNW,Sun-Fire-480R/lib/libprtdiag_psr.so.1 $(sparc_ONLY)file path=usr/platform/SUNW,Sun-Fire-880/lib/libprtdiag_psr.so.1 $(sparc_ONLY)file path=usr/platform/SUNW,Sun-Fire-T200/lib/libprtdiag_psr.so.1 $(sparc_ONLY)file path=usr/platform/SUNW,Sun-Fire-V240/lib/librsc.so.1 -$(sparc_ONLY)file path=usr/platform/SUNW,Sun-Fire-V240/lib/llib-lrsc.ln $(sparc_ONLY)file path=usr/platform/SUNW,Sun-Fire-V240/sbin/scadm group=sys \ mode=2755 $(sparc_ONLY)file path=usr/platform/SUNW,Sun-Fire/lib/libprtdiag_psr.so.1 @@ -400,8 +399,6 @@ $(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V215/lib/librsc.so \ target=../../SUNW,Sun-Fire-V240/lib/librsc.so $(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V215/lib/librsc.so.1 \ target=../../SUNW,Sun-Fire-V240/lib/librsc.so.1 -$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V215/lib/llib-lrsc.ln \ - target=../../SUNW,Sun-Fire-V240/lib/llib-lrsc.ln $(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V215/sbin/prtdiag \ target=../../sun4u/sbin/prtdiag $(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V215/sbin/scadm \ @@ -424,8 +421,6 @@ $(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V250/lib/librsc.so \ target=../../SUNW,Sun-Fire-V240/lib/librsc.so $(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V250/lib/librsc.so.1 \ target=../../SUNW,Sun-Fire-V240/lib/librsc.so.1 -$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V250/lib/llib-lrsc.ln \ - target=../../SUNW,Sun-Fire-V240/lib/llib-lrsc.ln $(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V250/sbin/prtdiag \ target=../../sun4u/sbin/prtdiag $(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V250/sbin/scadm \ @@ -438,8 +433,6 @@ $(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V440/lib/librsc.so \ target=../../SUNW,Sun-Fire-V240/lib/librsc.so $(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V440/lib/librsc.so.1 \ target=../../SUNW,Sun-Fire-V240/lib/librsc.so.1 -$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V440/lib/llib-lrsc.ln \ - target=../../SUNW,Sun-Fire-V240/lib/llib-lrsc.ln $(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V440/sbin \ target=../SUNW,Sun-Fire-V240/sbin $(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V445/lib/cfgadm \ @@ -450,8 +443,6 @@ $(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V445/lib/librsc.so \ target=../../SUNW,Sun-Fire-V240/lib/librsc.so $(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V445/lib/librsc.so.1 \ target=../../SUNW,Sun-Fire-V240/lib/librsc.so.1 -$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V445/lib/llib-lrsc.ln \ - target=../../SUNW,Sun-Fire-V240/lib/llib-lrsc.ln $(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V445/sbin/prtdiag \ target=../../sun4u/sbin/prtdiag $(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V445/sbin/scadm \ diff --git a/usr/src/pkg/manifests/system-library-policykit.mf b/usr/src/pkg/manifests/system-library-policykit.mf index d0aa5fd7ff..bf7f01bcf4 100644 --- a/usr/src/pkg/manifests/system-library-policykit.mf +++ b/usr/src/pkg/manifests/system-library-policykit.mf @@ -21,6 +21,7 @@ # # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # set name=pkg.fmri value=pkg:/system/library/policykit@$(PKGVERS) @@ -36,8 +37,6 @@ dir path=usr/lib/pkgconfig group=other dir path=usr/sbin dir path=usr/share/man/man1m file path=usr/lib/libpolkit.so.0.0.0 -file path=usr/lib/llib-lpolkit -file path=usr/lib/llib-lpolkit.ln file path=usr/lib/pkgconfig/polkit.pc file path=usr/sbin/polkit-is-privileged mode=0555 file path=usr/share/man/man1m/polkit-is-privileged.1m diff --git a/usr/src/pkg/manifests/system-library-storage-ima.mf b/usr/src/pkg/manifests/system-library-storage-ima.mf index 591688cb1c..5c3ec134f9 100644 --- a/usr/src/pkg/manifests/system-library-storage-ima.mf +++ b/usr/src/pkg/manifests/system-library-storage-ima.mf @@ -21,6 +21,7 @@ # # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # set name=pkg.fmri value=pkg:/system/library/storage/ima@$(PKGVERS) @@ -35,13 +36,7 @@ dir path=usr group=sys dir path=usr/lib dir path=usr/lib/$(ARCH64) file path=usr/lib/$(ARCH64)/libsun_ima.so.1 -file path=usr/lib/$(ARCH64)/llib-lima.ln -file path=usr/lib/$(ARCH64)/llib-lsun_ima.ln file path=usr/lib/libsun_ima.so.1 -file path=usr/lib/llib-lima -file path=usr/lib/llib-lima.ln -file path=usr/lib/llib-lsun_ima -file path=usr/lib/llib-lsun_ima.ln legacy pkg=SUNWima \ desc="SNIA iSCSI Managment API plugin library for iSCSI adapters" \ name="Solaris IMA Software Initiator Plugin" diff --git a/usr/src/pkg/manifests/system-library-storage-libmpapi.mf b/usr/src/pkg/manifests/system-library-storage-libmpapi.mf index cb7ff00e59..815af925c1 100644 --- a/usr/src/pkg/manifests/system-library-storage-libmpapi.mf +++ b/usr/src/pkg/manifests/system-library-storage-libmpapi.mf @@ -22,6 +22,7 @@ # # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # Copyright 2012 Nexenta Systems, Inc. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # set name=pkg.fmri value=pkg:/system/library/storage/libmpapi@$(PKGVERS) @@ -42,10 +43,7 @@ dir path=usr/share/man/man3mpapi dir path=usr/share/man/man4 file path=etc/mpapi.conf original_name=SUNWmpapi:etc/mpapi.conf preserve=true file path=lib/$(ARCH64)/libMPAPI.so.1 variant.opensolaris.zone=global -file path=lib/$(ARCH64)/llib-lMPAPI.ln variant.opensolaris.zone=global file path=lib/libMPAPI.so.1 variant.opensolaris.zone=global -file path=lib/llib-lMPAPI variant.opensolaris.zone=global -file path=lib/llib-lMPAPI.ln variant.opensolaris.zone=global file path=usr/include/mpapi-sun.h file path=usr/include/mpapi.h file path=usr/share/man/man3lib/libMPAPI.3lib diff --git a/usr/src/pkg/manifests/system-management-wbem-data-management.mf b/usr/src/pkg/manifests/system-management-wbem-data-management.mf index cd111be704..149e4f6482 100644 --- a/usr/src/pkg/manifests/system-management-wbem-data-management.mf +++ b/usr/src/pkg/manifests/system-management-wbem-data-management.mf @@ -21,6 +21,7 @@ # # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # set name=pkg.fmri value=pkg:/system/management/wbem/data-management@$(PKGVERS) @@ -32,8 +33,6 @@ set name=variant.arch value=$(ARCH) dir path=usr group=sys dir path=usr/lib file path=usr/lib/libfsmgt.so.1 -file path=usr/lib/llib-lfsmgt -file path=usr/lib/llib-lfsmgt.ln legacy pkg=SUNWdmgtr desc="software for WBEM/CIM data device management" \ name="Solaris Data Management WBEM/CIM API (root)" legacy pkg=SUNWdmgtu desc="software for WBEM/CIM data device management" \ diff --git a/usr/src/pkg/manifests/system-network-udapl.mf b/usr/src/pkg/manifests/system-network-udapl.mf index 42c3ccb758..2936b06f77 100644 --- a/usr/src/pkg/manifests/system-network-udapl.mf +++ b/usr/src/pkg/manifests/system-network-udapl.mf @@ -21,6 +21,7 @@ # # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # # @@ -49,10 +50,7 @@ dir path=usr/share/man/man4 file path=etc/dat/dat.conf group=sys original_name=SUNWudapl:etc/dat/dat.conf \ preserve=true file path=usr/lib/$(ARCH64)/libdat.so.1 -file path=usr/lib/$(ARCH64)/llib-ldat.ln file path=usr/lib/libdat.so.1 -file path=usr/lib/llib-ldat -file path=usr/lib/llib-ldat.ln file path=usr/sbin/datadm mode=0555 file path=usr/share/man/man1m/datadm.1m file path=usr/share/man/man3dat/dat_cno_create.3dat diff --git a/usr/src/pkg/manifests/system-storage-sasinfo.mf b/usr/src/pkg/manifests/system-storage-sasinfo.mf index 4412fec105..b40ee72c42 100644 --- a/usr/src/pkg/manifests/system-storage-sasinfo.mf +++ b/usr/src/pkg/manifests/system-storage-sasinfo.mf @@ -22,6 +22,7 @@ # # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # Copyright 2012 Nexenta Systems, Inc. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # # @@ -52,11 +53,8 @@ file path=etc/smhba.conf group=sys original_name=SUNWsmhba:etc/smhba.conf \ file path=usr/include/smhbaapi.h file path=usr/lib/$(ARCH64)/libSMHBAAPI.so.1 file path=usr/lib/$(ARCH64)/libsun_sas.so.1 -file path=usr/lib/$(ARCH64)/llib-lSMHBAAPI.ln file path=usr/lib/libSMHBAAPI.so.1 file path=usr/lib/libsun_sas.so.1 -file path=usr/lib/llib-lSMHBAAPI -file path=usr/lib/llib-lSMHBAAPI.ln file path=usr/sbin/sasinfo mode=0555 file path=usr/share/man/man1m/sasinfo.1m file path=usr/share/man/man3lib/libSMHBAAPI.3lib diff --git a/usr/src/pkg/manifests/system-zones-internal.mf b/usr/src/pkg/manifests/system-zones-internal.mf index 40598c0012..7d28ff563f 100644 --- a/usr/src/pkg/manifests/system-zones-internal.mf +++ b/usr/src/pkg/manifests/system-zones-internal.mf @@ -21,6 +21,7 @@ # # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # set name=pkg.fmri value=pkg:/system/zones/internal@$(PKGVERS) @@ -37,15 +38,6 @@ file path=usr/include/libbrand.h file path=usr/include/libuutil.h file path=usr/include/libzonecfg.h file path=usr/include/zonestat_impl.h -file path=usr/lib/$(ARCH64)/llib-lbrand.ln -file path=usr/lib/$(ARCH64)/llib-lzonecfg.ln -file path=usr/lib/$(ARCH64)/llib-lzonestat.ln -file path=usr/lib/llib-lbrand -file path=usr/lib/llib-lbrand.ln -file path=usr/lib/llib-lzonecfg -file path=usr/lib/llib-lzonecfg.ln -file path=usr/lib/llib-lzonestat -file path=usr/lib/llib-lzonestat.ln legacy pkg=SUNWzoneint desc="Solaris Zones internal files" \ name="Solaris Zones Internal Files" version=11.11,REV=2009.10.13 license cr_Sun license=cr_Sun diff --git a/usr/src/stand/lib/fakeboot/llib-lfakeboot b/usr/src/stand/lib/fakeboot/llib-lfakeboot deleted file mode 100644 index 237b5a28ce..0000000000 --- a/usr/src/stand/lib/fakeboot/llib-lfakeboot +++ /dev/null @@ -1,52 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* - * As discussed in <sys/bootsyms.h>, most of the symbols over in psm are - * not properly prototyped anywhere. One consequence of this is that the - * lint libraries that should contain these symbols are either missing or - * incorrectly built. - * - * While that mess certainly needs to be fixed, it's going to take a long - * time and in the meantime we'd like the binaries under stand/lib to be - * lint-clean and linted nightly. To make that possible, we use this lint - * stub to generate a lint library (llib-lfakeboot.ln) that contains the - * correct definitions for all the symbols that should be provided by the - * objects over in psm. - * - * As parts of psm are cleaned up and fixed to properly build lint libraries, - * the definitions for those symbols should be removed from here. Eventually, - * this file should just go away entirely. - */ - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <sys/types.h> -#include <sys/promif.h> /* libprom.a */ -#include <sys/prom_plat.h> /* libplat.a */ -#include <sys/bootsyms.h> /* libnames.a; 2nd stage boot loaders */ diff --git a/usr/src/stand/lib/fs/hsfs/llib-lhsfs b/usr/src/stand/lib/fs/hsfs/llib-lhsfs deleted file mode 100644 index e4b8bfaf8f..0000000000 --- a/usr/src/stand/lib/fs/hsfs/llib-lhsfs +++ /dev/null @@ -1,32 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2003 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <sys/boothsfs.h> diff --git a/usr/src/stand/lib/fs/nfs/llib-lnfs b/usr/src/stand/lib/fs/nfs/llib-lnfs deleted file mode 100644 index 174d8b9000..0000000000 --- a/usr/src/stand/lib/fs/nfs/llib-lnfs +++ /dev/null @@ -1,41 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -/* - * The only symbols that other modules want to use are - * boot_nfs_ops, so just prototype them by hand here; eventually a - * header file would be appropriate. - */ -#include <sys/types.h> -#include <sys/vfs.h> -#include <sys/bootvfs.h> - -extern struct boot_fs_ops boot_nfs_ops; diff --git a/usr/src/stand/lib/fs/ufs/llib-lufs b/usr/src/stand/lib/fs/ufs/llib-lufs deleted file mode 100644 index 2a5be182e9..0000000000 --- a/usr/src/stand/lib/fs/ufs/llib-lufs +++ /dev/null @@ -1,32 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2003 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <sys/bootufs.h> diff --git a/usr/src/stand/lib/inet/llib-linet b/usr/src/stand/lib/inet/llib-linet deleted file mode 100644 index 5d97118f1e..0000000000 --- a/usr/src/stand/lib/inet/llib-linet +++ /dev/null @@ -1,51 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2003 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <sys/types.h> -#include <socket_impl.h> -#include <sys/socket.h> -#include <netinet/in.h> -#include <netinet/ip.h> -#include <netinet/udp.h> -#include <netinet/tcp.h> -#include <netinet/inetutil.h> -#include <mac.h> -#include <atm_inet.h> -#include <ethernet_inet.h> -#include <fddi_inet.h> -#include <token_inet.h> -#include <ipv4.h> -#include <ipv4_impl.h> -#include <icmp4.h> -#include <udp_inet.h> -#include <dhcp_impl.h> -#include <dhcpv4.h> -#include <mac_impl.h> diff --git a/usr/src/stand/lib/sa/llib-lsa b/usr/src/stand/lib/sa/llib-lsa deleted file mode 100644 index 0860940371..0000000000 --- a/usr/src/stand/lib/sa/llib-lsa +++ /dev/null @@ -1,35 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2003 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <sys/salib.h> -#include <sys/sacache.h> -#include <sys/bootvfs.h> -#include <sys/filep.h> diff --git a/usr/src/stand/lib/sock/llib-lsock b/usr/src/stand/lib/sock/llib-lsock deleted file mode 100644 index c41918e6f9..0000000000 --- a/usr/src/stand/lib/sock/llib-lsock +++ /dev/null @@ -1,34 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2003 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <socket_impl.h> -#include <socket_inet.h> -#include <sock_test.h> diff --git a/usr/src/stand/lib/tcp/llib-ltcp b/usr/src/stand/lib/tcp/llib-ltcp deleted file mode 100644 index d58c6ddd71..0000000000 --- a/usr/src/stand/lib/tcp/llib-ltcp +++ /dev/null @@ -1,34 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2003 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <socket_impl.h> -#include <netinet/in.h> -#include <tcp_inet.h> diff --git a/usr/src/stand/lib/tcpstubs/llib-ltcpstubs b/usr/src/stand/lib/tcpstubs/llib-ltcpstubs deleted file mode 100644 index d58c6ddd71..0000000000 --- a/usr/src/stand/lib/tcpstubs/llib-ltcpstubs +++ /dev/null @@ -1,34 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2003 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <socket_impl.h> -#include <netinet/in.h> -#include <tcp_inet.h> diff --git a/usr/src/stand/lib/xdr/llib-lxdr b/usr/src/stand/lib/xdr/llib-lxdr deleted file mode 100644 index 2a1261bb02..0000000000 --- a/usr/src/stand/lib/xdr/llib-lxdr +++ /dev/null @@ -1,33 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2003 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -/* LINTLIBRARY */ -/* PROTOLIB1 */ - -#include <rpc/types.h> -#include <rpc/xdr.h> diff --git a/usr/src/uts/common/fs/zfs/dbuf.c b/usr/src/uts/common/fs/zfs/dbuf.c index f82040d035..ac448d734d 100644 --- a/usr/src/uts/common/fs/zfs/dbuf.c +++ b/usr/src/uts/common/fs/zfs/dbuf.c @@ -742,7 +742,6 @@ dbuf_verify(dmu_buf_impl_t *db) ASSERT3U(db->db.db_offset, ==, DMU_BONUS_BLKID); } else if (db->db_blkid == DMU_SPILL_BLKID) { ASSERT(dn != NULL); - ASSERT3U(db->db.db_size, >=, dn->dn_bonuslen); ASSERT0(db->db.db_offset); } else { ASSERT3U(db->db.db_offset, ==, db->db_blkid * db->db.db_size); @@ -995,26 +994,29 @@ dbuf_read_impl(dmu_buf_impl_t *db, zio_t *zio, uint32_t flags) ASSERT(db->db_buf == NULL); if (db->db_blkid == DMU_BONUS_BLKID) { + /* + * The bonus length stored in the dnode may be less than + * the maximum available space in the bonus buffer. + */ int bonuslen = MIN(dn->dn_bonuslen, dn->dn_phys->dn_bonuslen); + int max_bonuslen = DN_SLOTS_TO_BONUSLEN(dn->dn_num_slots); ASSERT3U(bonuslen, <=, db->db.db_size); - db->db.db_data = zio_buf_alloc(DN_MAX_BONUSLEN); - arc_space_consume(DN_MAX_BONUSLEN, ARC_SPACE_OTHER); - if (bonuslen < DN_MAX_BONUSLEN) - bzero(db->db.db_data, DN_MAX_BONUSLEN); - + db->db.db_data = zio_buf_alloc(max_bonuslen); + arc_space_consume(max_bonuslen, ARC_SPACE_BONUS); + if (bonuslen < max_bonuslen) + bzero(db->db.db_data, max_bonuslen); if (bonuslen) { /* * Absent byzantine on-disk corruption, we fully expect - * our bonuslen to be no more than DN_MAX_BONUSLEN -- + * our bonuslen to be no more than max_bonuslen -- * but we nonetheless explicitly clamp it on the bcopy() * to prevent any on-disk corruption from becoming * rampant in-kernel corruption. */ bcopy(DN_BONUS(dn->dn_phys), db->db.db_data, - MIN(bonuslen, DN_MAX_BONUSLEN)); + MIN(bonuslen, max_bonuslen)); } - DB_DNODE_EXIT(db); db->db_state = DB_CACHED; mutex_exit(&db->db_mtx); @@ -1119,9 +1121,11 @@ dbuf_fix_old_data(dmu_buf_impl_t *db, uint64_t txg) ASSERT(dr->dr_txg >= txg - 2); if (db->db_blkid == DMU_BONUS_BLKID) { /* Note that the data bufs here are zio_bufs */ - dr->dt.dl.dr_data = zio_buf_alloc(DN_MAX_BONUSLEN); - arc_space_consume(DN_MAX_BONUSLEN, ARC_SPACE_OTHER); - bcopy(db->db.db_data, dr->dt.dl.dr_data, DN_MAX_BONUSLEN); + dnode_t *dn = DB_DNODE(db); + int bonuslen = DN_SLOTS_TO_BONUSLEN(dn->dn_num_slots); + dr->dt.dl.dr_data = zio_buf_alloc(bonuslen); + arc_space_consume(bonuslen, ARC_SPACE_BONUS); + bcopy(db->db.db_data, dr->dt.dl.dr_data, bonuslen); } else if (refcount_count(&db->db_holds) > db->db_dirtycnt) { int size = arc_buf_size(db->db_buf); arc_buf_contents_t type = DBUF_GET_BUFC_TYPE(db); @@ -2092,10 +2096,13 @@ dbuf_destroy(dmu_buf_impl_t *db) } if (db->db_blkid == DMU_BONUS_BLKID) { - ASSERT(db->db.db_data != NULL); - zio_buf_free(db->db.db_data, DN_MAX_BONUSLEN); - arc_space_return(DN_MAX_BONUSLEN, ARC_SPACE_OTHER); - db->db_state = DB_UNCACHED; + int slots = DB_DNODE(db)->dn_num_slots; + int bonuslen = DN_SLOTS_TO_BONUSLEN(slots); + if (db->db.db_data != NULL) { + zio_buf_free(db->db.db_data, bonuslen); + arc_space_return(bonuslen, ARC_SPACE_BONUS); + db->db_state = DB_UNCACHED; + } } dbuf_clear_data(db); @@ -2199,7 +2206,7 @@ dbuf_findbp(dnode_t *dn, int level, uint64_t blkid, int fail_sparse, mutex_enter(&dn->dn_mtx); if (dn->dn_have_spill && (dn->dn_phys->dn_flags & DNODE_FLAG_SPILL_BLKPTR)) - *bpp = &dn->dn_phys->dn_spill; + *bpp = DN_SPILL_BLKPTR(dn->dn_phys); else *bpp = NULL; dbuf_add_ref(dn->dn_dbuf, NULL); @@ -2300,7 +2307,7 @@ dbuf_create(dnode_t *dn, uint8_t level, uint64_t blkid, if (blkid == DMU_BONUS_BLKID) { ASSERT3P(parent, ==, dn->dn_dbuf); - db->db.db_size = DN_MAX_BONUSLEN - + db->db.db_size = DN_SLOTS_TO_BONUSLEN(dn->dn_num_slots) - (dn->dn_nblkptr-1) * sizeof (blkptr_t); ASSERT3U(db->db.db_size, >=, dn->dn_bonuslen); db->db.db_offset = DMU_BONUS_BLKID; @@ -3042,7 +3049,7 @@ dbuf_check_blkptr(dnode_t *dn, dmu_buf_impl_t *db) return; if (db->db_blkid == DMU_SPILL_BLKID) { - db->db_blkptr = &dn->dn_phys->dn_spill; + db->db_blkptr = DN_SPILL_BLKPTR(dn->dn_phys); BP_ZERO(db->db_blkptr); return; } @@ -3173,13 +3180,17 @@ dbuf_sync_leaf(dbuf_dirty_record_t *dr, dmu_tx_t *tx) ASSERT(*datap != NULL); ASSERT0(db->db_level); - ASSERT3U(dn->dn_phys->dn_bonuslen, <=, DN_MAX_BONUSLEN); - bcopy(*datap, DN_BONUS(dn->dn_phys), dn->dn_phys->dn_bonuslen); + ASSERT3U(DN_MAX_BONUS_LEN(dn->dn_phys), <=, + DN_SLOTS_TO_BONUSLEN(dn->dn_phys->dn_extra_slots + 1)); + bcopy(*datap, DN_BONUS(dn->dn_phys), + DN_MAX_BONUS_LEN(dn->dn_phys)); DB_DNODE_EXIT(db); if (*datap != db->db.db_data) { - zio_buf_free(*datap, DN_MAX_BONUSLEN); - arc_space_return(DN_MAX_BONUSLEN, ARC_SPACE_OTHER); + int slots = DB_DNODE(db)->dn_num_slots; + int bonuslen = DN_SLOTS_TO_BONUSLEN(slots); + zio_buf_free(*datap, bonuslen); + arc_space_return(bonuslen, ARC_SPACE_BONUS); } db->db_data_pending = NULL; drp = &db->db_last_dirty; @@ -3335,7 +3346,7 @@ dbuf_write_ready(zio_t *zio, arc_buf_t *buf, void *vdb) if (db->db_blkid == DMU_SPILL_BLKID) { ASSERT(dn->dn_phys->dn_flags & DNODE_FLAG_SPILL_BLKPTR); ASSERT(!(BP_IS_HOLE(bp)) && - db->db_blkptr == &dn->dn_phys->dn_spill); + db->db_blkptr == DN_SPILL_BLKPTR(dn->dn_phys)); } #endif @@ -3347,11 +3358,17 @@ dbuf_write_ready(zio_t *zio, arc_buf_t *buf, void *vdb) mutex_exit(&dn->dn_mtx); if (dn->dn_type == DMU_OT_DNODE) { - dnode_phys_t *dnp = db->db.db_data; - for (i = db->db.db_size >> DNODE_SHIFT; i > 0; - i--, dnp++) { - if (dnp->dn_type != DMU_OT_NONE) + i = 0; + while (i < db->db.db_size) { + dnode_phys_t *dnp = + (void *)(((char *)db->db.db_data) + i); + + i += DNODE_MIN_SIZE; + if (dnp->dn_type != DMU_OT_NONE) { fill++; + i += dnp->dn_extra_slots * + DNODE_MIN_SIZE; + } } } else { if (BP_IS_HOLE(bp)) { @@ -3504,7 +3521,7 @@ dbuf_write_done(zio_t *zio, arc_buf_t *buf, void *vdb) dn = DB_DNODE(db); ASSERT(dn->dn_phys->dn_flags & DNODE_FLAG_SPILL_BLKPTR); ASSERT(!(BP_IS_HOLE(db->db_blkptr)) && - db->db_blkptr == &dn->dn_phys->dn_spill); + db->db_blkptr == DN_SPILL_BLKPTR(dn->dn_phys)); DB_DNODE_EXIT(db); } #endif diff --git a/usr/src/uts/common/fs/zfs/dmu.c b/usr/src/uts/common/fs/zfs/dmu.c index 44157a3f62..af7c58bb8d 100644 --- a/usr/src/uts/common/fs/zfs/dmu.c +++ b/usr/src/uts/common/fs/zfs/dmu.c @@ -254,7 +254,7 @@ dmu_buf_hold(objset_t *os, uint64_t object, uint64_t offset, int dmu_bonus_max(void) { - return (DN_MAX_BONUSLEN); + return (DN_OLD_MAX_BONUSLEN); } int @@ -2263,6 +2263,7 @@ dmu_object_info_from_dnode(dnode_t *dn, dmu_object_info_t *doi) doi->doi_type = dn->dn_type; doi->doi_bonus_type = dn->dn_bonustype; doi->doi_bonus_size = dn->dn_bonuslen; + doi->doi_dnodesize = dn->dn_num_slots << DNODE_SHIFT; doi->doi_indirection = dn->dn_nlevels; doi->doi_checksum = dn->dn_checksum; doi->doi_compress = dn->dn_compress; @@ -2325,9 +2326,21 @@ dmu_object_size_from_db(dmu_buf_t *db_fake, uint32_t *blksize, dn = DB_DNODE(db); *blksize = dn->dn_datablksz; - /* add 1 for dnode space */ + /* add in number of slots used for the dnode itself */ *nblk512 = ((DN_USED_BYTES(dn->dn_phys) + SPA_MINBLOCKSIZE/2) >> - SPA_MINBLOCKSHIFT) + 1; + SPA_MINBLOCKSHIFT) + dn->dn_num_slots; + DB_DNODE_EXIT(db); +} + +void +dmu_object_dnsize_from_db(dmu_buf_t *db_fake, int *dnsize) +{ + dmu_buf_impl_t *db = (dmu_buf_impl_t *)db_fake; + dnode_t *dn; + + DB_DNODE_ENTER(db); + dn = DB_DNODE(db); + *dnsize = dn->dn_num_slots << DNODE_SHIFT; DB_DNODE_EXIT(db); } diff --git a/usr/src/uts/common/fs/zfs/dmu_object.c b/usr/src/uts/common/fs/zfs/dmu_object.c index b853081e8b..2fe866b89d 100644 --- a/usr/src/uts/common/fs/zfs/dmu_object.c +++ b/usr/src/uts/common/fs/zfs/dmu_object.c @@ -30,53 +30,132 @@ #include <sys/dnode.h> #include <sys/zap.h> #include <sys/zfeature.h> +#include <sys/dsl_dataset.h> -uint64_t -dmu_object_alloc_ibs(objset_t *os, dmu_object_type_t ot, int blocksize, - int indirect_blockshift, - dmu_object_type_t bonustype, int bonuslen, dmu_tx_t *tx) +/* + * Each of the concurrent object allocators will grab + * 2^dmu_object_alloc_chunk_shift dnode slots at a time. The default is to + * grab 128 slots, which is 4 blocks worth. This was experimentally + * determined to be the lowest value that eliminates the measurable effect + * of lock contention from this code path. + */ +int dmu_object_alloc_chunk_shift = 7; + +static uint64_t +dmu_object_alloc_impl(objset_t *os, dmu_object_type_t ot, int blocksize, + int indirect_blockshift, dmu_object_type_t bonustype, int bonuslen, + int dnodesize, dmu_tx_t *tx) { uint64_t object; uint64_t L1_dnode_count = DNODES_PER_BLOCK << (DMU_META_DNODE(os)->dn_indblkshift - SPA_BLKPTRSHIFT); dnode_t *dn = NULL; + int dn_slots = dnodesize >> DNODE_SHIFT; + boolean_t restarted = B_FALSE; + uint64_t *cpuobj = &os->os_obj_next_percpu[CPU_SEQID % + os->os_obj_next_percpu_len]; + int dnodes_per_chunk = 1 << dmu_object_alloc_chunk_shift; + int error; + + if (dn_slots == 0) { + dn_slots = DNODE_MIN_SLOTS; + } else { + ASSERT3S(dn_slots, >=, DNODE_MIN_SLOTS); + ASSERT3S(dn_slots, <=, DNODE_MAX_SLOTS); + } + + /* + * The "chunk" of dnodes that is assigned to a CPU-specific + * allocator needs to be at least one block's worth, to avoid + * lock contention on the dbuf. It can be at most one L1 block's + * worth, so that the "rescan after polishing off a L1's worth" + * logic below will be sure to kick in. + */ + if (dnodes_per_chunk < DNODES_PER_BLOCK) + dnodes_per_chunk = DNODES_PER_BLOCK; + if (dnodes_per_chunk > L1_dnode_count) + dnodes_per_chunk = L1_dnode_count; + + object = *cpuobj; - mutex_enter(&os->os_obj_lock); for (;;) { - object = os->os_obj_next; /* - * Each time we polish off a L1 bp worth of dnodes (2^12 - * objects), move to another L1 bp that's still reasonably - * sparse (at most 1/4 full). Look from the beginning at most - * once per txg, but after that keep looking from here. - * os_scan_dnodes is set during txg sync if enough objects - * have been freed since the previous rescan to justify - * backfilling again. If we can't find a suitable block, just - * keep going from here. - * - * Note that dmu_traverse depends on the behavior that we use - * multiple blocks of the dnode object before going back to - * reuse objects. Any change to this algorithm should preserve - * that property or find another solution to the issues - * described in traverse_visitbp. + * If we finished a chunk of dnodes, get a new one from + * the global allocator. */ - - if (P2PHASE(object, L1_dnode_count) == 0) { - uint64_t offset; - int error; - if (os->os_rescan_dnodes) { - offset = 0; - os->os_rescan_dnodes = B_FALSE; - } else { - offset = object << DNODE_SHIFT; + if ((P2PHASE(object, dnodes_per_chunk) == 0) || + (P2PHASE(object + dn_slots - 1, dnodes_per_chunk) < + dn_slots)) { + DNODE_STAT_BUMP(dnode_alloc_next_chunk); + mutex_enter(&os->os_obj_lock); + ASSERT0(P2PHASE(os->os_obj_next_chunk, + dnodes_per_chunk)); + object = os->os_obj_next_chunk; + + /* + * Each time we polish off a L1 bp worth of dnodes + * (2^12 objects), move to another L1 bp that's + * still reasonably sparse (at most 1/4 full). Look + * from the beginning at most once per txg. If we + * still can't allocate from that L1 block, search + * for an empty L0 block, which will quickly skip + * to the end of the metadnode if the no nearby L0 + * blocks are empty. This fallback avoids a + * pathology where full dnode blocks containing + * large dnodes appear sparse because they have a + * low blk_fill, leading to many failed allocation + * attempts. In the long term a better mechanism to + * search for sparse metadnode regions, such as + * spacemaps, could be implemented. + * + * os_scan_dnodes is set during txg sync if enough + * objects have been freed since the previous + * rescan to justify backfilling again. + * + * Note that dmu_traverse depends on the behavior + * that we use multiple blocks of the dnode object + * before going back to reuse objects. Any change + * to this algorithm should preserve that property + * or find another solution to the issues described + * in traverse_visitbp. + */ + if (P2PHASE(object, L1_dnode_count) == 0) { + uint64_t offset; + uint64_t blkfill; + int minlvl; + if (os->os_rescan_dnodes) { + offset = 0; + os->os_rescan_dnodes = B_FALSE; + } else { + offset = object << DNODE_SHIFT; + } + blkfill = restarted ? 1 : DNODES_PER_BLOCK >> 2; + minlvl = restarted ? 1 : 2; + restarted = B_TRUE; + error = dnode_next_offset(DMU_META_DNODE(os), + DNODE_FIND_HOLE, &offset, minlvl, + blkfill, 0); + if (error == 0) { + object = offset >> DNODE_SHIFT; + } } - error = dnode_next_offset(DMU_META_DNODE(os), - DNODE_FIND_HOLE, - &offset, 2, DNODES_PER_BLOCK >> 2, 0); - if (error == 0) - object = offset >> DNODE_SHIFT; + /* + * Note: if "restarted", we may find a L0 that + * is not suitably aligned. + */ + os->os_obj_next_chunk = + P2ALIGN(object, dnodes_per_chunk) + + dnodes_per_chunk; + (void) atomic_swap_64(cpuobj, object); + mutex_exit(&os->os_obj_lock); } - os->os_obj_next = ++object; + + /* + * The value of (*cpuobj) before adding dn_slots is the object + * ID assigned to us. The value afterwards is the object ID + * assigned to whoever wants to do an allocation next. + */ + object = atomic_add_64_nv(cpuobj, dn_slots) - dn_slots; /* * XXX We should check for an i/o error here and return @@ -84,47 +163,94 @@ dmu_object_alloc_ibs(objset_t *os, dmu_object_type_t ot, int blocksize, * dmu_tx_assign(), but there is currently no mechanism * to do so. */ - (void) dnode_hold_impl(os, object, DNODE_MUST_BE_FREE, - FTAG, &dn); - if (dn) - break; + error = dnode_hold_impl(os, object, DNODE_MUST_BE_FREE, + dn_slots, FTAG, &dn); + if (error == 0) { + rw_enter(&dn->dn_struct_rwlock, RW_WRITER); + /* + * Another thread could have allocated it; check + * again now that we have the struct lock. + */ + if (dn->dn_type == DMU_OT_NONE) { + dnode_allocate(dn, ot, blocksize, 0, + bonustype, bonuslen, dn_slots, tx); + rw_exit(&dn->dn_struct_rwlock); + dmu_tx_add_new_object(tx, dn); + dnode_rele(dn, FTAG); + return (object); + } + rw_exit(&dn->dn_struct_rwlock); + dnode_rele(dn, FTAG); + DNODE_STAT_BUMP(dnode_alloc_race); + } - if (dmu_object_next(os, &object, B_TRUE, 0) == 0) - os->os_obj_next = object - 1; + /* + * Skip to next known valid starting point on error. This + * is the start of the next block of dnodes. + */ + if (dmu_object_next(os, &object, B_TRUE, 0) != 0) { + object = P2ROUNDUP(object + 1, DNODES_PER_BLOCK); + DNODE_STAT_BUMP(dnode_alloc_next_block); + } + (void) atomic_swap_64(cpuobj, object); } - - dnode_allocate(dn, ot, blocksize, indirect_blockshift, - bonustype, bonuslen, tx); - mutex_exit(&os->os_obj_lock); - - dmu_tx_add_new_object(tx, dn); - dnode_rele(dn, FTAG); - - return (object); } uint64_t dmu_object_alloc(objset_t *os, dmu_object_type_t ot, int blocksize, dmu_object_type_t bonustype, int bonuslen, dmu_tx_t *tx) { - return (dmu_object_alloc_ibs(os, ot, blocksize, 0, - bonustype, bonuslen, tx)); + return (dmu_object_alloc_impl(os, ot, blocksize, 0, bonustype, + bonuslen, 0, tx)); +} + +uint64_t +dmu_object_alloc_ibs(objset_t *os, dmu_object_type_t ot, int blocksize, + int indirect_blockshift, dmu_object_type_t bonustype, int bonuslen, + dmu_tx_t *tx) +{ + return (dmu_object_alloc_impl(os, ot, blocksize, indirect_blockshift, + bonustype, bonuslen, 0, tx)); +} + +uint64_t +dmu_object_alloc_dnsize(objset_t *os, dmu_object_type_t ot, int blocksize, + dmu_object_type_t bonustype, int bonuslen, int dnodesize, dmu_tx_t *tx) +{ + return (dmu_object_alloc_impl(os, ot, blocksize, 0, bonustype, + bonuslen, dnodesize, tx)); } int dmu_object_claim(objset_t *os, uint64_t object, dmu_object_type_t ot, int blocksize, dmu_object_type_t bonustype, int bonuslen, dmu_tx_t *tx) { + return (dmu_object_claim_dnsize(os, object, ot, blocksize, bonustype, + bonuslen, 0, tx)); +} + +int +dmu_object_claim_dnsize(objset_t *os, uint64_t object, dmu_object_type_t ot, + int blocksize, dmu_object_type_t bonustype, int bonuslen, + int dnodesize, dmu_tx_t *tx) +{ dnode_t *dn; + int dn_slots = dnodesize >> DNODE_SHIFT; int err; + if (dn_slots == 0) + dn_slots = DNODE_MIN_SLOTS; + ASSERT3S(dn_slots, >=, DNODE_MIN_SLOTS); + ASSERT3S(dn_slots, <=, DNODE_MAX_SLOTS); + if (object == DMU_META_DNODE_OBJECT && !dmu_tx_private_ok(tx)) return (SET_ERROR(EBADF)); - err = dnode_hold_impl(os, object, DNODE_MUST_BE_FREE, FTAG, &dn); + err = dnode_hold_impl(os, object, DNODE_MUST_BE_FREE, dn_slots, + FTAG, &dn); if (err) return (err); - dnode_allocate(dn, ot, blocksize, 0, bonustype, bonuslen, tx); + dnode_allocate(dn, ot, blocksize, 0, bonustype, bonuslen, dn_slots, tx); dmu_tx_add_new_object(tx, dn); dnode_rele(dn, FTAG); @@ -136,18 +262,28 @@ int dmu_object_reclaim(objset_t *os, uint64_t object, dmu_object_type_t ot, int blocksize, dmu_object_type_t bonustype, int bonuslen, dmu_tx_t *tx) { + return (dmu_object_reclaim_dnsize(os, object, ot, blocksize, bonustype, + bonuslen, 0, tx)); +} + +int +dmu_object_reclaim_dnsize(objset_t *os, uint64_t object, dmu_object_type_t ot, + int blocksize, dmu_object_type_t bonustype, int bonuslen, int dnodesize, + dmu_tx_t *tx) +{ dnode_t *dn; + int dn_slots = dnodesize >> DNODE_SHIFT; int err; if (object == DMU_META_DNODE_OBJECT) return (SET_ERROR(EBADF)); - err = dnode_hold_impl(os, object, DNODE_MUST_BE_ALLOCATED, + err = dnode_hold_impl(os, object, DNODE_MUST_BE_ALLOCATED, 0, FTAG, &dn); if (err) return (err); - dnode_reallocate(dn, ot, blocksize, bonustype, bonuslen, tx); + dnode_reallocate(dn, ot, blocksize, bonustype, bonuslen, dn_slots, tx); dnode_rele(dn, FTAG); return (err); @@ -161,7 +297,7 @@ dmu_object_free(objset_t *os, uint64_t object, dmu_tx_t *tx) ASSERT(object != DMU_META_DNODE_OBJECT || dmu_tx_private_ok(tx)); - err = dnode_hold_impl(os, object, DNODE_MUST_BE_ALLOCATED, + err = dnode_hold_impl(os, object, DNODE_MUST_BE_ALLOCATED, 0, FTAG, &dn); if (err) return (err); @@ -186,9 +322,54 @@ dmu_object_free(objset_t *os, uint64_t object, dmu_tx_t *tx) int dmu_object_next(objset_t *os, uint64_t *objectp, boolean_t hole, uint64_t txg) { - uint64_t offset = (*objectp + 1) << DNODE_SHIFT; + uint64_t offset; + uint64_t start_obj; + struct dsl_dataset *ds = os->os_dsl_dataset; int error; + if (*objectp == 0) { + start_obj = 1; + } else if (ds && ds->ds_feature_inuse[SPA_FEATURE_LARGE_DNODE]) { + uint64_t i = *objectp + 1; + uint64_t last_obj = *objectp | (DNODES_PER_BLOCK - 1); + dmu_object_info_t doi; + + /* + * Scan through the remaining meta dnode block. The contents + * of each slot in the block are known so it can be quickly + * checked. If the block is exhausted without a match then + * hand off to dnode_next_offset() for further scanning. + */ + while (i <= last_obj) { + error = dmu_object_info(os, i, &doi); + if (error == ENOENT) { + if (hole) { + *objectp = i; + return (0); + } else { + i++; + } + } else if (error == EEXIST) { + i++; + } else if (error == 0) { + if (hole) { + i += doi.doi_dnodesize >> DNODE_SHIFT; + } else { + *objectp = i; + return (0); + } + } else { + return (error); + } + } + + start_obj = i; + } else { + start_obj = *objectp + 1; + } + + offset = start_obj << DNODE_SHIFT; + error = dnode_next_offset(DMU_META_DNODE(os), (hole ? DNODE_FIND_HOLE : 0), &offset, 0, DNODES_PER_BLOCK, txg); diff --git a/usr/src/uts/common/fs/zfs/dmu_objset.c b/usr/src/uts/common/fs/zfs/dmu_objset.c index c5267ac18d..db0fff702e 100644 --- a/usr/src/uts/common/fs/zfs/dmu_objset.c +++ b/usr/src/uts/common/fs/zfs/dmu_objset.c @@ -140,6 +140,12 @@ dmu_objset_id(objset_t *os) return (ds ? ds->ds_object : 0); } +uint64_t +dmu_objset_dnodesize(objset_t *os) +{ + return (os->os_dnodesize); +} + zfs_sync_type_t dmu_objset_syncprop(objset_t *os) { @@ -270,6 +276,34 @@ redundant_metadata_changed_cb(void *arg, uint64_t newval) } static void +dnodesize_changed_cb(void *arg, uint64_t newval) +{ + objset_t *os = arg; + + switch (newval) { + case ZFS_DNSIZE_LEGACY: + os->os_dnodesize = DNODE_MIN_SIZE; + break; + case ZFS_DNSIZE_AUTO: + /* + * Choose a dnode size that will work well for most + * workloads if the user specified "auto". Future code + * improvements could dynamically select a dnode size + * based on observed workload patterns. + */ + os->os_dnodesize = DNODE_MIN_SIZE * 2; + break; + case ZFS_DNSIZE_1K: + case ZFS_DNSIZE_2K: + case ZFS_DNSIZE_4K: + case ZFS_DNSIZE_8K: + case ZFS_DNSIZE_16K: + os->os_dnodesize = newval; + break; + } +} + +static void logbias_changed_cb(void *arg, uint64_t newval) { objset_t *os = arg; @@ -477,6 +511,11 @@ dmu_objset_open_impl(spa_t *spa, dsl_dataset_t *ds, blkptr_t *bp, zfs_prop_to_name(ZFS_PROP_RECORDSIZE), recordsize_changed_cb, os); } + if (err == 0) { + err = dsl_prop_register(ds, + zfs_prop_to_name(ZFS_PROP_DNODESIZE), + dnodesize_changed_cb, os); + } } if (needlock) dsl_pool_config_exit(dmu_objset_pool(os), FTAG); @@ -496,6 +535,7 @@ dmu_objset_open_impl(spa_t *spa, dsl_dataset_t *ds, blkptr_t *bp, os->os_sync = ZFS_SYNC_STANDARD; os->os_primary_cache = ZFS_CACHE_ALL; os->os_secondary_cache = ZFS_CACHE_ALL; + os->os_dnodesize = DNODE_MIN_SIZE; } /* * These properties will be filled in by the logic in zfs_get_zplprop() @@ -524,6 +564,9 @@ dmu_objset_open_impl(spa_t *spa, dsl_dataset_t *ds, blkptr_t *bp, mutex_init(&os->os_userused_lock, NULL, MUTEX_DEFAULT, NULL); mutex_init(&os->os_obj_lock, NULL, MUTEX_DEFAULT, NULL); mutex_init(&os->os_user_ptr_lock, NULL, MUTEX_DEFAULT, NULL); + os->os_obj_next_percpu_len = boot_ncpus; + os->os_obj_next_percpu = kmem_zalloc(os->os_obj_next_percpu_len * + sizeof (os->os_obj_next_percpu[0]), KM_SLEEP); dnode_special_open(os, &os->os_phys->os_meta_dnode, DMU_META_DNODE_OBJECT, &os->os_meta_dnode); @@ -802,6 +845,9 @@ dmu_objset_evict_done(objset_t *os) rw_enter(&os_lock, RW_READER); rw_exit(&os_lock); + kmem_free(os->os_obj_next_percpu, + os->os_obj_next_percpu_len * sizeof (os->os_obj_next_percpu[0])); + mutex_destroy(&os->os_lock); mutex_destroy(&os->os_userused_lock); mutex_destroy(&os->os_obj_lock); @@ -836,8 +882,8 @@ dmu_objset_create_impl(spa_t *spa, dsl_dataset_t *ds, blkptr_t *bp, mdn = DMU_META_DNODE(os); - dnode_allocate(mdn, DMU_OT_DNODE, 1 << DNODE_BLOCK_SHIFT, - DN_MAX_INDBLKSHIFT, DMU_OT_NONE, 0, tx); + dnode_allocate(mdn, DMU_OT_DNODE, DNODE_BLOCK_SIZE, DN_MAX_INDBLKSHIFT, + DMU_OT_NONE, 0, DNODE_MIN_SLOTS, tx); /* * We don't want to have to increase the meta-dnode's nlevels @@ -1496,7 +1542,7 @@ do_userquota_update(userquota_cache_t *cache, uint64_t used, uint64_t flags, uint64_t user, uint64_t group, boolean_t subtract) { if ((flags & DNODE_FLAG_USERUSED_ACCOUNTED)) { - int64_t delta = DNODE_SIZE + used; + int64_t delta = DNODE_MIN_SIZE + used; if (subtract) delta = -delta; diff --git a/usr/src/uts/common/fs/zfs/dmu_send.c b/usr/src/uts/common/fs/zfs/dmu_send.c index 026623f3d5..dbce95924c 100644 --- a/usr/src/uts/common/fs/zfs/dmu_send.c +++ b/usr/src/uts/common/fs/zfs/dmu_send.c @@ -469,6 +469,7 @@ dump_dnode(dmu_sendarg_t *dsp, uint64_t object, dnode_phys_t *dnp) drro->drr_bonustype = dnp->dn_bonustype; drro->drr_blksz = dnp->dn_datablkszsec << SPA_MINBLOCKSHIFT; drro->drr_bonuslen = dnp->dn_bonuslen; + drro->drr_dn_slots = dnp->dn_extra_slots + 1; drro->drr_checksumtype = dnp->dn_checksum; drro->drr_compress = dnp->dn_compress; drro->drr_toguid = dsp->dsa_toguid; @@ -621,7 +622,7 @@ do_dump(dmu_sendarg_t *dsa, struct send_block_record *data) } else if (zb->zb_level > 0 || type == DMU_OT_OBJSET) { return (0); } else if (type == DMU_OT_DNODE) { - int blksz = BP_GET_LSIZE(bp); + int epb = BP_GET_LSIZE(bp) >> DNODE_SHIFT; arc_flags_t aflags = ARC_FLAG_WAIT; arc_buf_t *abuf; @@ -633,8 +634,8 @@ do_dump(dmu_sendarg_t *dsa, struct send_block_record *data) return (SET_ERROR(EIO)); dnode_phys_t *blk = abuf->b_data; - uint64_t dnobj = zb->zb_blkid * (blksz >> DNODE_SHIFT); - for (int i = 0; i < blksz >> DNODE_SHIFT; i++) { + uint64_t dnobj = zb->zb_blkid * epb; + for (int i = 0; i < epb; i += blk[i].dn_extra_slots + 1) { err = dump_dnode(dsa, dnobj + i, blk + i); if (err != 0) break; @@ -802,6 +803,8 @@ dmu_send_impl(void *tag, dsl_pool_t *dp, dsl_dataset_t *to_ds, if (large_block_ok && to_ds->ds_feature_inuse[SPA_FEATURE_LARGE_BLOCKS]) featureflags |= DMU_BACKUP_FEATURE_LARGE_BLOCKS; + if (to_ds->ds_feature_inuse[SPA_FEATURE_LARGE_DNODE]) + featureflags |= DMU_BACKUP_FEATURE_LARGE_DNODE; if (embedok && spa_feature_is_active(dp->dp_spa, SPA_FEATURE_EMBEDDED_DATA)) { featureflags |= DMU_BACKUP_FEATURE_EMBED_DATA; @@ -1396,11 +1399,15 @@ dmu_recv_begin_check(void *arg, dmu_tx_t *tx) /* * The receiving code doesn't know how to translate large blocks * to smaller ones, so the pool must have the LARGE_BLOCKS - * feature enabled if the stream has LARGE_BLOCKS. + * feature enabled if the stream has LARGE_BLOCKS. Same with + * large dnodes. */ if ((featureflags & DMU_BACKUP_FEATURE_LARGE_BLOCKS) && !spa_feature_is_enabled(dp->dp_spa, SPA_FEATURE_LARGE_BLOCKS)) return (SET_ERROR(ENOTSUP)); + if ((featureflags & DMU_BACKUP_FEATURE_LARGE_DNODE) && + !spa_feature_is_enabled(dp->dp_spa, SPA_FEATURE_LARGE_DNODE)) + return (SET_ERROR(ENOTSUP)); error = dsl_dataset_hold(dp, tofs, FTAG, &ds); if (error == 0) { @@ -1605,6 +1612,9 @@ dmu_recv_resume_begin_check(void *arg, dmu_tx_t *tx) dsl_dataset_t *ds; const char *tofs = drba->drba_cookie->drc_tofs; + /* 6 extra bytes for /%recv */ + char recvname[ZFS_MAX_DATASET_NAME_LEN + 6]; + /* already checked */ ASSERT3U(drrb->drr_magic, ==, DMU_BACKUP_MAGIC); ASSERT(featureflags & DMU_BACKUP_FEATURE_RESUMING); @@ -1632,8 +1642,18 @@ dmu_recv_resume_begin_check(void *arg, dmu_tx_t *tx) !spa_feature_is_enabled(dp->dp_spa, SPA_FEATURE_LZ4_COMPRESS)) return (SET_ERROR(ENOTSUP)); - /* 6 extra bytes for /%recv */ - char recvname[ZFS_MAX_DATASET_NAME_LEN + 6]; + /* + * The receiving code doesn't know how to translate large blocks + * to smaller ones, so the pool must have the LARGE_BLOCKS + * feature enabled if the stream has LARGE_BLOCKS. Same with + * large dnodes. + */ + if ((featureflags & DMU_BACKUP_FEATURE_LARGE_BLOCKS) && + !spa_feature_is_enabled(dp->dp_spa, SPA_FEATURE_LARGE_BLOCKS)) + return (SET_ERROR(ENOTSUP)); + if ((featureflags & DMU_BACKUP_FEATURE_LARGE_DNODE) && + !spa_feature_is_enabled(dp->dp_spa, SPA_FEATURE_LARGE_DNODE)) + return (SET_ERROR(ENOTSUP)); (void) snprintf(recvname, sizeof (recvname), "%s/%s", tofs, recv_clone_name); @@ -2024,7 +2044,8 @@ deduce_nblkptr(dmu_object_type_t bonus_type, uint64_t bonus_size) return (1); } else { return (1 + - ((DN_MAX_BONUSLEN - bonus_size) >> SPA_BLKPTRSHIFT)); + ((DN_OLD_MAX_BONUSLEN - + MIN(DN_OLD_MAX_BONUSLEN, bonus_size)) >> SPA_BLKPTRSHIFT)); } } @@ -2082,15 +2103,17 @@ receive_object(struct receive_writer_arg *rwa, struct drr_object *drro, P2PHASE(drro->drr_blksz, SPA_MINBLOCKSIZE) || drro->drr_blksz < SPA_MINBLOCKSIZE || drro->drr_blksz > spa_maxblocksize(dmu_objset_spa(rwa->os)) || - drro->drr_bonuslen > DN_MAX_BONUSLEN) { + drro->drr_bonuslen > + DN_BONUS_SIZE(spa_maxdnodesize(dmu_objset_spa(rwa->os))) || + drro->drr_dn_slots > + (spa_maxdnodesize(dmu_objset_spa(rwa->os)) >> DNODE_SHIFT)) { return (SET_ERROR(EINVAL)); } err = dmu_object_info(rwa->os, drro->drr_object, &doi); - if (err != 0 && err != ENOENT) + if (err != 0 && err != ENOENT && err != EEXIST) return (SET_ERROR(EINVAL)); - object = err == 0 ? drro->drr_object : DMU_NEW_OBJECT; if (drro->drr_object > rwa->max_object) rwa->max_object = drro->drr_object; @@ -2103,16 +2126,64 @@ receive_object(struct receive_writer_arg *rwa, struct drr_object *drro, if (err == 0) { int nblkptr; + object = drro->drr_object; + nblkptr = deduce_nblkptr(drro->drr_bonustype, drro->drr_bonuslen); if (drro->drr_blksz != doi.doi_data_block_size || - nblkptr < doi.doi_nblkptr) { + nblkptr < doi.doi_nblkptr || + drro->drr_dn_slots != doi.doi_dnodesize >> DNODE_SHIFT) { err = dmu_free_long_range(rwa->os, drro->drr_object, 0, DMU_OBJECT_END); if (err != 0) return (SET_ERROR(EINVAL)); } + } else if (err == EEXIST) { + /* + * The object requested is currently an interior slot of a + * multi-slot dnode. This will be resolved when the next txg + * is synced out, since the send stream will have told us + * to free this slot when we freed the associated dnode + * earlier in the stream. + */ + txg_wait_synced(dmu_objset_pool(rwa->os), 0); + object = drro->drr_object; + } else { + /* object is free and we are about to allocate a new one */ + object = DMU_NEW_OBJECT; + } + + /* + * If this is a multi-slot dnode there is a chance that this + * object will expand into a slot that is already used by + * another object from the previous snapshot. We must free + * these objects before we attempt to allocate the new dnode. + */ + if (drro->drr_dn_slots > 1) { + boolean_t need_sync = B_FALSE; + + for (uint64_t slot = drro->drr_object + 1; + slot < drro->drr_object + drro->drr_dn_slots; + slot++) { + dmu_object_info_t slot_doi; + + err = dmu_object_info(rwa->os, slot, &slot_doi); + if (err == ENOENT || err == EEXIST) + continue; + else if (err != 0) + return (err); + + err = dmu_free_long_object(rwa->os, slot); + + if (err != 0) + return (err); + + need_sync = B_TRUE; + } + + if (need_sync) + txg_wait_synced(dmu_objset_pool(rwa->os), 0); } tx = dmu_tx_create(rwa->os); @@ -2125,9 +2196,10 @@ receive_object(struct receive_writer_arg *rwa, struct drr_object *drro, if (object == DMU_NEW_OBJECT) { /* currently free, want to be allocated */ - err = dmu_object_claim(rwa->os, drro->drr_object, + err = dmu_object_claim_dnsize(rwa->os, drro->drr_object, drro->drr_type, drro->drr_blksz, - drro->drr_bonustype, drro->drr_bonuslen, tx); + drro->drr_bonustype, drro->drr_bonuslen, + drro->drr_dn_slots << DNODE_SHIFT, tx); } else if (drro->drr_type != doi.doi_type || drro->drr_blksz != doi.doi_data_block_size || drro->drr_bonustype != doi.doi_bonus_type || @@ -2179,13 +2251,18 @@ receive_freeobjects(struct receive_writer_arg *rwa, if (drrfo->drr_firstobj + drrfo->drr_numobjs < drrfo->drr_firstobj) return (SET_ERROR(EINVAL)); - for (obj = drrfo->drr_firstobj; + for (obj = drrfo->drr_firstobj == 0 ? 1 : drrfo->drr_firstobj; obj < drrfo->drr_firstobj + drrfo->drr_numobjs && next_err == 0; next_err = dmu_object_next(rwa->os, &obj, FALSE, 0)) { int err; - if (dmu_object_info(rwa->os, obj, NULL) != 0) + err = dmu_object_info(rwa->os, obj, NULL); + if (err == ENOENT) { + obj++; continue; + } else if (err != 0) { + return (err); + } err = dmu_free_long_object(rwa->os, obj); if (err != 0) diff --git a/usr/src/uts/common/fs/zfs/dmu_traverse.c b/usr/src/uts/common/fs/zfs/dmu_traverse.c index 050cd69811..d54042b041 100644 --- a/usr/src/uts/common/fs/zfs/dmu_traverse.c +++ b/usr/src/uts/common/fs/zfs/dmu_traverse.c @@ -327,13 +327,13 @@ traverse_visitbp(traverse_data_t *td, const dnode_phys_t *dnp, goto post; dnode_phys_t *child_dnp = buf->b_data; - for (i = 0; i < epb; i++) { + for (i = 0; i < epb; i += child_dnp[i].dn_extra_slots + 1) { prefetch_dnode_metadata(td, &child_dnp[i], zb->zb_objset, zb->zb_blkid * epb + i); } /* recursively visitbp() blocks below this */ - for (i = 0; i < epb; i++) { + for (i = 0; i < epb; i += child_dnp[i].dn_extra_slots + 1) { err = traverse_dnode(td, &child_dnp[i], zb->zb_objset, zb->zb_blkid * epb + i); if (err != 0) @@ -435,7 +435,7 @@ prefetch_dnode_metadata(traverse_data_t *td, const dnode_phys_t *dnp, if (dnp->dn_flags & DNODE_FLAG_SPILL_BLKPTR) { SET_BOOKMARK(&czb, objset, object, 0, DMU_SPILL_BLKID); - traverse_prefetch_metadata(td, &dnp->dn_spill, &czb); + traverse_prefetch_metadata(td, DN_SPILL_BLKPTR(dnp), &czb); } } @@ -470,7 +470,7 @@ traverse_dnode(traverse_data_t *td, const dnode_phys_t *dnp, if (err == 0 && (dnp->dn_flags & DNODE_FLAG_SPILL_BLKPTR)) { SET_BOOKMARK(&czb, objset, object, 0, DMU_SPILL_BLKID); - err = traverse_visitbp(td, dnp, &dnp->dn_spill, &czb); + err = traverse_visitbp(td, dnp, DN_SPILL_BLKPTR(dnp), &czb); } if (err == 0 && (td->td_flags & TRAVERSE_POST)) { diff --git a/usr/src/uts/common/fs/zfs/dmu_tx.c b/usr/src/uts/common/fs/zfs/dmu_tx.c index 549c3ca1b0..7cf7c7e4fd 100644 --- a/usr/src/uts/common/fs/zfs/dmu_tx.c +++ b/usr/src/uts/common/fs/zfs/dmu_tx.c @@ -282,7 +282,7 @@ dmu_tx_count_write(dmu_tx_hold_t *txh, uint64_t off, uint64_t len) static void dmu_tx_count_dnode(dmu_tx_hold_t *txh) { - (void) refcount_add_many(&txh->txh_space_towrite, DNODE_SIZE, FTAG); + (void) refcount_add_many(&txh->txh_space_towrite, DNODE_MIN_SIZE, FTAG); } void @@ -1248,11 +1248,13 @@ dmu_tx_sa_registration_hold(sa_os_t *sa, dmu_tx_t *tx) void dmu_tx_hold_spill(dmu_tx_t *tx, uint64_t object) { - dmu_tx_hold_t *txh = dmu_tx_hold_object_impl(tx, - tx->tx_objset, object, THT_SPILL, 0, 0); + dmu_tx_hold_t *txh; - (void) refcount_add_many(&txh->txh_space_towrite, - SPA_OLD_MAXBLOCKSIZE, FTAG); + txh = dmu_tx_hold_object_impl(tx, tx->tx_objset, object, + THT_SPILL, 0, 0); + if (txh != NULL) + (void) refcount_add_many(&txh->txh_space_towrite, + SPA_OLD_MAXBLOCKSIZE, FTAG); } void @@ -1276,7 +1278,7 @@ dmu_tx_hold_sa_create(dmu_tx_t *tx, int attrsize) dmu_tx_sa_registration_hold(sa, tx); - if (attrsize <= DN_MAX_BONUSLEN && !sa->sa_force_spill) + if (attrsize <= DN_OLD_MAX_BONUSLEN && !sa->sa_force_spill) return; (void) dmu_tx_hold_object_impl(tx, tx->tx_objset, DMU_NEW_OBJECT, diff --git a/usr/src/uts/common/fs/zfs/dnode.c b/usr/src/uts/common/fs/zfs/dnode.c index 2720cdbce4..1305a4f64a 100644 --- a/usr/src/uts/common/fs/zfs/dnode.c +++ b/usr/src/uts/common/fs/zfs/dnode.c @@ -40,20 +40,40 @@ #include <sys/dmu_zfetch.h> #include <sys/range_tree.h> +dnode_stats_t dnode_stats = { + { "dnode_hold_dbuf_hold", KSTAT_DATA_UINT64 }, + { "dnode_hold_dbuf_read", KSTAT_DATA_UINT64 }, + { "dnode_hold_alloc_hits", KSTAT_DATA_UINT64 }, + { "dnode_hold_alloc_misses", KSTAT_DATA_UINT64 }, + { "dnode_hold_alloc_interior", KSTAT_DATA_UINT64 }, + { "dnode_hold_alloc_lock_retry", KSTAT_DATA_UINT64 }, + { "dnode_hold_alloc_lock_misses", KSTAT_DATA_UINT64 }, + { "dnode_hold_alloc_type_none", KSTAT_DATA_UINT64 }, + { "dnode_hold_free_hits", KSTAT_DATA_UINT64 }, + { "dnode_hold_free_misses", KSTAT_DATA_UINT64 }, + { "dnode_hold_free_lock_misses", KSTAT_DATA_UINT64 }, + { "dnode_hold_free_lock_retry", KSTAT_DATA_UINT64 }, + { "dnode_hold_free_overflow", KSTAT_DATA_UINT64 }, + { "dnode_hold_free_refcount", KSTAT_DATA_UINT64 }, + { "dnode_hold_free_txg", KSTAT_DATA_UINT64 }, + { "dnode_free_interior_lock_retry", KSTAT_DATA_UINT64 }, + { "dnode_allocate", KSTAT_DATA_UINT64 }, + { "dnode_reallocate", KSTAT_DATA_UINT64 }, + { "dnode_buf_evict", KSTAT_DATA_UINT64 }, + { "dnode_alloc_next_chunk", KSTAT_DATA_UINT64 }, + { "dnode_alloc_race", KSTAT_DATA_UINT64 }, + { "dnode_alloc_next_block", KSTAT_DATA_UINT64 }, + { "dnode_move_invalid", KSTAT_DATA_UINT64 }, + { "dnode_move_recheck1", KSTAT_DATA_UINT64 }, + { "dnode_move_recheck2", KSTAT_DATA_UINT64 }, + { "dnode_move_special", KSTAT_DATA_UINT64 }, + { "dnode_move_handle", KSTAT_DATA_UINT64 }, + { "dnode_move_rwlock", KSTAT_DATA_UINT64 }, + { "dnode_move_active", KSTAT_DATA_UINT64 }, +}; + +static kstat_t *dnode_ksp; static kmem_cache_t *dnode_cache; -/* - * Define DNODE_STATS to turn on statistic gathering. By default, it is only - * turned on when DEBUG is also defined. - */ -#ifdef DEBUG -#define DNODE_STATS -#endif /* DEBUG */ - -#ifdef DNODE_STATS -#define DNODE_STAT_ADD(stat) ((stat)++) -#else -#define DNODE_STAT_ADD(stat) /* nothing */ -#endif /* DNODE_STATS */ static dnode_phys_t dnode_phys_zero; @@ -218,12 +238,25 @@ dnode_init(void) 0, dnode_cons, dnode_dest, NULL, NULL, NULL, 0); #ifdef _KERNEL kmem_cache_set_move(dnode_cache, dnode_move); + + dnode_ksp = kstat_create("zfs", 0, "dnodestats", "misc", + KSTAT_TYPE_NAMED, sizeof (dnode_stats) / sizeof (kstat_named_t), + KSTAT_FLAG_VIRTUAL); + if (dnode_ksp != NULL) { + dnode_ksp->ks_data = &dnode_stats; + kstat_install(dnode_ksp); + } #endif /* _KERNEL */ } void dnode_fini(void) { + if (dnode_ksp != NULL) { + kstat_delete(dnode_ksp); + dnode_ksp = NULL; + } + kmem_cache_destroy(dnode_cache); dnode_cache = NULL; } @@ -250,6 +283,7 @@ dnode_verify(dnode_t *dn) } if (dn->dn_phys->dn_type != DMU_OT_NONE || dn->dn_allocated_txg != 0) { int i; + int max_bonuslen = DN_SLOTS_TO_BONUSLEN(dn->dn_num_slots); ASSERT3U(dn->dn_indblkshift, >=, 0); ASSERT3U(dn->dn_indblkshift, <=, SPA_MAXBLOCKSHIFT); if (dn->dn_datablkshift) { @@ -261,12 +295,12 @@ dnode_verify(dnode_t *dn) ASSERT(DMU_OT_IS_VALID(dn->dn_type)); ASSERT3U(dn->dn_nblkptr, >=, 1); ASSERT3U(dn->dn_nblkptr, <=, DN_MAX_NBLKPTR); - ASSERT3U(dn->dn_bonuslen, <=, DN_MAX_BONUSLEN); + ASSERT3U(dn->dn_bonuslen, <=, max_bonuslen); ASSERT3U(dn->dn_datablksz, ==, dn->dn_datablkszsec << SPA_MINBLOCKSHIFT); ASSERT3U(ISP2(dn->dn_datablksz), ==, dn->dn_datablkshift != 0); ASSERT3U((dn->dn_nblkptr - 1) * sizeof (blkptr_t) + - dn->dn_bonuslen, <=, DN_MAX_BONUSLEN); + dn->dn_bonuslen, <=, max_bonuslen); for (i = 0; i < TXG_SIZE; i++) { ASSERT3U(dn->dn_next_nlevels[i], <=, dn->dn_nlevels); } @@ -297,6 +331,7 @@ dnode_byteswap(dnode_phys_t *dnp) dnp->dn_datablkszsec = BSWAP_16(dnp->dn_datablkszsec); dnp->dn_bonuslen = BSWAP_16(dnp->dn_bonuslen); + dnp->dn_extra_slots = BSWAP_8(dnp->dn_extra_slots); dnp->dn_maxblkid = BSWAP_64(dnp->dn_maxblkid); dnp->dn_used = BSWAP_64(dnp->dn_used); @@ -323,7 +358,8 @@ dnode_byteswap(dnode_phys_t *dnp) * dnode buffer). */ int off = (dnp->dn_nblkptr-1) * sizeof (blkptr_t); - size_t len = DN_MAX_BONUSLEN - off; + int slots = dnp->dn_extra_slots + 1; + size_t len = DN_SLOTS_TO_BONUSLEN(slots) - off; ASSERT(DMU_OT_IS_VALID(dnp->dn_bonustype)); dmu_object_byteswap_t byteswap = DMU_OT_BYTESWAP(dnp->dn_bonustype); @@ -332,23 +368,25 @@ dnode_byteswap(dnode_phys_t *dnp) /* Swap SPILL block if we have one */ if (dnp->dn_flags & DNODE_FLAG_SPILL_BLKPTR) - byteswap_uint64_array(&dnp->dn_spill, sizeof (blkptr_t)); + byteswap_uint64_array(DN_SPILL_BLKPTR(dnp), sizeof (blkptr_t)); } void dnode_buf_byteswap(void *vbuf, size_t size) { - dnode_phys_t *buf = vbuf; - int i; + int i = 0; ASSERT3U(sizeof (dnode_phys_t), ==, (1<<DNODE_SHIFT)); ASSERT((size & (sizeof (dnode_phys_t)-1)) == 0); - size >>= DNODE_SHIFT; - for (i = 0; i < size; i++) { - dnode_byteswap(buf); - buf++; + while (i < size) { + dnode_phys_t *dnp = (void *)(((char *)vbuf) + i); + dnode_byteswap(dnp); + + i += DNODE_MIN_SIZE; + if (dnp->dn_type != DMU_OT_NONE) + i += dnp->dn_extra_slots * DNODE_MIN_SIZE; } } @@ -359,7 +397,7 @@ dnode_setbonuslen(dnode_t *dn, int newsize, dmu_tx_t *tx) dnode_setdirty(dn, tx); rw_enter(&dn->dn_struct_rwlock, RW_WRITER); - ASSERT3U(newsize, <=, DN_MAX_BONUSLEN - + ASSERT3U(newsize, <=, DN_SLOTS_TO_BONUSLEN(dn->dn_num_slots) - (dn->dn_nblkptr-1) * sizeof (blkptr_t)); dn->dn_bonuslen = newsize; if (newsize == 0) @@ -439,6 +477,7 @@ dnode_create(objset_t *os, dnode_phys_t *dnp, dmu_buf_impl_t *db, dn->dn_compress = dnp->dn_compress; dn->dn_bonustype = dnp->dn_bonustype; dn->dn_bonuslen = dnp->dn_bonuslen; + dn->dn_num_slots = dnp->dn_extra_slots + 1; dn->dn_maxblkid = dnp->dn_maxblkid; dn->dn_have_spill = ((dnp->dn_flags & DNODE_FLAG_SPILL_BLKPTR) != 0); dn->dn_id_flags = 0; @@ -446,14 +485,10 @@ dnode_create(objset_t *os, dnode_phys_t *dnp, dmu_buf_impl_t *db, dmu_zfetch_init(&dn->dn_zfetch, dn); ASSERT(DMU_OT_IS_VALID(dn->dn_phys->dn_type)); + ASSERT(zrl_is_locked(&dnh->dnh_zrlock)); + ASSERT(!DN_SLOT_IS_PTR(dnh->dnh_dnode)); mutex_enter(&os->os_lock); - if (dnh->dnh_dnode != NULL) { - /* Lost the allocation race. */ - mutex_exit(&os->os_lock); - kmem_cache_free(dnode_cache, dn); - return (dnh->dnh_dnode); - } /* * Exclude special dnodes from os_dnodes so an empty os_dnodes @@ -476,6 +511,7 @@ dnode_create(objset_t *os, dnode_phys_t *dnp, dmu_buf_impl_t *db, mutex_exit(&os->os_lock); arc_space_consume(sizeof (dnode_t), ARC_SPACE_OTHER); + return (dn); } @@ -501,7 +537,8 @@ dnode_destroy(dnode_t *dn) mutex_exit(&os->os_lock); /* the dnode can no longer move, so we can release the handle */ - zrl_remove(&dn->dn_handle->dnh_zrlock); + if (!zrl_is_locked(&dn->dn_handle->dnh_zrlock)) + zrl_remove(&dn->dn_handle->dnh_zrlock); dn->dn_allocated_txg = 0; dn->dn_free_txg = 0; @@ -538,10 +575,13 @@ dnode_destroy(dnode_t *dn) void dnode_allocate(dnode_t *dn, dmu_object_type_t ot, int blocksize, int ibs, - dmu_object_type_t bonustype, int bonuslen, dmu_tx_t *tx) + dmu_object_type_t bonustype, int bonuslen, int dn_slots, dmu_tx_t *tx) { int i; + ASSERT3U(dn_slots, >, 0); + ASSERT3U(dn_slots << DNODE_SHIFT, <=, + spa_maxdnodesize(dmu_objset_spa(dn->dn_objset))); ASSERT3U(blocksize, <=, spa_maxblocksize(dmu_objset_spa(dn->dn_objset))); if (blocksize == 0) @@ -554,8 +594,10 @@ dnode_allocate(dnode_t *dn, dmu_object_type_t ot, int blocksize, int ibs, ibs = MIN(MAX(ibs, DN_MIN_INDBLKSHIFT), DN_MAX_INDBLKSHIFT); - dprintf("os=%p obj=%llu txg=%llu blocksize=%d ibs=%d\n", dn->dn_objset, - dn->dn_object, tx->tx_txg, blocksize, ibs); + dprintf("os=%p obj=%" PRIu64 " txg=%" PRIu64 + " blocksize=%d ibs=%d dn_slots=%d\n", + dn->dn_objset, dn->dn_object, tx->tx_txg, blocksize, ibs, dn_slots); + DNODE_STAT_BUMP(dnode_allocate); ASSERT(dn->dn_type == DMU_OT_NONE); ASSERT(bcmp(dn->dn_phys, &dnode_phys_zero, sizeof (dnode_phys_t)) == 0); @@ -566,7 +608,7 @@ dnode_allocate(dnode_t *dn, dmu_object_type_t ot, int blocksize, int ibs, (bonustype == DMU_OT_SA && bonuslen == 0) || (bonustype != DMU_OT_NONE && bonuslen != 0)); ASSERT(DMU_OT_IS_VALID(bonustype)); - ASSERT3U(bonuslen, <=, DN_MAX_BONUSLEN); + ASSERT3U(bonuslen, <=, DN_SLOTS_TO_BONUSLEN(dn_slots)); ASSERT(dn->dn_type == DMU_OT_NONE); ASSERT0(dn->dn_maxblkid); ASSERT0(dn->dn_allocated_txg); @@ -592,11 +634,15 @@ dnode_allocate(dnode_t *dn, dmu_object_type_t ot, int blocksize, int ibs, dnode_setdblksz(dn, blocksize); dn->dn_indblkshift = ibs; dn->dn_nlevels = 1; + dn->dn_num_slots = dn_slots; if (bonustype == DMU_OT_SA) /* Maximize bonus space for SA */ dn->dn_nblkptr = 1; - else - dn->dn_nblkptr = 1 + - ((DN_MAX_BONUSLEN - bonuslen) >> SPA_BLKPTRSHIFT); + else { + dn->dn_nblkptr = MIN(DN_MAX_NBLKPTR, + 1 + ((DN_SLOTS_TO_BONUSLEN(dn_slots) - bonuslen) >> + SPA_BLKPTRSHIFT)); + } + dn->dn_bonustype = bonustype; dn->dn_bonuslen = bonuslen; dn->dn_checksum = ZIO_CHECKSUM_INHERIT; @@ -621,7 +667,7 @@ dnode_allocate(dnode_t *dn, dmu_object_type_t ot, int blocksize, int ibs, void dnode_reallocate(dnode_t *dn, dmu_object_type_t ot, int blocksize, - dmu_object_type_t bonustype, int bonuslen, dmu_tx_t *tx) + dmu_object_type_t bonustype, int bonuslen, int dn_slots, dmu_tx_t *tx) { int nblkptr; @@ -635,7 +681,13 @@ dnode_reallocate(dnode_t *dn, dmu_object_type_t ot, int blocksize, (bonustype != DMU_OT_NONE && bonuslen != 0) || (bonustype == DMU_OT_SA && bonuslen == 0)); ASSERT(DMU_OT_IS_VALID(bonustype)); - ASSERT3U(bonuslen, <=, DN_MAX_BONUSLEN); + ASSERT3U(bonuslen, <=, + DN_BONUS_SIZE(spa_maxdnodesize(dmu_objset_spa(dn->dn_objset)))); + + dn_slots = dn_slots > 0 ? dn_slots : DNODE_MIN_SLOTS; + + dnode_free_interior_slots(dn); + DNODE_STAT_BUMP(dnode_reallocate); /* clean up any unreferenced dbufs */ dnode_evict_dbufs(dn); @@ -658,7 +710,9 @@ dnode_reallocate(dnode_t *dn, dmu_object_type_t ot, int blocksize, if (bonustype == DMU_OT_SA) /* Maximize bonus space for SA */ nblkptr = 1; else - nblkptr = 1 + ((DN_MAX_BONUSLEN - bonuslen) >> SPA_BLKPTRSHIFT); + nblkptr = MIN(DN_MAX_NBLKPTR, + 1 + ((DN_SLOTS_TO_BONUSLEN(dn_slots) - bonuslen) >> + SPA_BLKPTRSHIFT)); if (dn->dn_bonustype != bonustype) dn->dn_next_bonustype[tx->tx_txg&TXG_MASK] = bonustype; if (dn->dn_nblkptr != nblkptr) @@ -676,6 +730,7 @@ dnode_reallocate(dnode_t *dn, dmu_object_type_t ot, int blocksize, mutex_enter(&dn->dn_mtx); dn->dn_bonustype = bonustype; dn->dn_bonuslen = bonuslen; + dn->dn_num_slots = dn_slots; dn->dn_nblkptr = nblkptr; dn->dn_checksum = ZIO_CHECKSUM_INHERIT; dn->dn_compress = ZIO_COMPRESS_INHERIT; @@ -684,7 +739,8 @@ dnode_reallocate(dnode_t *dn, dmu_object_type_t ot, int blocksize, /* fix up the bonus db_size */ if (dn->dn_bonus) { dn->dn_bonus->db.db_size = - DN_MAX_BONUSLEN - (dn->dn_nblkptr-1) * sizeof (blkptr_t); + DN_SLOTS_TO_BONUSLEN(dn->dn_num_slots) - + (dn->dn_nblkptr - 1) * sizeof (blkptr_t); ASSERT(dn->dn_bonuslen <= dn->dn_bonus->db.db_size); } @@ -692,18 +748,6 @@ dnode_reallocate(dnode_t *dn, dmu_object_type_t ot, int blocksize, mutex_exit(&dn->dn_mtx); } -#ifdef DNODE_STATS -static struct { - uint64_t dms_dnode_invalid; - uint64_t dms_dnode_recheck1; - uint64_t dms_dnode_recheck2; - uint64_t dms_dnode_special; - uint64_t dms_dnode_handle; - uint64_t dms_dnode_rwlock; - uint64_t dms_dnode_active; -} dnode_move_stats; -#endif /* DNODE_STATS */ - #ifdef _KERNEL static void dnode_move_impl(dnode_t *odn, dnode_t *ndn) @@ -733,6 +777,7 @@ dnode_move_impl(dnode_t *odn, dnode_t *ndn) ndn->dn_datablkszsec = odn->dn_datablkszsec; ndn->dn_datablksz = odn->dn_datablksz; ndn->dn_maxblkid = odn->dn_maxblkid; + ndn->dn_num_slots = odn->dn_num_slots; bcopy(&odn->dn_next_type[0], &ndn->dn_next_type[0], sizeof (odn->dn_next_type)); bcopy(&odn->dn_next_nblkptr[0], &ndn->dn_next_nblkptr[0], @@ -863,7 +908,7 @@ dnode_move(void *buf, void *newbuf, size_t size, void *arg) */ os = odn->dn_objset; if (!POINTER_IS_VALID(os)) { - DNODE_STAT_ADD(dnode_move_stats.dms_dnode_invalid); + DNODE_STAT_BUMP(dnode_move_invalid); return (KMEM_CBRC_DONT_KNOW); } @@ -873,7 +918,7 @@ dnode_move(void *buf, void *newbuf, size_t size, void *arg) rw_enter(&os_lock, RW_WRITER); if (os != odn->dn_objset) { rw_exit(&os_lock); - DNODE_STAT_ADD(dnode_move_stats.dms_dnode_recheck1); + DNODE_STAT_BUMP(dnode_move_recheck1); return (KMEM_CBRC_DONT_KNOW); } @@ -891,7 +936,7 @@ dnode_move(void *buf, void *newbuf, size_t size, void *arg) if (os != odn->dn_objset) { mutex_exit(&os->os_lock); rw_exit(&os_lock); - DNODE_STAT_ADD(dnode_move_stats.dms_dnode_recheck2); + DNODE_STAT_BUMP(dnode_move_recheck2); return (KMEM_CBRC_DONT_KNOW); } @@ -904,7 +949,7 @@ dnode_move(void *buf, void *newbuf, size_t size, void *arg) rw_exit(&os_lock); if (DMU_OBJECT_IS_SPECIAL(odn->dn_object)) { mutex_exit(&os->os_lock); - DNODE_STAT_ADD(dnode_move_stats.dms_dnode_special); + DNODE_STAT_BUMP(dnode_move_special); return (KMEM_CBRC_NO); } ASSERT(odn->dn_dbuf != NULL); /* only "special" dnodes have no parent */ @@ -919,7 +964,7 @@ dnode_move(void *buf, void *newbuf, size_t size, void *arg) */ if (!zrl_tryenter(&odn->dn_handle->dnh_zrlock)) { mutex_exit(&os->os_lock); - DNODE_STAT_ADD(dnode_move_stats.dms_dnode_handle); + DNODE_STAT_BUMP(dnode_move_handle); return (KMEM_CBRC_LATER); } @@ -935,7 +980,7 @@ dnode_move(void *buf, void *newbuf, size_t size, void *arg) if (!rw_tryenter(&odn->dn_struct_rwlock, RW_WRITER)) { zrl_exit(&odn->dn_handle->dnh_zrlock); mutex_exit(&os->os_lock); - DNODE_STAT_ADD(dnode_move_stats.dms_dnode_rwlock); + DNODE_STAT_BUMP(dnode_move_rwlock); return (KMEM_CBRC_LATER); } @@ -961,7 +1006,7 @@ dnode_move(void *buf, void *newbuf, size_t size, void *arg) rw_exit(&odn->dn_struct_rwlock); zrl_exit(&odn->dn_handle->dnh_zrlock); mutex_exit(&os->os_lock); - DNODE_STAT_ADD(dnode_move_stats.dms_dnode_active); + DNODE_STAT_BUMP(dnode_move_active); return (KMEM_CBRC_LATER); } @@ -985,6 +1030,132 @@ dnode_move(void *buf, void *newbuf, size_t size, void *arg) } #endif /* _KERNEL */ +static void +dnode_slots_hold(dnode_children_t *children, int idx, int slots) +{ + ASSERT3S(idx + slots, <=, DNODES_PER_BLOCK); + + for (int i = idx; i < idx + slots; i++) { + dnode_handle_t *dnh = &children->dnc_children[i]; + zrl_add(&dnh->dnh_zrlock); + } +} + +static void +dnode_slots_rele(dnode_children_t *children, int idx, int slots) +{ + ASSERT3S(idx + slots, <=, DNODES_PER_BLOCK); + + for (int i = idx; i < idx + slots; i++) { + dnode_handle_t *dnh = &children->dnc_children[i]; + + if (zrl_is_locked(&dnh->dnh_zrlock)) + zrl_exit(&dnh->dnh_zrlock); + else + zrl_remove(&dnh->dnh_zrlock); + } +} + +static int +dnode_slots_tryenter(dnode_children_t *children, int idx, int slots) +{ + ASSERT3S(idx + slots, <=, DNODES_PER_BLOCK); + + for (int i = idx; i < idx + slots; i++) { + dnode_handle_t *dnh = &children->dnc_children[i]; + + if (!zrl_tryenter(&dnh->dnh_zrlock)) { + for (int j = idx; j < i; j++) { + dnh = &children->dnc_children[j]; + zrl_exit(&dnh->dnh_zrlock); + } + + return (0); + } + } + + return (1); +} + +static void +dnode_set_slots(dnode_children_t *children, int idx, int slots, void *ptr) +{ + ASSERT3S(idx + slots, <=, DNODES_PER_BLOCK); + + for (int i = idx; i < idx + slots; i++) { + dnode_handle_t *dnh = &children->dnc_children[i]; + dnh->dnh_dnode = ptr; + } +} + +static boolean_t +dnode_check_slots_free(dnode_children_t *children, int idx, int slots) +{ + ASSERT3S(idx + slots, <=, DNODES_PER_BLOCK); + + for (int i = idx; i < idx + slots; i++) { + dnode_handle_t *dnh = &children->dnc_children[i]; + dnode_t *dn = dnh->dnh_dnode; + + if (dn == DN_SLOT_FREE) { + continue; + } else if (DN_SLOT_IS_PTR(dn)) { + mutex_enter(&dn->dn_mtx); + dmu_object_type_t type = dn->dn_type; + mutex_exit(&dn->dn_mtx); + + if (type != DMU_OT_NONE) + return (B_FALSE); + + continue; + } else { + return (B_FALSE); + } + + return (B_FALSE); + } + + return (B_TRUE); +} + +static void +dnode_reclaim_slots(dnode_children_t *children, int idx, int slots) +{ + ASSERT3S(idx + slots, <=, DNODES_PER_BLOCK); + + for (int i = idx; i < idx + slots; i++) { + dnode_handle_t *dnh = &children->dnc_children[i]; + + ASSERT(zrl_is_locked(&dnh->dnh_zrlock)); + + if (DN_SLOT_IS_PTR(dnh->dnh_dnode)) { + ASSERT3S(dnh->dnh_dnode->dn_type, ==, DMU_OT_NONE); + dnode_destroy(dnh->dnh_dnode); + dnh->dnh_dnode = DN_SLOT_FREE; + } + } +} + +void +dnode_free_interior_slots(dnode_t *dn) +{ + dnode_children_t *children = dmu_buf_get_user(&dn->dn_dbuf->db); + int epb = dn->dn_dbuf->db.db_size >> DNODE_SHIFT; + int idx = (dn->dn_object & (epb - 1)) + 1; + int slots = dn->dn_num_slots - 1; + + if (slots == 0) + return; + + ASSERT3S(idx + slots, <=, DNODES_PER_BLOCK); + + while (!dnode_slots_tryenter(children, idx, slots)) + DNODE_STAT_BUMP(dnode_free_interior_lock_retry); + + dnode_set_slots(children, idx, slots, DN_SLOT_FREE); + dnode_slots_rele(children, idx, slots); +} + void dnode_special_close(dnode_handle_t *dnh) { @@ -992,7 +1163,7 @@ dnode_special_close(dnode_handle_t *dnh) /* * Wait for final references to the dnode to clear. This can - * only happen if the arc is asyncronously evicting state that + * only happen if the arc is asynchronously evicting state that * has a hold on this dnode while we are trying to evict this * dnode. */ @@ -1012,19 +1183,24 @@ dnode_special_open(objset_t *os, dnode_phys_t *dnp, uint64_t object, { dnode_t *dn; - dn = dnode_create(os, dnp, NULL, object, dnh); zrl_init(&dnh->dnh_zrlock); + zrl_tryenter(&dnh->dnh_zrlock); + + dn = dnode_create(os, dnp, NULL, object, dnh); DNODE_VERIFY(dn); + + zrl_exit(&dnh->dnh_zrlock); } static void dnode_buf_evict_async(void *dbu) { - dnode_children_t *children_dnodes = dbu; - int i; + dnode_children_t *dnc = dbu; + + DNODE_STAT_BUMP(dnode_buf_evict); - for (i = 0; i < children_dnodes->dnc_count; i++) { - dnode_handle_t *dnh = &children_dnodes->dnc_children[i]; + for (int i = 0; i < dnc->dnc_count; i++) { + dnode_handle_t *dnh = &dnc->dnc_children[i]; dnode_t *dn; /* @@ -1032,8 +1208,9 @@ dnode_buf_evict_async(void *dbu) * another valid address, so there is no need here to guard * against changes to or from NULL. */ - if (dnh->dnh_dnode == NULL) { + if (!DN_SLOT_IS_PTR(dnh->dnh_dnode)) { zrl_destroy(&dnh->dnh_zrlock); + dnh->dnh_dnode = DN_SLOT_UNINIT; continue; } @@ -1048,22 +1225,40 @@ dnode_buf_evict_async(void *dbu) ASSERT(refcount_is_zero(&dn->dn_holds)); ASSERT(refcount_is_zero(&dn->dn_tx_holds)); - dnode_destroy(dn); /* implicit zrl_remove() */ + dnode_destroy(dn); /* implicit zrl_remove() for first slot */ zrl_destroy(&dnh->dnh_zrlock); - dnh->dnh_dnode = NULL; + dnh->dnh_dnode = DN_SLOT_UNINIT; } - kmem_free(children_dnodes, sizeof (dnode_children_t) + - children_dnodes->dnc_count * sizeof (dnode_handle_t)); + kmem_free(dnc, sizeof (dnode_children_t) + + dnc->dnc_count * sizeof (dnode_handle_t)); } /* + * When the DNODE_MUST_BE_FREE flag is set, the "slots" parameter is used + * to ensure the hole at the specified object offset is large enough to + * hold the dnode being created. The slots parameter is also used to ensure + * a dnode does not span multiple dnode blocks. In both of these cases, if + * a failure occurs, ENOSPC is returned. Keep in mind, these failure cases + * are only possible when using DNODE_MUST_BE_FREE. + * + * If the DNODE_MUST_BE_ALLOCATED flag is set, "slots" must be 0. + * dnode_hold_impl() will check if the requested dnode is already consumed + * as an extra dnode slot by an large dnode, in which case it returns + * ENOENT. + * * errors: - * EINVAL - invalid object number. - * EIO - i/o error. + * EINVAL - invalid object number or flags. + * ENOSPC - hole too small to fulfill "slots" request (DNODE_MUST_BE_FREE) + * EEXIST - Refers to an allocated dnode (DNODE_MUST_BE_FREE) + * - Refers to a freeing dnode (DNODE_MUST_BE_FREE) + * - Refers to an interior dnode slot (DNODE_MUST_BE_ALLOCATED) + * ENOENT - The requested dnode is not allocated (DNODE_MUST_BE_ALLOCATED) + * - The requested dnode is being freed (DNODE_MUST_BE_ALLOCATED) + * EIO - i/o error error when reading the meta dnode dbuf. * succeeds even for free dnodes. */ int -dnode_hold_impl(objset_t *os, uint64_t object, int flag, +dnode_hold_impl(objset_t *os, uint64_t object, int flag, int slots, void *tag, dnode_t **dnp) { int epb, idx, err; @@ -1072,9 +1267,13 @@ dnode_hold_impl(objset_t *os, uint64_t object, int flag, uint64_t blk; dnode_t *mdn, *dn; dmu_buf_impl_t *db; - dnode_children_t *children_dnodes; + dnode_children_t *dnc; + dnode_phys_t *dn_block; dnode_handle_t *dnh; + ASSERT(!(flag & DNODE_MUST_BE_ALLOCATED) || (slots == 0)); + ASSERT(!(flag & DNODE_MUST_BE_FREE) || (slots > 0)); + /* * If you are holding the spa config lock as writer, you shouldn't * be asking the DMU to do *anything* unless it's the root pool @@ -1121,10 +1320,13 @@ dnode_hold_impl(objset_t *os, uint64_t object, int flag, db = dbuf_hold(mdn, blk, FTAG); if (drop_struct_lock) rw_exit(&mdn->dn_struct_rwlock); - if (db == NULL) + if (db == NULL) { + DNODE_STAT_BUMP(dnode_hold_dbuf_hold); return (SET_ERROR(EIO)); + } err = dbuf_read(db, NULL, DB_RF_CANFAIL); if (err) { + DNODE_STAT_BUMP(dnode_hold_dbuf_read); dbuf_rele(db, FTAG); return (err); } @@ -1132,62 +1334,194 @@ dnode_hold_impl(objset_t *os, uint64_t object, int flag, ASSERT3U(db->db.db_size, >=, 1<<DNODE_SHIFT); epb = db->db.db_size >> DNODE_SHIFT; - idx = object & (epb-1); + idx = object & (epb - 1); + dn_block = (dnode_phys_t *)db->db.db_data; ASSERT(DB_DNODE(db)->dn_type == DMU_OT_DNODE); - children_dnodes = dmu_buf_get_user(&db->db); - if (children_dnodes == NULL) { - int i; + dnc = dmu_buf_get_user(&db->db); + dnh = NULL; + if (dnc == NULL) { dnode_children_t *winner; - children_dnodes = kmem_zalloc(sizeof (dnode_children_t) + + int skip = 0; + + dnc = kmem_zalloc(sizeof (dnode_children_t) + epb * sizeof (dnode_handle_t), KM_SLEEP); - children_dnodes->dnc_count = epb; - dnh = &children_dnodes->dnc_children[0]; - for (i = 0; i < epb; i++) { + dnc->dnc_count = epb; + dnh = &dnc->dnc_children[0]; + + /* Initialize dnode slot status from dnode_phys_t */ + for (int i = 0; i < epb; i++) { zrl_init(&dnh[i].dnh_zrlock); + + if (skip) { + skip--; + continue; + } + + if (dn_block[i].dn_type != DMU_OT_NONE) { + int interior = dn_block[i].dn_extra_slots; + + dnode_set_slots(dnc, i, 1, DN_SLOT_ALLOCATED); + dnode_set_slots(dnc, i + 1, interior, + DN_SLOT_INTERIOR); + skip = interior; + } else { + dnh[i].dnh_dnode = DN_SLOT_FREE; + skip = 0; + } } - dmu_buf_init_user(&children_dnodes->dnc_dbu, NULL, + + dmu_buf_init_user(&dnc->dnc_dbu, NULL, dnode_buf_evict_async, NULL); - winner = dmu_buf_set_user(&db->db, &children_dnodes->dnc_dbu); + winner = dmu_buf_set_user(&db->db, &dnc->dnc_dbu); if (winner != NULL) { - for (i = 0; i < epb; i++) { + for (int i = 0; i < epb; i++) zrl_destroy(&dnh[i].dnh_zrlock); - } - kmem_free(children_dnodes, sizeof (dnode_children_t) + + kmem_free(dnc, sizeof (dnode_children_t) + epb * sizeof (dnode_handle_t)); - children_dnodes = winner; + dnc = winner; } } - ASSERT(children_dnodes->dnc_count == epb); - dnh = &children_dnodes->dnc_children[idx]; - zrl_add(&dnh->dnh_zrlock); - dn = dnh->dnh_dnode; - if (dn == NULL) { - dnode_phys_t *phys = (dnode_phys_t *)db->db.db_data+idx; + ASSERT(dnc->dnc_count == epb); + dn = DN_SLOT_UNINIT; + + if (flag & DNODE_MUST_BE_ALLOCATED) { + slots = 1; + + while (dn == DN_SLOT_UNINIT) { + dnode_slots_hold(dnc, idx, slots); + dnh = &dnc->dnc_children[idx]; + + if (DN_SLOT_IS_PTR(dnh->dnh_dnode)) { + dn = dnh->dnh_dnode; + break; + } else if (dnh->dnh_dnode == DN_SLOT_INTERIOR) { + DNODE_STAT_BUMP(dnode_hold_alloc_interior); + dnode_slots_rele(dnc, idx, slots); + dbuf_rele(db, FTAG); + return (SET_ERROR(EEXIST)); + } else if (dnh->dnh_dnode != DN_SLOT_ALLOCATED) { + DNODE_STAT_BUMP(dnode_hold_alloc_misses); + dnode_slots_rele(dnc, idx, slots); + dbuf_rele(db, FTAG); + return (SET_ERROR(ENOENT)); + } + + dnode_slots_rele(dnc, idx, slots); + if (!dnode_slots_tryenter(dnc, idx, slots)) { + DNODE_STAT_BUMP(dnode_hold_alloc_lock_retry); + continue; + } + + /* + * Someone else won the race and called dnode_create() + * after we checked DN_SLOT_IS_PTR() above but before + * we acquired the lock. + */ + if (DN_SLOT_IS_PTR(dnh->dnh_dnode)) { + DNODE_STAT_BUMP(dnode_hold_alloc_lock_misses); + dn = dnh->dnh_dnode; + } else { + dn = dnode_create(os, dn_block + idx, db, + object, dnh); + } + } + + mutex_enter(&dn->dn_mtx); + if (dn->dn_type == DMU_OT_NONE || dn->dn_free_txg != 0) { + DNODE_STAT_BUMP(dnode_hold_alloc_type_none); + mutex_exit(&dn->dn_mtx); + dnode_slots_rele(dnc, idx, slots); + dbuf_rele(db, FTAG); + return (SET_ERROR(ENOENT)); + } + + DNODE_STAT_BUMP(dnode_hold_alloc_hits); + } else if (flag & DNODE_MUST_BE_FREE) { + + if (idx + slots - 1 >= DNODES_PER_BLOCK) { + DNODE_STAT_BUMP(dnode_hold_free_overflow); + dbuf_rele(db, FTAG); + return (SET_ERROR(ENOSPC)); + } + + while (dn == DN_SLOT_UNINIT) { + dnode_slots_hold(dnc, idx, slots); + + if (!dnode_check_slots_free(dnc, idx, slots)) { + DNODE_STAT_BUMP(dnode_hold_free_misses); + dnode_slots_rele(dnc, idx, slots); + dbuf_rele(db, FTAG); + return (SET_ERROR(ENOSPC)); + } + + dnode_slots_rele(dnc, idx, slots); + if (!dnode_slots_tryenter(dnc, idx, slots)) { + DNODE_STAT_BUMP(dnode_hold_free_lock_retry); + continue; + } + + if (!dnode_check_slots_free(dnc, idx, slots)) { + DNODE_STAT_BUMP(dnode_hold_free_lock_misses); + dnode_slots_rele(dnc, idx, slots); + dbuf_rele(db, FTAG); + return (SET_ERROR(ENOSPC)); + } + + /* + * Allocated but otherwise free dnodes which would + * be in the interior of a multi-slot dnodes need + * to be freed. Single slot dnodes can be safely + * re-purposed as a performance optimization. + */ + if (slots > 1) + dnode_reclaim_slots(dnc, idx + 1, slots - 1); + + dnh = &dnc->dnc_children[idx]; + if (DN_SLOT_IS_PTR(dnh->dnh_dnode)) { + dn = dnh->dnh_dnode; + } else { + dn = dnode_create(os, dn_block + idx, db, + object, dnh); + } + } + + mutex_enter(&dn->dn_mtx); + if (!refcount_is_zero(&dn->dn_holds) || dn->dn_free_txg) { + DNODE_STAT_BUMP(dnode_hold_free_refcount); + mutex_exit(&dn->dn_mtx); + dnode_slots_rele(dnc, idx, slots); + dbuf_rele(db, FTAG); + return (SET_ERROR(EEXIST)); + } - dn = dnode_create(os, phys, db, object, dnh); + dnode_set_slots(dnc, idx + 1, slots - 1, DN_SLOT_INTERIOR); + DNODE_STAT_BUMP(dnode_hold_free_hits); + } else { + dbuf_rele(db, FTAG); + return (SET_ERROR(EINVAL)); } - mutex_enter(&dn->dn_mtx); - type = dn->dn_type; - if (dn->dn_free_txg || - ((flag & DNODE_MUST_BE_ALLOCATED) && type == DMU_OT_NONE) || - ((flag & DNODE_MUST_BE_FREE) && - (type != DMU_OT_NONE || !refcount_is_zero(&dn->dn_holds)))) { + if (dn->dn_free_txg) { + DNODE_STAT_BUMP(dnode_hold_free_txg); + type = dn->dn_type; mutex_exit(&dn->dn_mtx); - zrl_remove(&dnh->dnh_zrlock); + dnode_slots_rele(dnc, idx, slots); dbuf_rele(db, FTAG); - return ((flag & DNODE_MUST_BE_ALLOCATED) ? ENOENT : EEXIST); + return (SET_ERROR((flag & DNODE_MUST_BE_ALLOCATED) ? + ENOENT : EEXIST)); } + if (refcount_add(&dn->dn_holds, tag) == 1) dbuf_add_ref(db, dnh); + mutex_exit(&dn->dn_mtx); /* Now we can rely on the hold to prevent the dnode from moving. */ - zrl_remove(&dnh->dnh_zrlock); + dnode_slots_rele(dnc, idx, slots); DNODE_VERIFY(dn); ASSERT3P(dn->dn_dbuf, ==, db); @@ -1204,7 +1538,8 @@ dnode_hold_impl(objset_t *os, uint64_t object, int flag, int dnode_hold(objset_t *os, uint64_t object, void *tag, dnode_t **dnp) { - return (dnode_hold_impl(os, object, DNODE_MUST_BE_ALLOCATED, tag, dnp)); + return (dnode_hold_impl(os, object, DNODE_MUST_BE_ALLOCATED, 0, tag, + dnp)); } /* @@ -1936,17 +2271,21 @@ dnode_next_offset_level(dnode_t *dn, int flags, uint64_t *offset, error = SET_ERROR(ESRCH); } else if (lvl == 0) { dnode_phys_t *dnp = data; - span = DNODE_SHIFT; + ASSERT(dn->dn_type == DMU_OT_DNODE); + ASSERT(!(flags & DNODE_FIND_BACKWARDS)); - for (i = (*offset >> span) & (blkfill - 1); - i >= 0 && i < blkfill; i += inc) { + for (i = (*offset >> DNODE_SHIFT) & (blkfill - 1); + i < blkfill; i += dnp[i].dn_extra_slots + 1) { if ((dnp[i].dn_type == DMU_OT_NONE) == hole) break; - *offset += (1ULL << span) * inc; } - if (i < 0 || i == blkfill) + + if (i == blkfill) error = SET_ERROR(ESRCH); + + *offset = (*offset & ~(DNODE_BLOCK_SIZE - 1)) + + (i << DNODE_SHIFT); } else { blkptr_t *bp = data; uint64_t start = *offset; diff --git a/usr/src/uts/common/fs/zfs/dnode_sync.c b/usr/src/uts/common/fs/zfs/dnode_sync.c index 02f263c82e..a37607e0e3 100644 --- a/usr/src/uts/common/fs/zfs/dnode_sync.c +++ b/usr/src/uts/common/fs/zfs/dnode_sync.c @@ -553,7 +553,8 @@ dnode_sync_free(dnode_t *dn, dmu_tx_t *tx) ASSERT(dn->dn_free_txg > 0); if (dn->dn_allocated_txg != dn->dn_free_txg) dmu_buf_will_dirty(&dn->dn_dbuf->db, tx); - bzero(dn->dn_phys, sizeof (dnode_phys_t)); + bzero(dn->dn_phys, sizeof (dnode_phys_t) * dn->dn_num_slots); + dnode_free_interior_slots(dn); mutex_enter(&dn->dn_mtx); dn->dn_type = DMU_OT_NONE; @@ -561,6 +562,7 @@ dnode_sync_free(dnode_t *dn, dmu_tx_t *tx) dn->dn_allocated_txg = 0; dn->dn_free_txg = 0; dn->dn_have_spill = B_FALSE; + dn->dn_num_slots = 1; mutex_exit(&dn->dn_mtx); ASSERT(dn->dn_object != DMU_META_DNODE_OBJECT); @@ -587,7 +589,7 @@ dnode_sync(dnode_t *dn, dmu_tx_t *tx) ASSERT(dmu_tx_is_syncing(tx)); ASSERT(dnp->dn_type != DMU_OT_NONE || dn->dn_allocated_txg); ASSERT(dnp->dn_type != DMU_OT_NONE || - bcmp(dnp, &zerodn, DNODE_SIZE) == 0); + bcmp(dnp, &zerodn, DNODE_MIN_SIZE) == 0); DNODE_VERIFY(dn); ASSERT(dn->dn_dbuf == NULL || arc_released(dn->dn_dbuf->db_buf)); @@ -619,6 +621,9 @@ dnode_sync(dnode_t *dn, dmu_tx_t *tx) dnp->dn_bonustype = dn->dn_bonustype; dnp->dn_bonuslen = dn->dn_bonuslen; } + + dnp->dn_extra_slots = dn->dn_num_slots - 1; + ASSERT(dnp->dn_nlevels > 1 || BP_IS_HOLE(&dnp->dn_blkptr[0]) || BP_IS_EMBEDDED(&dnp->dn_blkptr[0]) || @@ -651,7 +656,8 @@ dnode_sync(dnode_t *dn, dmu_tx_t *tx) dnp->dn_bonuslen = 0; else dnp->dn_bonuslen = dn->dn_next_bonuslen[txgoff]; - ASSERT(dnp->dn_bonuslen <= DN_MAX_BONUSLEN); + ASSERT(dnp->dn_bonuslen <= + DN_SLOTS_TO_BONUSLEN(dnp->dn_extra_slots + 1)); dn->dn_next_bonuslen[txgoff] = 0; } @@ -691,7 +697,7 @@ dnode_sync(dnode_t *dn, dmu_tx_t *tx) mutex_exit(&dn->dn_mtx); if (kill_spill) { - free_blocks(dn, &dn->dn_phys->dn_spill, 1, tx); + free_blocks(dn, DN_SPILL_BLKPTR(dn->dn_phys), 1, tx); mutex_enter(&dn->dn_mtx); dnp->dn_flags &= ~DNODE_FLAG_SPILL_BLKPTR; mutex_exit(&dn->dn_mtx); @@ -721,6 +727,14 @@ dnode_sync(dnode_t *dn, dmu_tx_t *tx) return; } + if (dn->dn_num_slots > DNODE_MIN_SLOTS) { + dsl_dataset_t *ds = dn->dn_objset->os_dsl_dataset; + mutex_enter(&ds->ds_lock); + ds->ds_feature_activation_needed[SPA_FEATURE_LARGE_DNODE] = + B_TRUE; + mutex_exit(&ds->ds_lock); + } + if (dn->dn_next_nlevels[txgoff]) { dnode_increase_indirection(dn, tx); dn->dn_next_nlevels[txgoff] = 0; diff --git a/usr/src/uts/common/fs/zfs/dsl_scan.c b/usr/src/uts/common/fs/zfs/dsl_scan.c index 6fd97d9bfc..c19e43bd9f 100644 --- a/usr/src/uts/common/fs/zfs/dsl_scan.c +++ b/usr/src/uts/common/fs/zfs/dsl_scan.c @@ -773,14 +773,18 @@ dsl_scan_recurse(dsl_scan_t *scn, dsl_dataset_t *ds, dmu_objset_type_t ostype, scn->scn_phys.scn_errors++; return (err); } - for (i = 0, cdnp = buf->b_data; i < epb; i++, cdnp++) { + for (i = 0, cdnp = buf->b_data; i < epb; + i += cdnp->dn_extra_slots + 1, + cdnp += cdnp->dn_extra_slots + 1) { for (j = 0; j < cdnp->dn_nblkptr; j++) { blkptr_t *cbp = &cdnp->dn_blkptr[j]; dsl_scan_prefetch(scn, buf, cbp, zb->zb_objset, zb->zb_blkid * epb + i, j); } } - for (i = 0, cdnp = buf->b_data; i < epb; i++, cdnp++) { + for (i = 0, cdnp = buf->b_data; i < epb; + i += cdnp->dn_extra_slots + 1, + cdnp += cdnp->dn_extra_slots + 1) { dsl_scan_visitdnode(scn, ds, ostype, cdnp, zb->zb_blkid * epb + i, tx); } @@ -843,7 +847,7 @@ dsl_scan_visitdnode(dsl_scan_t *scn, dsl_dataset_t *ds, zbookmark_phys_t czb; SET_BOOKMARK(&czb, ds ? ds->ds_object : 0, object, 0, DMU_SPILL_BLKID); - dsl_scan_visitbp(&dnp->dn_spill, + dsl_scan_visitbp(DN_SPILL_BLKPTR(dnp), &czb, dnp, ds, scn, ostype, tx); } } diff --git a/usr/src/uts/common/fs/zfs/sa.c b/usr/src/uts/common/fs/zfs/sa.c index 1b8ee58880..3141e44c94 100644 --- a/usr/src/uts/common/fs/zfs/sa.c +++ b/usr/src/uts/common/fs/zfs/sa.c @@ -36,6 +36,7 @@ #include <sys/dmu.h> #include <sys/dmu_impl.h> #include <sys/dmu_objset.h> +#include <sys/dmu_tx.h> #include <sys/dbuf.h> #include <sys/dnode.h> #include <sys/zap.h> @@ -547,12 +548,11 @@ sa_copy_data(sa_data_locator_t *func, void *datastart, void *target, int buflen) */ static int sa_find_sizes(sa_os_t *sa, sa_bulk_attr_t *attr_desc, int attr_count, - dmu_buf_t *db, sa_buf_type_t buftype, int *index, int *total, - boolean_t *will_spill) + dmu_buf_t *db, sa_buf_type_t buftype, int full_space, int *index, + int *total, boolean_t *will_spill) { int var_size = 0; int i; - int full_space; int hdrsize; int extra_hdrsize; @@ -571,7 +571,6 @@ sa_find_sizes(sa_os_t *sa, sa_bulk_attr_t *attr_desc, int attr_count, hdrsize = (SA_BONUSTYPE_FROM_DB(db) == DMU_OT_ZNODE) ? 0 : sizeof (sa_hdr_phys_t); - full_space = (buftype == SA_BONUS) ? DN_MAX_BONUSLEN : db->db_size; ASSERT(IS_P2ALIGNED(full_space, 8)); for (i = 0; i != attr_count; i++) { @@ -657,6 +656,7 @@ sa_build_layouts(sa_handle_t *hdl, sa_bulk_attr_t *attr_desc, int attr_count, int buf_space; sa_attr_type_t *attrs, *attrs_start; int i, lot_count; + int dnodesize; int hdrsize; int spillhdrsize = 0; int used; @@ -664,20 +664,24 @@ sa_build_layouts(sa_handle_t *hdl, sa_bulk_attr_t *attr_desc, int attr_count, sa_lot_t *lot; int len_idx; int spill_used; + int bonuslen; boolean_t spilling; dmu_buf_will_dirty(hdl->sa_bonus, tx); bonustype = SA_BONUSTYPE_FROM_DB(hdl->sa_bonus); + dmu_object_dnsize_from_db(hdl->sa_bonus, &dnodesize); + bonuslen = DN_BONUS_SIZE(dnodesize); + /* first determine bonus header size and sum of all attributes */ hdrsize = sa_find_sizes(sa, attr_desc, attr_count, hdl->sa_bonus, - SA_BONUS, &i, &used, &spilling); + SA_BONUS, bonuslen, &i, &used, &spilling); if (used > SPA_OLD_MAXBLOCKSIZE) return (SET_ERROR(EFBIG)); VERIFY(0 == dmu_set_bonus(hdl->sa_bonus, spilling ? - MIN(DN_MAX_BONUSLEN - sizeof (blkptr_t), used + hdrsize) : + MIN(bonuslen - sizeof (blkptr_t), used + hdrsize) : used + hdrsize, tx)); ASSERT((bonustype == DMU_OT_ZNODE && spilling == 0) || @@ -694,8 +698,8 @@ sa_build_layouts(sa_handle_t *hdl, sa_bulk_attr_t *attr_desc, int attr_count, dmu_buf_will_dirty(hdl->sa_spill, tx); spillhdrsize = sa_find_sizes(sa, &attr_desc[i], - attr_count - i, hdl->sa_spill, SA_SPILL, &i, - &spill_used, &dummy); + attr_count - i, hdl->sa_spill, SA_SPILL, + hdl->sa_spill->db_size, &i, &spill_used, &dummy); if (spill_used > SPA_OLD_MAXBLOCKSIZE) return (SET_ERROR(EFBIG)); diff --git a/usr/src/uts/common/fs/zfs/spa.c b/usr/src/uts/common/fs/zfs/spa.c index b93973f9c5..0a7f9c1ade 100644 --- a/usr/src/uts/common/fs/zfs/spa.c +++ b/usr/src/uts/common/fs/zfs/spa.c @@ -357,6 +357,14 @@ spa_prop_get_config(spa_t *spa, nvlist_t **nvp) SPA_OLD_MAXBLOCKSIZE, ZPROP_SRC_NONE); } + if (spa_feature_is_enabled(spa, SPA_FEATURE_LARGE_DNODE)) { + spa_prop_add_list(*nvp, ZPOOL_PROP_MAXDNODESIZE, NULL, + DNODE_MAX_SIZE, ZPROP_SRC_NONE); + } else { + spa_prop_add_list(*nvp, ZPOOL_PROP_MAXDNODESIZE, NULL, + DNODE_MIN_SIZE, ZPROP_SRC_NONE); + } + if ((dp = list_head(&spa->spa_config_list)) != NULL) { if (dp->scd_path == NULL) { spa_prop_add_list(*nvp, ZPOOL_PROP_CACHEFILE, @@ -584,8 +592,7 @@ spa_prop_validate(spa_t *spa, nvlist_t *props) /* * Must be ZPL, and its property settings - * must be supported by GRUB (compression - * is not gzip, and large blocks are not used). + * must be supported. */ if (dmu_objset_type(os) != DMU_OST_ZFS) { diff --git a/usr/src/uts/common/fs/zfs/spa_misc.c b/usr/src/uts/common/fs/zfs/spa_misc.c index bb637eb92e..43965572bc 100644 --- a/usr/src/uts/common/fs/zfs/spa_misc.c +++ b/usr/src/uts/common/fs/zfs/spa_misc.c @@ -991,10 +991,10 @@ spa_aux_activate(vdev_t *vd, avl_tree_t *avl) /* * Spares are tracked globally due to the following constraints: * - * - A spare may be part of multiple pools. - * - A spare may be added to a pool even if it's actively in use within + * - A spare may be part of multiple pools. + * - A spare may be added to a pool even if it's actively in use within * another pool. - * - A spare in use in any pool can only be the source of a replacement if + * - A spare in use in any pool can only be the source of a replacement if * the target is a spare in the same pool. * * We keep track of all spares on the system through the use of a reference @@ -2140,6 +2140,15 @@ spa_maxblocksize(spa_t *spa) return (SPA_OLD_MAXBLOCKSIZE); } +int +spa_maxdnodesize(spa_t *spa) +{ + if (spa_feature_is_enabled(spa, SPA_FEATURE_LARGE_DNODE)) + return (DNODE_MAX_SIZE); + else + return (DNODE_MIN_SIZE); +} + /* * Returns the txg that the last device removal completed. No indirect mappings * have been added since this txg. diff --git a/usr/src/uts/common/fs/zfs/sys/arc.h b/usr/src/uts/common/fs/zfs/sys/arc.h index 45db7701e1..641ae93e9c 100644 --- a/usr/src/uts/common/fs/zfs/sys/arc.h +++ b/usr/src/uts/common/fs/zfs/sys/arc.h @@ -149,6 +149,7 @@ typedef enum arc_space_type { ARC_SPACE_HDRS, ARC_SPACE_L2HDRS, ARC_SPACE_OTHER, + ARC_SPACE_BONUS, ARC_SPACE_NUMTYPES } arc_space_type_t; diff --git a/usr/src/uts/common/fs/zfs/sys/dmu.h b/usr/src/uts/common/fs/zfs/sys/dmu.h index cf24fd5c5e..2615bdd0ea 100644 --- a/usr/src/uts/common/fs/zfs/sys/dmu.h +++ b/usr/src/uts/common/fs/zfs/sys/dmu.h @@ -358,6 +358,15 @@ uint64_t dmu_object_alloc(objset_t *os, dmu_object_type_t ot, uint64_t dmu_object_alloc_ibs(objset_t *os, dmu_object_type_t ot, int blocksize, int indirect_blockshift, dmu_object_type_t bonustype, int bonuslen, dmu_tx_t *tx); +uint64_t dmu_object_alloc_dnsize(objset_t *os, dmu_object_type_t ot, + int blocksize, dmu_object_type_t bonus_type, int bonus_len, + int dnodesize, dmu_tx_t *tx); +int dmu_object_claim_dnsize(objset_t *os, uint64_t object, dmu_object_type_t ot, + int blocksize, dmu_object_type_t bonus_type, int bonus_len, + int dnodesize, dmu_tx_t *tx); +int dmu_object_reclaim_dnsize(objset_t *os, uint64_t object, + dmu_object_type_t ot, int blocksize, dmu_object_type_t bonustype, + int bonuslen, int dnodesize, dmu_tx_t *txp); int dmu_object_claim(objset_t *os, uint64_t object, dmu_object_type_t ot, int blocksize, dmu_object_type_t bonus_type, int bonus_len, dmu_tx_t *tx); int dmu_object_reclaim(objset_t *os, uint64_t object, dmu_object_type_t ot, @@ -804,7 +813,8 @@ typedef struct dmu_object_info { uint8_t doi_checksum; uint8_t doi_compress; uint8_t doi_nblkptr; - uint8_t doi_pad[4]; + int8_t doi_pad[4]; + uint64_t doi_dnodesize; uint64_t doi_physical_blocks_512; /* data + metadata, 512b blks */ uint64_t doi_max_offset; uint64_t doi_fill_count; /* number of non-empty blocks */ @@ -846,6 +856,8 @@ void dmu_object_info_from_db(dmu_buf_t *db, dmu_object_info_t *doi); void dmu_object_size_from_db(dmu_buf_t *db, uint32_t *blksize, u_longlong_t *nblk512); +void dmu_object_dnsize_from_db(dmu_buf_t *db, int *dnsize); + typedef struct dmu_objset_stats { uint64_t dds_num_clones; /* number of clones of this */ uint64_t dds_creation_txg; @@ -903,6 +915,7 @@ extern struct dsl_dataset *dmu_objset_ds(objset_t *os); extern void dmu_objset_name(objset_t *os, char *buf); extern dmu_objset_type_t dmu_objset_type(objset_t *os); extern uint64_t dmu_objset_id(objset_t *os); +extern uint64_t dmu_objset_dnodesize(objset_t *os); extern zfs_sync_type_t dmu_objset_syncprop(objset_t *os); extern zfs_logbias_op_t dmu_objset_logbias(objset_t *os); extern int dmu_snapshot_list_next(objset_t *os, int namelen, char *name, diff --git a/usr/src/uts/common/fs/zfs/sys/dmu_objset.h b/usr/src/uts/common/fs/zfs/sys/dmu_objset.h index 25ff864217..3028f04365 100644 --- a/usr/src/uts/common/fs/zfs/sys/dmu_objset.h +++ b/usr/src/uts/common/fs/zfs/sys/dmu_objset.h @@ -91,6 +91,7 @@ struct objset { list_node_t os_evicting_node; /* can change, under dsl_dir's locks: */ + uint64_t os_dnodesize; /* default dnode size for new objects */ enum zio_checksum os_checksum; enum zio_compress os_compress; uint8_t os_copies; @@ -129,7 +130,11 @@ struct objset { /* Protected by os_obj_lock */ kmutex_t os_obj_lock; - uint64_t os_obj_next; + uint64_t os_obj_next_chunk; + + /* Per-CPU next object to allocate, protected by atomic ops. */ + uint64_t *os_obj_next_percpu; + int os_obj_next_percpu_len; /* Protected by os_lock */ kmutex_t os_lock; diff --git a/usr/src/uts/common/fs/zfs/sys/dnode.h b/usr/src/uts/common/fs/zfs/sys/dnode.h index 89a7b2ef60..68872a8e9e 100644 --- a/usr/src/uts/common/fs/zfs/sys/dnode.h +++ b/usr/src/uts/common/fs/zfs/sys/dnode.h @@ -86,12 +86,26 @@ extern "C" { /* * Derived constants. */ -#define DNODE_SIZE (1 << DNODE_SHIFT) -#define DN_MAX_NBLKPTR ((DNODE_SIZE - DNODE_CORE_SIZE) >> SPA_BLKPTRSHIFT) -#define DN_MAX_BONUSLEN (DNODE_SIZE - DNODE_CORE_SIZE - (1 << SPA_BLKPTRSHIFT)) -#define DN_MAX_OBJECT (1ULL << DN_MAX_OBJECT_SHIFT) -#define DN_ZERO_BONUSLEN (DN_MAX_BONUSLEN + 1) -#define DN_KILL_SPILLBLK (1) +#define DNODE_MIN_SIZE (1 << DNODE_SHIFT) +#define DNODE_MAX_SIZE (1 << DNODE_BLOCK_SHIFT) +#define DNODE_BLOCK_SIZE (1 << DNODE_BLOCK_SHIFT) +#define DNODE_MIN_SLOTS (DNODE_MIN_SIZE >> DNODE_SHIFT) +#define DNODE_MAX_SLOTS (DNODE_MAX_SIZE >> DNODE_SHIFT) +#define DN_BONUS_SIZE(dnsize) ((dnsize) - DNODE_CORE_SIZE - \ + (1 << SPA_BLKPTRSHIFT)) +#define DN_SLOTS_TO_BONUSLEN(slots) DN_BONUS_SIZE((slots) << DNODE_SHIFT) +#define DN_OLD_MAX_BONUSLEN (DN_BONUS_SIZE(DNODE_MIN_SIZE)) +#define DN_MAX_NBLKPTR ((DNODE_MIN_SIZE - DNODE_CORE_SIZE) >> SPA_BLKPTRSHIFT) +#define DN_MAX_OBJECT (1ULL << DN_MAX_OBJECT_SHIFT) +#define DN_ZERO_BONUSLEN (DN_BONUS_SIZE(DNODE_MAX_SIZE) + 1) +#define DN_KILL_SPILLBLK (1) + +#define DN_SLOT_UNINIT ((void *)NULL) /* Uninitialized */ +#define DN_SLOT_FREE ((void *)1UL) /* Free slot */ +#define DN_SLOT_ALLOCATED ((void *)2UL) /* Allocated slot */ +#define DN_SLOT_INTERIOR ((void *)3UL) /* Interior allocated slot */ +#define DN_SLOT_IS_PTR(dn) ((void *)dn > DN_SLOT_INTERIOR) +#define DN_SLOT_IS_VALID(dn) ((void *)dn != NULL) #define DNODES_PER_BLOCK_SHIFT (DNODE_BLOCK_SHIFT - DNODE_SHIFT) #define DNODES_PER_BLOCK (1ULL << DNODES_PER_BLOCK_SHIFT) @@ -109,6 +123,10 @@ extern "C" { #define DN_BONUS(dnp) ((void*)((dnp)->dn_bonus + \ (((dnp)->dn_nblkptr - 1) * sizeof (blkptr_t)))) +#define DN_MAX_BONUS_LEN(dnp) \ + ((dnp->dn_flags & DNODE_FLAG_SPILL_BLKPTR) ? \ + (uint8_t *)DN_SPILL_BLKPTR(dnp) - (uint8_t *)DN_BONUS(dnp) : \ + (uint8_t *)(dnp + (dnp->dn_extra_slots + 1)) - (uint8_t *)DN_BONUS(dnp)) #define DN_USED_BYTES(dnp) (((dnp)->dn_flags & DNODE_FLAG_USED_BYTES) ? \ (dnp)->dn_used : (dnp)->dn_used << SPA_MINBLOCKSHIFT) @@ -132,6 +150,57 @@ enum dnode_dirtycontext { /* Does dnode have a SA spill blkptr in bonus? */ #define DNODE_FLAG_SPILL_BLKPTR (1<<2) +/* + * VARIABLE-LENGTH (LARGE) DNODES + * + * The motivation for variable-length dnodes is to eliminate the overhead + * associated with using spill blocks. Spill blocks are used to store + * system attribute data (i.e. file metadata) that does not fit in the + * dnode's bonus buffer. By allowing a larger bonus buffer area the use of + * a spill block can be avoided. Spill blocks potentially incur an + * additional read I/O for every dnode in a dnode block. As a worst case + * example, reading 32 dnodes from a 16k dnode block and all of the spill + * blocks could issue 33 separate reads. Now suppose those dnodes have size + * 1024 and therefore don't need spill blocks. Then the worst case number + * of blocks read is reduced to from 33 to two--one per dnode block. + * + * ZFS-on-Linux systems that make heavy use of extended attributes benefit + * from this feature. In particular, ZFS-on-Linux supports the xattr=sa + * dataset property which allows file extended attribute data to be stored + * in the dnode bonus buffer as an alternative to the traditional + * directory-based format. Workloads such as SELinux and the Lustre + * distributed filesystem often store enough xattr data to force spill + * blocks when xattr=sa is in effect. Large dnodes may therefore provide a + * performance benefit to such systems. Other use cases that benefit from + * this feature include files with large ACLs and symbolic links with long + * target names. + * + * The size of a dnode may be a multiple of 512 bytes up to the size of a + * dnode block (currently 16384 bytes). The dn_extra_slots field of the + * on-disk dnode_phys_t structure describes the size of the physical dnode + * on disk. The field represents how many "extra" dnode_phys_t slots a + * dnode consumes in its dnode block. This convention results in a value of + * 0 for 512 byte dnodes which preserves on-disk format compatibility with + * older software which doesn't support large dnodes. + * + * Similarly, the in-memory dnode_t structure has a dn_num_slots field + * to represent the total number of dnode_phys_t slots consumed on disk. + * Thus dn->dn_num_slots is 1 greater than the corresponding + * dnp->dn_extra_slots. This difference in convention was adopted + * because, unlike on-disk structures, backward compatibility is not a + * concern for in-memory objects, so we used a more natural way to + * represent size for a dnode_t. + * + * The default size for newly created dnodes is determined by the value of + * the "dnodesize" dataset property. By default the property is set to + * "legacy" which is compatible with older software. Setting the property + * to "auto" will allow the filesystem to choose the most suitable dnode + * size. Currently this just sets the default dnode size to 1k, but future + * code improvements could dynamically choose a size based on observed + * workload patterns. Dnodes of varying sizes can coexist within the same + * dataset and even within the same dnode block. + */ + typedef struct dnode_phys { uint8_t dn_type; /* dmu_object_type_t */ uint8_t dn_indblkshift; /* ln2(indirect block size) */ @@ -143,19 +212,32 @@ typedef struct dnode_phys { uint8_t dn_flags; /* DNODE_FLAG_* */ uint16_t dn_datablkszsec; /* data block size in 512b sectors */ uint16_t dn_bonuslen; /* length of dn_bonus */ - uint8_t dn_pad2[4]; + uint8_t dn_extra_slots; /* # of subsequent slots consumed */ + uint8_t dn_pad2[3]; /* accounting is protected by dn_dirty_mtx */ uint64_t dn_maxblkid; /* largest allocated block ID */ uint64_t dn_used; /* bytes (or sectors) of disk space */ uint64_t dn_pad3[4]; - - blkptr_t dn_blkptr[1]; - uint8_t dn_bonus[DN_MAX_BONUSLEN - sizeof (blkptr_t)]; - blkptr_t dn_spill; + union { + blkptr_t dn_blkptr[1+DN_OLD_MAX_BONUSLEN/sizeof (blkptr_t)]; + struct { + blkptr_t __dn_ignore1; + uint8_t dn_bonus[DN_OLD_MAX_BONUSLEN]; + }; + struct { + blkptr_t __dn_ignore2; + uint8_t __dn_ignore3[DN_OLD_MAX_BONUSLEN - + sizeof (blkptr_t)]; + blkptr_t dn_spill; + }; + }; } dnode_phys_t; +#define DN_SPILL_BLKPTR(dnp) (blkptr_t *)((char *)(dnp) + \ + (((dnp)->dn_extra_slots + 1) << DNODE_SHIFT) - (1 << SPA_BLKPTRSHIFT)) + struct dnode { /* * Protects the structure of the dnode, including the number of levels @@ -192,6 +274,7 @@ struct dnode { uint32_t dn_datablksz; /* in bytes */ uint64_t dn_maxblkid; uint8_t dn_next_type[TXG_SIZE]; + uint8_t dn_num_slots; /* metadnode slots consumed on disk */ uint8_t dn_next_nblkptr[TXG_SIZE]; uint8_t dn_next_nlevels[TXG_SIZE]; uint8_t dn_next_indblkshift[TXG_SIZE]; @@ -287,7 +370,7 @@ void dnode_rm_spill(dnode_t *dn, dmu_tx_t *tx); int dnode_hold(struct objset *dd, uint64_t object, void *ref, dnode_t **dnp); -int dnode_hold_impl(struct objset *dd, uint64_t object, int flag, +int dnode_hold_impl(struct objset *dd, uint64_t object, int flag, int dn_slots, void *ref, dnode_t **dnp); boolean_t dnode_add_ref(dnode_t *dn, void *ref); void dnode_rele(dnode_t *dn, void *ref); @@ -295,9 +378,9 @@ void dnode_rele_and_unlock(dnode_t *dn, void *tag, boolean_t evicting); void dnode_setdirty(dnode_t *dn, dmu_tx_t *tx); void dnode_sync(dnode_t *dn, dmu_tx_t *tx); void dnode_allocate(dnode_t *dn, dmu_object_type_t ot, int blocksize, int ibs, - dmu_object_type_t bonustype, int bonuslen, dmu_tx_t *tx); + dmu_object_type_t bonustype, int bonuslen, int dn_slots, dmu_tx_t *tx); void dnode_reallocate(dnode_t *dn, dmu_object_type_t ot, int blocksize, - dmu_object_type_t bonustype, int bonuslen, dmu_tx_t *tx); + dmu_object_type_t bonustype, int bonuslen, int dn_slots, dmu_tx_t *tx); void dnode_free(dnode_t *dn, dmu_tx_t *tx); void dnode_byteswap(dnode_phys_t *dnp); void dnode_buf_byteswap(void *buf, size_t size); @@ -313,6 +396,7 @@ int dnode_next_offset(dnode_t *dn, int flags, uint64_t *off, int minlvl, uint64_t blkfill, uint64_t txg); void dnode_evict_dbufs(dnode_t *dn); void dnode_evict_bonus(dnode_t *dn); +void dnode_free_interior_slots(dnode_t *dn); boolean_t dnode_needs_remap(const dnode_t *dn); #define DNODE_IS_CACHEABLE(_dn) \ @@ -324,6 +408,140 @@ boolean_t dnode_needs_remap(const dnode_t *dn); ((_dn)->dn_objset->os_primary_cache == ZFS_CACHE_ALL || \ (_dn)->dn_objset->os_primary_cache == ZFS_CACHE_METADATA) +/* + * Used for dnodestats kstat. + */ +typedef struct dnode_stats { + /* + * Number of failed attempts to hold a meta dnode dbuf. + */ + kstat_named_t dnode_hold_dbuf_hold; + /* + * Number of failed attempts to read a meta dnode dbuf. + */ + kstat_named_t dnode_hold_dbuf_read; + /* + * Number of times dnode_hold(..., DNODE_MUST_BE_ALLOCATED) was able + * to hold the requested object number which was allocated. This is + * the common case when looking up any allocated object number. + */ + kstat_named_t dnode_hold_alloc_hits; + /* + * Number of times dnode_hold(..., DNODE_MUST_BE_ALLOCATED) was not + * able to hold the request object number because it was not allocated. + */ + kstat_named_t dnode_hold_alloc_misses; + /* + * Number of times dnode_hold(..., DNODE_MUST_BE_ALLOCATED) was not + * able to hold the request object number because the object number + * refers to an interior large dnode slot. + */ + kstat_named_t dnode_hold_alloc_interior; + /* + * Number of times dnode_hold(..., DNODE_MUST_BE_ALLOCATED) needed + * to retry acquiring slot zrl locks due to contention. + */ + kstat_named_t dnode_hold_alloc_lock_retry; + /* + * Number of times dnode_hold(..., DNODE_MUST_BE_ALLOCATED) did not + * need to create the dnode because another thread did so after + * dropping the read lock but before acquiring the write lock. + */ + kstat_named_t dnode_hold_alloc_lock_misses; + /* + * Number of times dnode_hold(..., DNODE_MUST_BE_ALLOCATED) found + * a free dnode instantiated by dnode_create() but not yet allocated + * by dnode_allocate(). + */ + kstat_named_t dnode_hold_alloc_type_none; + /* + * Number of times dnode_hold(..., DNODE_MUST_BE_FREE) was able + * to hold the requested range of free dnode slots. + */ + kstat_named_t dnode_hold_free_hits; + /* + * Number of times dnode_hold(..., DNODE_MUST_BE_FREE) was not + * able to hold the requested range of free dnode slots because + * at least one slot was allocated. + */ + kstat_named_t dnode_hold_free_misses; + /* + * Number of times dnode_hold(..., DNODE_MUST_BE_FREE) was not + * able to hold the requested range of free dnode slots because + * after acquiring the zrl lock at least one slot was allocated. + */ + kstat_named_t dnode_hold_free_lock_misses; + /* + * Number of times dnode_hold(..., DNODE_MUST_BE_FREE) needed + * to retry acquiring slot zrl locks due to contention. + */ + kstat_named_t dnode_hold_free_lock_retry; + /* + * Number of times dnode_hold(..., DNODE_MUST_BE_FREE) requested + * a range of dnode slots which were held by another thread. + */ + kstat_named_t dnode_hold_free_refcount; + /* + * Number of times dnode_hold(..., DNODE_MUST_BE_FREE) requested + * a range of dnode slots which would overflow the dnode_phys_t. + */ + kstat_named_t dnode_hold_free_overflow; + /* + * Number of times a dnode_hold(...) was attempted on a dnode + * which had already been unlinked in an earlier txg. + */ + kstat_named_t dnode_hold_free_txg; + /* + * Number of times dnode_free_interior_slots() needed to retry + * acquiring a slot zrl lock due to contention. + */ + kstat_named_t dnode_free_interior_lock_retry; + /* + * Number of new dnodes allocated by dnode_allocate(). + */ + kstat_named_t dnode_allocate; + /* + * Number of dnodes re-allocated by dnode_reallocate(). + */ + kstat_named_t dnode_reallocate; + /* + * Number of meta dnode dbufs evicted. + */ + kstat_named_t dnode_buf_evict; + /* + * Number of times dmu_object_alloc*() reached the end of the existing + * object ID chunk and advanced to a new one. + */ + kstat_named_t dnode_alloc_next_chunk; + /* + * Number of times multiple threads attempted to allocate a dnode + * from the same block of free dnodes. + */ + kstat_named_t dnode_alloc_race; + /* + * Number of times dmu_object_alloc*() was forced to advance to the + * next meta dnode dbuf due to an error from dmu_object_next(). + */ + kstat_named_t dnode_alloc_next_block; + /* + * Statistics for tracking dnodes which have been moved. + */ + kstat_named_t dnode_move_invalid; + kstat_named_t dnode_move_recheck1; + kstat_named_t dnode_move_recheck2; + kstat_named_t dnode_move_special; + kstat_named_t dnode_move_handle; + kstat_named_t dnode_move_rwlock; + kstat_named_t dnode_move_active; +} dnode_stats_t; + +extern dnode_stats_t dnode_stats; + +#define DNODE_STAT_INCR(stat, val) \ + atomic_add_64(&dnode_stats.stat.value.ui64, (val)); +#define DNODE_STAT_BUMP(stat) \ + DNODE_STAT_INCR(stat, 1); + #ifdef ZFS_DEBUG /* diff --git a/usr/src/uts/common/fs/zfs/sys/dsl_dataset.h b/usr/src/uts/common/fs/zfs/sys/dsl_dataset.h index 03dca17bee..15a64a8326 100644 --- a/usr/src/uts/common/fs/zfs/sys/dsl_dataset.h +++ b/usr/src/uts/common/fs/zfs/sys/dsl_dataset.h @@ -87,6 +87,13 @@ struct dsl_pool; #define DS_FIELD_BOOKMARK_NAMES "com.delphix:bookmarks" /* + * This field is present (with value=0) if this dataset may contain large + * dnodes (>512B). If it is present, then this dataset is counted in the + * refcount of the SPA_FEATURE_LARGE_DNODE feature. + */ +#define DS_FIELD_LARGE_DNODE "org.zfsonlinux:large_dnode" + +/* * These fields are set on datasets that are in the middle of a resumable * receive, and allow the sender to resume the send if it is interrupted. */ diff --git a/usr/src/uts/common/fs/zfs/sys/sa_impl.h b/usr/src/uts/common/fs/zfs/sys/sa_impl.h index 50874c6bf0..4bea074b54 100644 --- a/usr/src/uts/common/fs/zfs/sys/sa_impl.h +++ b/usr/src/uts/common/fs/zfs/sys/sa_impl.h @@ -101,7 +101,7 @@ typedef struct sa_lot { sa_attr_type_t *lot_attrs; /* array of attr #'s */ uint32_t lot_var_sizes; /* how many aren't fixed size */ uint32_t lot_attr_count; /* total attr count */ - list_t lot_idx_tab; /* should be only a couple of entries */ + list_t lot_idx_tab; /* should be only a couple of entries */ int lot_instance; /* used with lot_hash to identify entry */ } sa_lot_t; @@ -134,7 +134,7 @@ typedef struct sa_idx_tab { * adding a completely new attribute is a very rare operation. */ struct sa_os { - kmutex_t sa_lock; + kmutex_t sa_lock; boolean_t sa_need_attr_registration; boolean_t sa_force_spill; uint64_t sa_master_obj; @@ -237,7 +237,7 @@ struct sa_handle { #define SA_BONUSTYPE_FROM_DB(db) \ (dmu_get_bonustype((dmu_buf_t *)db)) -#define SA_BLKPTR_SPACE (DN_MAX_BONUSLEN - sizeof (blkptr_t)) +#define SA_BLKPTR_SPACE (DN_OLD_MAX_BONUSLEN - sizeof (blkptr_t)) #define SA_LAYOUT_NUM(x, type) \ ((!IS_SA_BONUSTYPE(type) ? 0 : (((IS_SA_BONUSTYPE(type)) && \ diff --git a/usr/src/uts/common/fs/zfs/sys/spa.h b/usr/src/uts/common/fs/zfs/sys/spa.h index 79d4d84dca..f044b994d0 100644 --- a/usr/src/uts/common/fs/zfs/sys/spa.h +++ b/usr/src/uts/common/fs/zfs/sys/spa.h @@ -846,6 +846,7 @@ extern boolean_t spa_is_root(spa_t *spa); extern boolean_t spa_writeable(spa_t *spa); extern boolean_t spa_has_pending_synctask(spa_t *spa); extern int spa_maxblocksize(spa_t *spa); +extern int spa_maxdnodesize(spa_t *spa); extern boolean_t spa_has_checkpoint(spa_t *spa); extern boolean_t spa_importing_readonly_checkpoint(spa_t *spa); extern boolean_t spa_suspend_async_destroy(spa_t *spa); diff --git a/usr/src/uts/common/fs/zfs/sys/zap.h b/usr/src/uts/common/fs/zfs/sys/zap.h index 10cb6b449b..2c909ff53a 100644 --- a/usr/src/uts/common/fs/zfs/sys/zap.h +++ b/usr/src/uts/common/fs/zfs/sys/zap.h @@ -115,16 +115,30 @@ typedef enum zap_flags { /* * Create a new zapobj with no attributes and return its object number. + * + * dnodesize specifies the on-disk size of the dnode for the new zapobj. + * Valid values are multiples of 512 up to DNODE_MAX_SIZE. */ uint64_t zap_create(objset_t *ds, dmu_object_type_t ot, dmu_object_type_t bonustype, int bonuslen, dmu_tx_t *tx); +uint64_t zap_create_dnsize(objset_t *ds, dmu_object_type_t ot, + dmu_object_type_t bonustype, int bonuslen, int dnodesize, dmu_tx_t *tx); uint64_t zap_create_norm(objset_t *ds, int normflags, dmu_object_type_t ot, dmu_object_type_t bonustype, int bonuslen, dmu_tx_t *tx); +uint64_t zap_create_norm_dnsize(objset_t *ds, int normflags, + dmu_object_type_t ot, dmu_object_type_t bonustype, int bonuslen, + int dnodesize, dmu_tx_t *tx); uint64_t zap_create_flags(objset_t *os, int normflags, zap_flags_t flags, dmu_object_type_t ot, int leaf_blockshift, int indirect_blockshift, dmu_object_type_t bonustype, int bonuslen, dmu_tx_t *tx); +uint64_t zap_create_flags_dnsize(objset_t *os, int normflags, + zap_flags_t flags, dmu_object_type_t ot, int leaf_blockshift, + int indirect_blockshift, dmu_object_type_t bonustype, int bonuslen, + int dnodesize, dmu_tx_t *tx); uint64_t zap_create_link(objset_t *os, dmu_object_type_t ot, uint64_t parent_obj, const char *name, dmu_tx_t *tx); +uint64_t zap_create_link_dnsize(objset_t *os, dmu_object_type_t ot, + uint64_t parent_obj, const char *name, int dnodesize, dmu_tx_t *tx); /* * Initialize an already-allocated object. @@ -138,9 +152,14 @@ void mzap_create_impl(objset_t *os, uint64_t obj, int normflags, */ int zap_create_claim(objset_t *ds, uint64_t obj, dmu_object_type_t ot, dmu_object_type_t bonustype, int bonuslen, dmu_tx_t *tx); +int zap_create_claim_dnsize(objset_t *ds, uint64_t obj, dmu_object_type_t ot, + dmu_object_type_t bonustype, int bonuslen, int dnodesize, dmu_tx_t *tx); int zap_create_claim_norm(objset_t *ds, uint64_t obj, int normflags, dmu_object_type_t ot, dmu_object_type_t bonustype, int bonuslen, dmu_tx_t *tx); +int zap_create_claim_norm_dnsize(objset_t *ds, uint64_t obj, + int normflags, dmu_object_type_t ot, + dmu_object_type_t bonustype, int bonuslen, int dnodesize, dmu_tx_t *tx); /* * The zapobj passed in must be a valid ZAP object for all of the diff --git a/usr/src/uts/common/fs/zfs/sys/zfs_ioctl.h b/usr/src/uts/common/fs/zfs/sys/zfs_ioctl.h index f3df29218d..824d1d8bb7 100644 --- a/usr/src/uts/common/fs/zfs/sys/zfs_ioctl.h +++ b/usr/src/uts/common/fs/zfs/sys/zfs_ioctl.h @@ -93,7 +93,7 @@ typedef enum drr_headertype { #define DMU_BACKUP_FEATURE_RESUMING (1 << 20) /* flag #21 is reserved for a Delphix feature */ #define DMU_BACKUP_FEATURE_COMPRESSED (1 << 22) -/* flag #23 is reserved for the large dnode feature */ +#define DMU_BACKUP_FEATURE_LARGE_DNODE (1 << 23) /* flag #24 is reserved for the raw send feature */ /* flag #25 is reserved for the ZSTD compression feature */ @@ -104,7 +104,7 @@ typedef enum drr_headertype { DMU_BACKUP_FEATURE_DEDUPPROPS | DMU_BACKUP_FEATURE_SA_SPILL | \ DMU_BACKUP_FEATURE_EMBED_DATA | DMU_BACKUP_FEATURE_LZ4 | \ DMU_BACKUP_FEATURE_RESUMING | \ - DMU_BACKUP_FEATURE_LARGE_BLOCKS | \ + DMU_BACKUP_FEATURE_LARGE_BLOCKS | DMU_BACKUP_FEATURE_LARGE_DNODE | \ DMU_BACKUP_FEATURE_COMPRESSED) /* Are all features in the given flag word currently supported? */ @@ -120,7 +120,7 @@ typedef enum dmu_send_resume_token_version { * * 64 56 48 40 32 24 16 8 0 * +-------+-------+-------+-------+-------+-------+-------+-------+ - * | reserved | feature-flags |C|S| + * | reserved | feature-flags |C|S| * +-------+-------+-------+-------+-------+-------+-------+-------+ * * The low order two bits indicate the header type: SUBSTREAM (0x1) @@ -197,7 +197,8 @@ typedef struct dmu_replay_record { uint32_t drr_bonuslen; uint8_t drr_checksumtype; uint8_t drr_compress; - uint8_t drr_pad[6]; + uint8_t drr_dn_slots; + uint8_t drr_pad[5]; uint64_t drr_toguid; /* bonus content follows */ } drr_object; diff --git a/usr/src/uts/common/fs/zfs/sys/zfs_znode.h b/usr/src/uts/common/fs/zfs/sys/zfs_znode.h index 8c4f8f7dc8..a9f9876530 100644 --- a/usr/src/uts/common/fs/zfs/sys/zfs_znode.h +++ b/usr/src/uts/common/fs/zfs/sys/zfs_znode.h @@ -185,6 +185,7 @@ typedef struct znode { uint_t z_blksz; /* block size in bytes */ uint_t z_seq; /* modification sequence number */ uint64_t z_mapcnt; /* number of pages mapped to file */ + uint64_t z_dnodesize; /* dnode size */ uint64_t z_gen; /* generation (cached) */ uint64_t z_size; /* file size (cached) */ uint64_t z_atime[2]; /* atime (cached) */ diff --git a/usr/src/uts/common/fs/zfs/sys/zil.h b/usr/src/uts/common/fs/zfs/sys/zil.h index b1567acd4a..e6b18da95b 100644 --- a/usr/src/uts/common/fs/zfs/sys/zil.h +++ b/usr/src/uts/common/fs/zfs/sys/zil.h @@ -157,7 +157,7 @@ typedef enum zil_create { #define TX_ACL 13 /* Set ACL */ #define TX_CREATE_ACL 14 /* create with ACL */ #define TX_CREATE_ATTR 15 /* create + attrs */ -#define TX_CREATE_ACL_ATTR 16 /* create with ACL + attrs */ +#define TX_CREATE_ACL_ATTR 16 /* create with ACL + attrs */ #define TX_MKDIR_ACL 17 /* mkdir with ACL */ #define TX_MKDIR_ATTR 18 /* mkdir with attr */ #define TX_MKDIR_ACL_ATTR 19 /* mkdir with ACL + attrs */ @@ -185,6 +185,19 @@ typedef enum zil_create { (txtype) == TX_WRITE2) /* + * The number of dnode slots consumed by the object is stored in the 8 + * unused upper bits of the object ID. We subtract 1 from the value + * stored on disk for compatibility with implementations that don't + * support large dnodes. The slot count for a single-slot dnode will + * contain 0 for those bits to preserve the log record format for + * "small" dnodes. + */ +#define LR_FOID_GET_SLOTS(oid) (BF64_GET((oid), 56, 8) + 1) +#define LR_FOID_SET_SLOTS(oid, x) BF64_SET((oid), 56, 8, (x) - 1) +#define LR_FOID_GET_OBJ(oid) BF64_GET((oid), 0, DN_MAX_OBJECT_SHIFT) +#define LR_FOID_SET_OBJ(oid, x) BF64_SET((oid), 0, DN_MAX_OBJECT_SHIFT, (x)) + +/* * Format of log records. * The fields are carefully defined to allow them to be aligned * and sized the same on sparc & intel architectures. @@ -422,7 +435,7 @@ extern void zil_commit_impl(zilog_t *zilog, uint64_t oid); extern int zil_reset(const char *osname, void *txarg); extern int zil_claim(struct dsl_pool *dp, struct dsl_dataset *ds, void *txarg); -extern int zil_check_log_chain(struct dsl_pool *dp, +extern int zil_check_log_chain(struct dsl_pool *dp, struct dsl_dataset *ds, void *tx); extern void zil_sync(zilog_t *zilog, dmu_tx_t *tx); extern void zil_clean(zilog_t *zilog, uint64_t synced_txg); diff --git a/usr/src/uts/common/fs/zfs/zap.c b/usr/src/uts/common/fs/zfs/zap.c index e9ed41e556..7a1994f603 100644 --- a/usr/src/uts/common/fs/zfs/zap.c +++ b/usr/src/uts/common/fs/zfs/zap.c @@ -948,8 +948,17 @@ uint64_t zap_create_link(objset_t *os, dmu_object_type_t ot, uint64_t parent_obj, const char *name, dmu_tx_t *tx) { - uint64_t new_obj = zap_create(os, ot, DMU_OT_NONE, 0, tx); - VERIFY(new_obj != 0); + return (zap_create_link_dnsize(os, ot, parent_obj, name, 0, tx)); +} + +uint64_t +zap_create_link_dnsize(objset_t *os, dmu_object_type_t ot, uint64_t parent_obj, + const char *name, int dnodesize, dmu_tx_t *tx) +{ + uint64_t new_obj; + + VERIFY((new_obj = zap_create_dnsize(os, ot, DMU_OT_NONE, 0, + dnodesize, tx)) > 0); VERIFY0(zap_add(os, parent_obj, name, sizeof (uint64_t), 1, &new_obj, tx)); diff --git a/usr/src/uts/common/fs/zfs/zap_micro.c b/usr/src/uts/common/fs/zfs/zap_micro.c index b07079ed44..d093fe1e73 100644 --- a/usr/src/uts/common/fs/zfs/zap_micro.c +++ b/usr/src/uts/common/fs/zfs/zap_micro.c @@ -693,8 +693,16 @@ int zap_create_claim(objset_t *os, uint64_t obj, dmu_object_type_t ot, dmu_object_type_t bonustype, int bonuslen, dmu_tx_t *tx) { - return (zap_create_claim_norm(os, obj, - 0, ot, bonustype, bonuslen, tx)); + return (zap_create_claim_dnsize(os, obj, ot, bonustype, bonuslen, + 0, tx)); +} + +int +zap_create_claim_dnsize(objset_t *os, uint64_t obj, dmu_object_type_t ot, + dmu_object_type_t bonustype, int bonuslen, int dnodesize, dmu_tx_t *tx) +{ + return (zap_create_claim_norm_dnsize(os, obj, + 0, ot, bonustype, bonuslen, dnodesize, tx)); } int @@ -702,8 +710,19 @@ zap_create_claim_norm(objset_t *os, uint64_t obj, int normflags, dmu_object_type_t ot, dmu_object_type_t bonustype, int bonuslen, dmu_tx_t *tx) { - ASSERT3U(DMU_OT_BYTESWAP(ot), ==, DMU_BSWAP_ZAP); - int err = dmu_object_claim(os, obj, ot, 0, bonustype, bonuslen, tx); + return (zap_create_claim_norm_dnsize(os, obj, normflags, ot, bonustype, + bonuslen, 0, tx)); +} + +int +zap_create_claim_norm_dnsize(objset_t *os, uint64_t obj, int normflags, + dmu_object_type_t ot, dmu_object_type_t bonustype, int bonuslen, + int dnodesize, dmu_tx_t *tx) +{ + int err; + + err = dmu_object_claim_dnsize(os, obj, ot, 0, bonustype, bonuslen, + dnodesize, tx); if (err != 0) return (err); mzap_create_impl(os, obj, normflags, 0, tx); @@ -718,11 +737,28 @@ zap_create(objset_t *os, dmu_object_type_t ot, } uint64_t +zap_create_dnsize(objset_t *os, dmu_object_type_t ot, + dmu_object_type_t bonustype, int bonuslen, int dnodesize, dmu_tx_t *tx) +{ + return (zap_create_norm_dnsize(os, 0, ot, bonustype, bonuslen, + dnodesize, tx)); +} + +uint64_t zap_create_norm(objset_t *os, int normflags, dmu_object_type_t ot, dmu_object_type_t bonustype, int bonuslen, dmu_tx_t *tx) { ASSERT3U(DMU_OT_BYTESWAP(ot), ==, DMU_BSWAP_ZAP); - uint64_t obj = dmu_object_alloc(os, ot, 0, bonustype, bonuslen, tx); + return (zap_create_norm_dnsize(os, normflags, ot, bonustype, bonuslen, + 0, tx)); +} + +uint64_t +zap_create_norm_dnsize(objset_t *os, int normflags, dmu_object_type_t ot, + dmu_object_type_t bonustype, int bonuslen, int dnodesize, dmu_tx_t *tx) +{ + uint64_t obj = dmu_object_alloc_dnsize(os, ot, 0, bonustype, bonuslen, + dnodesize, tx); mzap_create_impl(os, obj, normflags, 0, tx); return (obj); @@ -734,7 +770,17 @@ zap_create_flags(objset_t *os, int normflags, zap_flags_t flags, dmu_object_type_t bonustype, int bonuslen, dmu_tx_t *tx) { ASSERT3U(DMU_OT_BYTESWAP(ot), ==, DMU_BSWAP_ZAP); - uint64_t obj = dmu_object_alloc(os, ot, 0, bonustype, bonuslen, tx); + return (zap_create_flags_dnsize(os, normflags, flags, ot, + leaf_blockshift, indirect_blockshift, bonustype, bonuslen, 0, tx)); +} + +uint64_t +zap_create_flags_dnsize(objset_t *os, int normflags, zap_flags_t flags, + dmu_object_type_t ot, int leaf_blockshift, int indirect_blockshift, + dmu_object_type_t bonustype, int bonuslen, int dnodesize, dmu_tx_t *tx) +{ + uint64_t obj = dmu_object_alloc_dnsize(os, ot, 0, bonustype, bonuslen, + dnodesize, tx); ASSERT(leaf_blockshift >= SPA_MINBLOCKSHIFT && leaf_blockshift <= SPA_OLD_MAXBLOCKSHIFT && diff --git a/usr/src/uts/common/fs/zfs/zfs_acl.c b/usr/src/uts/common/fs/zfs/zfs_acl.c index 5906db3656..149103206a 100644 --- a/usr/src/uts/common/fs/zfs/zfs_acl.c +++ b/usr/src/uts/common/fs/zfs/zfs_acl.c @@ -895,7 +895,7 @@ zfs_mode_compute(uint64_t fmode, zfs_acl_t *aclp, int entry_type; mode_t mode; mode_t seen = 0; - zfs_ace_hdr_t *acep = NULL; + zfs_ace_hdr_t *acep = NULL; uint64_t who; uint16_t iflags, type; uint32_t access_mask; @@ -1262,7 +1262,7 @@ zfs_aclset_common(znode_t *zp, zfs_acl_t *aclp, cred_t *cr, dmu_tx_t *tx) otype == DMU_OT_ACL ? DMU_OT_SYSACL : DMU_OT_NONE, otype == DMU_OT_ACL ? - DN_MAX_BONUSLEN : 0, tx); + DN_OLD_MAX_BONUSLEN : 0, tx); } else { (void) dmu_object_set_blocksize(zfsvfs->z_os, aoid, aclp->z_acl_bytes, 0, tx); @@ -1337,12 +1337,12 @@ zfs_acl_chmod(vtype_t vtype, uint64_t mode, boolean_t split, boolean_t trim, uint64_t who; int new_count, new_bytes; int ace_size; - int entry_type; + int entry_type; uint16_t iflags, type; uint32_t access_mask; zfs_acl_node_t *newnode; - size_t abstract_size = aclp->z_ops.ace_abstract_size(); - void *zacep; + size_t abstract_size = aclp->z_ops.ace_abstract_size(); + void *zacep; boolean_t isdir; trivial_acl_t masks; @@ -1786,7 +1786,7 @@ zfs_getacl(znode_t *zp, vsecattr_t *vsecp, boolean_t skipaclchk, cred_t *cr) zfs_acl_t *aclp; ulong_t mask; int error; - int count = 0; + int count = 0; int largeace = 0; mask = vsecp->vsa_mask & (VSA_ACE | VSA_ACECNT | @@ -2107,7 +2107,7 @@ zfs_zaccess_aces_check(znode_t *zp, uint32_t *working_mode, zfs_acl_t *aclp; int error; uid_t uid = crgetuid(cr); - uint64_t who; + uint64_t who; uint16_t type, iflags; uint16_t entry_type; uint32_t access_mask; @@ -2380,9 +2380,9 @@ zfs_zaccess(znode_t *zp, int mode, int flags, boolean_t skipaclchk, cred_t *cr) uint32_t working_mode; int error; int is_attr; - boolean_t check_privs; + boolean_t check_privs; znode_t *xzp; - znode_t *check_zp = zp; + znode_t *check_zp = zp; mode_t needed_bits; uid_t owner; diff --git a/usr/src/uts/common/fs/zfs/zfs_ioctl.c b/usr/src/uts/common/fs/zfs/zfs_ioctl.c index 9a2ff2484d..a31ac21646 100644 --- a/usr/src/uts/common/fs/zfs/zfs_ioctl.c +++ b/usr/src/uts/common/fs/zfs/zfs_ioctl.c @@ -4093,6 +4093,24 @@ zfs_check_settable(const char *dsname, nvpair_t *pair, cred_t *cr) } break; + case ZFS_PROP_DNODESIZE: + /* Dnode sizes above 512 need the feature to be enabled */ + if (nvpair_value_uint64(pair, &intval) == 0 && + intval != ZFS_DNSIZE_LEGACY) { + spa_t *spa; + + if ((err = spa_open(dsname, &spa, FTAG)) != 0) + return (err); + + if (!spa_feature_is_enabled(spa, + SPA_FEATURE_LARGE_DNODE)) { + spa_close(spa, FTAG); + return (SET_ERROR(ENOTSUP)); + } + spa_close(spa, FTAG); + } + break; + case ZFS_PROP_SHARESMB: if (zpl_earlier_version(dsname, ZPL_VERSION_FUID)) return (SET_ERROR(ENOTSUP)); diff --git a/usr/src/uts/common/fs/zfs/zfs_log.c b/usr/src/uts/common/fs/zfs/zfs_log.c index fbac2d99c2..1afaa8434b 100644 --- a/usr/src/uts/common/fs/zfs/zfs_log.c +++ b/usr/src/uts/common/fs/zfs/zfs_log.c @@ -280,6 +280,8 @@ zfs_log_create(zilog_t *zilog, dmu_tx_t *tx, uint64_t txtype, lr = (lr_create_t *)&itx->itx_lr; lr->lr_doid = dzp->z_id; lr->lr_foid = zp->z_id; + /* Store dnode slot count in 8 bits above object id. */ + LR_FOID_SET_SLOTS(lr->lr_foid, zp->z_dnodesize >> DNODE_SHIFT); lr->lr_mode = zp->z_mode; if (!IS_EPHEMERAL(zp->z_uid)) { lr->lr_uid = (uint64_t)zp->z_uid; diff --git a/usr/src/uts/common/fs/zfs/zfs_replay.c b/usr/src/uts/common/fs/zfs/zfs_replay.c index de8d9c10b6..f75ec48cd7 100644 --- a/usr/src/uts/common/fs/zfs/zfs_replay.c +++ b/usr/src/uts/common/fs/zfs/zfs_replay.c @@ -278,6 +278,8 @@ zfs_replay_create_acl(void *arg1, void *arg2, boolean_t byteswap) void *fuidstart; size_t xvatlen = 0; uint64_t txtype; + uint64_t objid; + uint64_t dnodesize; int error; txtype = (lr->lr_common.lrc_txtype & ~TX_CI); @@ -303,19 +305,24 @@ zfs_replay_create_acl(void *arg1, void *arg2, boolean_t byteswap) if ((error = zfs_zget(zfsvfs, lr->lr_doid, &dzp)) != 0) return (error); + objid = LR_FOID_GET_OBJ(lr->lr_foid); + dnodesize = LR_FOID_GET_SLOTS(lr->lr_foid) << DNODE_SHIFT; + xva_init(&xva); zfs_init_vattr(&xva.xva_vattr, AT_TYPE | AT_MODE | AT_UID | AT_GID, - lr->lr_mode, lr->lr_uid, lr->lr_gid, lr->lr_rdev, lr->lr_foid); + lr->lr_mode, lr->lr_uid, lr->lr_gid, lr->lr_rdev, objid); /* * All forms of zfs create (create, mkdir, mkxattrdir, symlink) * eventually end up in zfs_mknode(), which assigns the object's - * creation time and generation number. The generic VOP_CREATE() - * doesn't have either concept, so we smuggle the values inside - * the vattr's otherwise unused va_ctime and va_nblocks fields. + * creation time, generation number, and dnode size. The generic + * zfs_create() has no concept of these attributes, so we smuggle + * the values inside the vattr's otherwise unused va_ctime, + * va_nblocks, and va_fsid fields. */ ZFS_TIME_DECODE(&xva.xva_vattr.va_ctime, lr->lr_crtime); xva.xva_vattr.va_nblocks = lr->lr_gen; + xva.xva_vattr.va_fsid = dnodesize; error = dmu_object_info(zfsvfs->z_os, lr->lr_foid, NULL); if (error != ENOENT) @@ -432,21 +439,26 @@ zfs_replay_create(void *arg1, void *arg2, boolean_t byteswap) if ((error = zfs_zget(zfsvfs, lr->lr_doid, &dzp)) != 0) return (error); + uint64_t objid = LR_FOID_GET_OBJ(lr->lr_foid); + int dnodesize = LR_FOID_GET_SLOTS(lr->lr_foid) << DNODE_SHIFT; + xva_init(&xva); zfs_init_vattr(&xva.xva_vattr, AT_TYPE | AT_MODE | AT_UID | AT_GID, - lr->lr_mode, lr->lr_uid, lr->lr_gid, lr->lr_rdev, lr->lr_foid); + lr->lr_mode, lr->lr_uid, lr->lr_gid, lr->lr_rdev, objid); /* * All forms of zfs create (create, mkdir, mkxattrdir, symlink) * eventually end up in zfs_mknode(), which assigns the object's - * creation time and generation number. The generic VOP_CREATE() - * doesn't have either concept, so we smuggle the values inside - * the vattr's otherwise unused va_ctime and va_nblocks fields. + * creation time, generation number, and dnode slot count. The + * generic zfs_create() has no concept of these attributes, so + * we smuggle the values inside the vattr's otherwise unused + * va_ctime, va_nblocks and va_fsid fields. */ ZFS_TIME_DECODE(&xva.xva_vattr.va_ctime, lr->lr_crtime); xva.xva_vattr.va_nblocks = lr->lr_gen; + xva.xva_vattr.va_fsid = dnodesize; - error = dmu_object_info(zfsvfs->z_os, lr->lr_foid, NULL); + error = dmu_object_info(zfsvfs->z_os, objid, NULL); if (error != ENOENT) goto out; diff --git a/usr/src/uts/common/fs/zfs/zfs_sa.c b/usr/src/uts/common/fs/zfs/zfs_sa.c index 3a472aa11a..a39cff1a7b 100644 --- a/usr/src/uts/common/fs/zfs/zfs_sa.c +++ b/usr/src/uts/common/fs/zfs/zfs_sa.c @@ -97,8 +97,7 @@ zfs_sa_symlink(znode_t *zp, char *link, int len, dmu_tx_t *tx) dmu_buf_t *db = sa_get_db(zp->z_sa_hdl); if (ZFS_OLD_ZNODE_PHYS_SIZE + len <= dmu_bonus_max()) { - VERIFY(dmu_set_bonus(db, - len + ZFS_OLD_ZNODE_PHYS_SIZE, tx) == 0); + VERIFY0(dmu_set_bonus(db, len + ZFS_OLD_ZNODE_PHYS_SIZE, tx)); if (len) { bcopy(link, (caddr_t)db->db_data + ZFS_OLD_ZNODE_PHYS_SIZE, len); diff --git a/usr/src/uts/common/fs/zfs/zfs_znode.c b/usr/src/uts/common/fs/zfs/zfs_znode.c index 536216deaf..b56cb7bd70 100644 --- a/usr/src/uts/common/fs/zfs/zfs_znode.c +++ b/usr/src/uts/common/fs/zfs/zfs_znode.c @@ -60,6 +60,7 @@ #include <sys/dmu.h> #include <sys/dmu_objset.h> +#include <sys/dmu_tx.h> #include <sys/refcount.h> #include <sys/stat.h> #include <sys/zap.h> @@ -799,9 +800,10 @@ zfs_mknode(znode_t *dzp, vattr_t *vap, dmu_tx_t *tx, cred_t *cr, timestruc_t now; uint64_t gen, obj; int bonuslen; + int dnodesize; sa_handle_t *sa_hdl; dmu_object_type_t obj_type; - sa_bulk_attr_t sa_attrs[ZPL_END]; + sa_bulk_attr_t *sa_attrs; int cnt = 0; zfs_acl_locator_cb_t locate = { 0 }; @@ -811,15 +813,20 @@ zfs_mknode(znode_t *dzp, vattr_t *vap, dmu_tx_t *tx, cred_t *cr, obj = vap->va_nodeid; now = vap->va_ctime; /* see zfs_replay_create() */ gen = vap->va_nblocks; /* ditto */ + dnodesize = vap->va_fsid; /* ditto */ } else { obj = 0; gethrestime(&now); gen = dmu_tx_get_txg(tx); + dnodesize = dmu_objset_dnodesize(zfsvfs->z_os); } + if (dnodesize == 0) + dnodesize = DNODE_MIN_SIZE; + obj_type = zfsvfs->z_use_sa ? DMU_OT_SA : DMU_OT_ZNODE; bonuslen = (obj_type == DMU_OT_SA) ? - DN_MAX_BONUSLEN : ZFS_OLD_ZNODE_PHYS_SIZE; + DN_BONUS_SIZE(dnodesize) : ZFS_OLD_ZNODE_PHYS_SIZE; /* * Create a new DMU object. @@ -832,28 +839,28 @@ zfs_mknode(znode_t *dzp, vattr_t *vap, dmu_tx_t *tx, cred_t *cr, */ if (vap->va_type == VDIR) { if (zfsvfs->z_replay) { - VERIFY0(zap_create_claim_norm(zfsvfs->z_os, obj, + VERIFY0(zap_create_claim_norm_dnsize(zfsvfs->z_os, obj, zfsvfs->z_norm, DMU_OT_DIRECTORY_CONTENTS, - obj_type, bonuslen, tx)); + obj_type, bonuslen, dnodesize, tx)); } else { - obj = zap_create_norm(zfsvfs->z_os, + obj = zap_create_norm_dnsize(zfsvfs->z_os, zfsvfs->z_norm, DMU_OT_DIRECTORY_CONTENTS, - obj_type, bonuslen, tx); + obj_type, bonuslen, dnodesize, tx); } } else { if (zfsvfs->z_replay) { - VERIFY0(dmu_object_claim(zfsvfs->z_os, obj, + VERIFY0(dmu_object_claim_dnsize(zfsvfs->z_os, obj, DMU_OT_PLAIN_FILE_CONTENTS, 0, - obj_type, bonuslen, tx)); + obj_type, bonuslen, dnodesize, tx)); } else { - obj = dmu_object_alloc(zfsvfs->z_os, + obj = dmu_object_alloc_dnsize(zfsvfs->z_os, DMU_OT_PLAIN_FILE_CONTENTS, 0, - obj_type, bonuslen, tx); + obj_type, bonuslen, dnodesize, tx); } } ZFS_OBJ_HOLD_ENTER(zfsvfs, obj); - VERIFY(0 == sa_buf_hold(zfsvfs->z_os, obj, NULL, &db)); + VERIFY0(sa_buf_hold(zfsvfs->z_os, obj, NULL, &db)); /* * If this is the root, fix up the half-initialized parent pointer @@ -925,6 +932,7 @@ zfs_mknode(znode_t *dzp, vattr_t *vap, dmu_tx_t *tx, cred_t *cr, * order for DMU_OT_ZNODE is critical since it needs to be constructed * in the old znode_phys_t format. Don't change this ordering */ + sa_attrs = kmem_alloc(sizeof (sa_bulk_attr_t) * ZPL_END, KM_SLEEP); if (obj_type == DMU_OT_ZNODE) { SA_ADD_BULK_ATTR(sa_attrs, cnt, SA_ZPL_ATIME(zfsvfs), @@ -950,10 +958,10 @@ zfs_mknode(znode_t *dzp, vattr_t *vap, dmu_tx_t *tx, cred_t *cr, NULL, &size, 8); SA_ADD_BULK_ATTR(sa_attrs, cnt, SA_ZPL_GEN(zfsvfs), NULL, &gen, 8); - SA_ADD_BULK_ATTR(sa_attrs, cnt, SA_ZPL_UID(zfsvfs), NULL, - &acl_ids->z_fuid, 8); - SA_ADD_BULK_ATTR(sa_attrs, cnt, SA_ZPL_GID(zfsvfs), NULL, - &acl_ids->z_fgid, 8); + SA_ADD_BULK_ATTR(sa_attrs, cnt, SA_ZPL_UID(zfsvfs), + NULL, &acl_ids->z_fuid, 8); + SA_ADD_BULK_ATTR(sa_attrs, cnt, SA_ZPL_GID(zfsvfs), + NULL, &acl_ids->z_fgid, 8); SA_ADD_BULK_ATTR(sa_attrs, cnt, SA_ZPL_PARENT(zfsvfs), NULL, &parent, 8); SA_ADD_BULK_ATTR(sa_attrs, cnt, SA_ZPL_FLAGS(zfsvfs), @@ -1019,6 +1027,7 @@ zfs_mknode(znode_t *dzp, vattr_t *vap, dmu_tx_t *tx, cred_t *cr, (*zpp)->z_pflags = pflags; (*zpp)->z_mode = mode; + (*zpp)->z_dnodesize = dnodesize; if (vap->va_mask & AT_XVATTR) zfs_xvattr_set(*zpp, (xvattr_t *)vap, tx); @@ -1027,6 +1036,7 @@ zfs_mknode(znode_t *dzp, vattr_t *vap, dmu_tx_t *tx, cred_t *cr, acl_ids->z_aclp->z_version < ZFS_ACL_VERSION_FUID) { VERIFY0(zfs_aclset_common(*zpp, acl_ids->z_aclp, cr, tx)); } + kmem_free(sa_attrs, sizeof (sa_bulk_attr_t) * ZPL_END); ZFS_OBJ_HOLD_EXIT(zfsvfs, obj); } diff --git a/usr/src/uts/common/fs/zfs/zil.c b/usr/src/uts/common/fs/zfs/zil.c index 3773e45870..4b13ab6f43 100644 --- a/usr/src/uts/common/fs/zfs/zil.c +++ b/usr/src/uts/common/fs/zfs/zil.c @@ -64,9 +64,9 @@ * representation, and the on-disk representation). The on-disk format * consists of 3 parts: * - * - a single, per-dataset, ZIL header; which points to a chain of - * - zero or more ZIL blocks; each of which contains - * - zero or more ZIL records + * - a single, per-dataset, ZIL header; which points to a chain of + * - zero or more ZIL blocks; each of which contains + * - zero or more ZIL records * * A ZIL record holds the information necessary to replay a single * system call transaction. A ZIL block can hold many ZIL records, and @@ -1356,7 +1356,7 @@ zil_lwb_write_open(zilog_t *zilog, lwb_t *lwb) uint64_t zil_block_buckets[] = { 4096, /* non TX_WRITE */ 8192+4096, /* data base */ - 32*1024 + 4096, /* NFS writes */ + 32*1024 + 4096, /* NFS writes */ UINT64_MAX }; @@ -1841,7 +1841,8 @@ zil_itx_assign(zilog_t *zilog, itx_t *itx, dmu_tx_t *tx) list_insert_tail(&itxs->i_sync_list, itx); } else { avl_tree_t *t = &itxs->i_async_tree; - uint64_t foid = ((lr_ooo_t *)&itx->itx_lr)->lr_foid; + uint64_t foid = + LR_FOID_GET_OBJ(((lr_ooo_t *)&itx->itx_lr)->lr_foid); itx_async_node_t *ian; avl_index_t where; @@ -3096,7 +3097,8 @@ zil_close(zilog_t *zilog) if (zilog_is_dirty(zilog)) zfs_dbgmsg("zil (%p) is dirty, txg %llu", zilog, txg); - VERIFY(!zilog_is_dirty(zilog)); + if (txg < spa_freeze_txg(zilog->zl_spa)) + VERIFY(!zilog_is_dirty(zilog)); zilog->zl_get_data = NULL; @@ -3311,7 +3313,7 @@ zil_replay_log_record(zilog_t *zilog, lr_t *lr, void *zra, uint64_t claim_txg) */ if (TX_OOO(txtype)) { error = dmu_object_info(zilog->zl_os, - ((lr_ooo_t *)lr)->lr_foid, NULL); + LR_FOID_GET_OBJ(((lr_ooo_t *)lr)->lr_foid), NULL); if (error == ENOENT || error == EEXIST) return (0); } diff --git a/usr/src/uts/common/io/tem_safe.c b/usr/src/uts/common/io/tem_safe.c index bd9f493921..51d6ee4ce0 100644 --- a/usr/src/uts/common/io/tem_safe.c +++ b/usr/src/uts/common/io/tem_safe.c @@ -1329,6 +1329,26 @@ tem_safe_scroll(struct tem_vt_state *tem, int start, int end, int count, } } +static int +tem_copy_width(term_char_t *src, term_char_t *dst, int cols) +{ + int width = cols - 1; + + while (width >= 0) { + /* + * Find difference on line, compare char with its attributes + * and colors. + */ + if (src[width].tc_char != dst[width].tc_char || + src[width].tc_fg_color != dst[width].tc_fg_color || + src[width].tc_bg_color != dst[width].tc_bg_color) { + break; + } + width--; + } + return (width + 1); +} + static void tem_safe_copy_area(struct tem_vt_state *tem, screen_pos_t s_col, screen_pos_t s_row, @@ -1336,6 +1356,8 @@ tem_safe_copy_area(struct tem_vt_state *tem, screen_pos_t t_col, screen_pos_t t_row, cred_t *credp, enum called_from called_from) { + size_t soffset, toffset; + term_char_t *src, *dst; int rows; int cols; @@ -1362,16 +1384,52 @@ tem_safe_copy_area(struct tem_vt_state *tem, t_col + cols > tems.ts_c_dimension.width) return; - tem_safe_virtual_copy(tem, - s_col, s_row, - e_col, e_row, - t_col, t_row); + soffset = s_col + s_row * tems.ts_c_dimension.width; + toffset = t_col + t_row * tems.ts_c_dimension.width; + src = tem->tvs_screen_buf + soffset; + dst = tem->tvs_screen_buf + toffset; - if (!tem->tvs_isactive) - return; + /* + * Copy line by line. We determine the length by comparing the + * screen content from cached text in tvs_screen_buf. + */ + if (toffset <= soffset) { + for (int i = 0; i < rows; i++) { + int increment = i * tems.ts_c_dimension.width; + int width; + + width = tem_copy_width(src + increment, + dst + increment, cols); + + tem_safe_virtual_copy(tem, s_col, s_row + i, + e_col - cols + width, s_row + i, + t_col, t_row + i); + + if (tem->tvs_isactive) { + tem_safe_callback_copy(tem, s_col, s_row + i, + e_col - cols + width, s_row + i, + t_col, t_row + i, credp, called_from); + } + } + } else { + for (int i = rows - 1; i >= 0; i--) { + int increment = i * tems.ts_c_dimension.width; + int width; - tem_safe_callback_copy(tem, s_col, s_row, - e_col, e_row, t_col, t_row, credp, called_from); + width = tem_copy_width(src + increment, + dst + increment, cols); + + tem_safe_virtual_copy(tem, s_col, s_row + i, + e_col - cols + width, s_row + i, + t_col, t_row + i); + + if (tem->tvs_isactive) { + tem_safe_callback_copy(tem, s_col, s_row + i, + e_col - cols + width, s_row + i, + t_col, t_row + i, credp, called_from); + } + } + } } static void diff --git a/usr/src/uts/common/os/modconf.c b/usr/src/uts/common/os/modconf.c index 54272275e2..a29180152b 100644 --- a/usr/src/uts/common/os/modconf.c +++ b/usr/src/uts/common/os/modconf.c @@ -793,7 +793,7 @@ mod_installsys_sysent( */ if (mp->sy_flags & SE_NOUNLOAD) { if (mp->sy_flags & SE_ARGC) { - sysp->sy_callc = (int64_t (*)())mp->sy_call; + sysp->sy_callc = (int64_t (*)())(uintptr_t)mp->sy_call; } else { sysp->sy_callc = syscall_ap; } @@ -838,7 +838,7 @@ mod_removesys_sysent( (SE_LOADED | SE_LOADABLE)) { sysp->sy_flags &= ~SE_LOADED; sysp->sy_callc = loadable_syscall; - sysp->sy_call = (int (*)())nosys; + sysp->sy_call = nosys32; rw_exit(sysp->sy_lock); return (0); } diff --git a/usr/src/uts/common/os/sunmdi.c b/usr/src/uts/common/os/sunmdi.c index 63645cfe54..5bbef59e9c 100644 --- a/usr/src/uts/common/os/sunmdi.c +++ b/usr/src/uts/common/os/sunmdi.c @@ -1742,6 +1742,12 @@ mdi_set_lb_policy(dev_info_t *cdip, client_lb_t lb) return (rv); } +static void +mdi_failover_cb(void *arg) +{ + (void)i_mdi_failover(arg); +} + /* * mdi_failover(): * failover function called by the vHCI drivers to initiate @@ -1849,8 +1855,7 @@ mdi_failover(dev_info_t *vdip, dev_info_t *cdip, int flags) * Submit the initiate failover request via CPR safe * taskq threads. */ - (void) taskq_dispatch(mdi_taskq, (task_func_t *)i_mdi_failover, - ct, KM_SLEEP); + (void) taskq_dispatch(mdi_taskq, mdi_failover_cb, ct, KM_SLEEP); return (MDI_ACCEPT); } else { /* diff --git a/usr/src/uts/common/rpc/rpcmod.c b/usr/src/uts/common/rpc/rpcmod.c index a59f6e785b..5463415c9c 100644 --- a/usr/src/uts/common/rpc/rpcmod.c +++ b/usr/src/uts/common/rpc/rpcmod.c @@ -952,9 +952,7 @@ rpcmod_hold(queue_t *q) } void -rpcmod_release(queue_t *q, mblk_t *bp, - /* LINTED E_FUNC_ARG_UNUSED */ - bool_t enable __unused) +rpcmod_release(queue_t *q, mblk_t *bp, bool_t enable __unused) { struct rpcm *rmp; @@ -2616,7 +2614,7 @@ ioc_eperm: */ break; } - /* fallthru */; + /* FALLTHROUGH */ default: if (mp->b_datap->db_type >= QPCTL) { if (mp->b_datap->db_type == M_FLUSH) { diff --git a/usr/src/uts/common/sys/fs/zfs.h b/usr/src/uts/common/sys/fs/zfs.h index 4c26edaecd..b0dbfe0f25 100644 --- a/usr/src/uts/common/sys/fs/zfs.h +++ b/usr/src/uts/common/sys/fs/zfs.h @@ -148,6 +148,7 @@ typedef enum { ZFS_PROP_DEDUP, ZFS_PROP_MLSLABEL, ZFS_PROP_SYNC, + ZFS_PROP_DNODESIZE, ZFS_PROP_REFRATIO, ZFS_PROP_WRITTEN, ZFS_PROP_CLONES, @@ -211,6 +212,7 @@ typedef enum { ZPOOL_PROP_BOOTSIZE, ZPOOL_PROP_CHECKPOINT, ZPOOL_PROP_TNAME, + ZPOOL_PROP_MAXDNODESIZE, ZPOOL_NUM_PROPS } zpool_prop_t; @@ -366,6 +368,16 @@ typedef enum { } zfs_sync_type_t; typedef enum { + ZFS_DNSIZE_LEGACY = 0, + ZFS_DNSIZE_AUTO = 1, + ZFS_DNSIZE_1K = 1024, + ZFS_DNSIZE_2K = 2048, + ZFS_DNSIZE_4K = 4096, + ZFS_DNSIZE_8K = 8192, + ZFS_DNSIZE_16K = 16384 +} zfs_dnsize_type_t; + +typedef enum { ZFS_REDUNDANT_METADATA_ALL, ZFS_REDUNDANT_METADATA_MOST } zfs_redundant_metadata_type_t; diff --git a/usr/src/uts/common/sys/systm.h b/usr/src/uts/common/sys/systm.h index 0a56d5d191..49c163838a 100644 --- a/usr/src/uts/common/sys/systm.h +++ b/usr/src/uts/common/sys/systm.h @@ -327,11 +327,11 @@ extern void param_check(void); /* * Structure of the system-entry table. * - * Changes to struct sysent should maintain binary compatibility with + * Changes to struct sysent should maintain binary compatibility with * loadable system calls, although the interface is currently private. * * This means it should only be expanded on the end, and flag values - * should not be reused. + * should not be reused. * * It is desirable to keep the size of this struct a power of 2 for quick * indexing. @@ -355,14 +355,14 @@ extern struct sysent sysent32[]; extern struct sysent nosys_ent; /* entry for invalid system call */ -#define NSYSCALL 256 /* number of system calls */ +#define NSYSCALL 256 /* number of system calls */ #define LOADABLE_SYSCALL(s) (s->sy_flags & SE_LOADABLE) #define LOADED_SYSCALL(s) (s->sy_flags & SE_LOADED) /* * sy_flags values - * Values 1, 2, and 4 were used previously for SETJUMP, ASYNC, and IOSYS. + * Values 1, 2, and 4 were used previously for SETJUMP, ASYNC, and IOSYS. */ #define SE_32RVAL1 0x0 /* handler returns int32_t in rval1 */ #define SE_32RVAL2 0x1 /* handler returns int32_t in rval2 */ @@ -408,6 +408,7 @@ extern uint_t set_errno(uint_t error); extern int64_t syscall_ap(void); extern int64_t loadable_syscall(long, long, long, long, long, long, long, long); extern int64_t nosys(void); +extern int nosys32(void); extern void swtch(void); diff --git a/usr/src/uts/intel/ia32/os/syscall.c b/usr/src/uts/intel/ia32/os/syscall.c index 45d707199a..3aa32ad95b 100644 --- a/usr/src/uts/intel/ia32/os/syscall.c +++ b/usr/src/uts/intel/ia32/os/syscall.c @@ -862,12 +862,18 @@ deferred_singlestep_trap(caddr_t pc) * flag error if lwp won't see signal immediately */ int64_t -nosys() +nosys(void) { tsignal(curthread, SIGSYS); return (set_errno(ENOSYS)); } +int +nosys32(void) +{ + return (nosys()); +} + /* * Execute a 32-bit system call on behalf of the current thread. */ |