move getmntopts(3) to libutil, build and install also it's manpage

bump libutil minor
adjust individual mount_*/Makefile to use libutil getmntopts(3)
This commit is contained in:
jdolecek 2003-03-22 12:43:57 +00:00
parent b225d94754
commit 1edd42a9d2
26 changed files with 98 additions and 101 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: shl.mi,v 1.203 2003/03/05 20:18:14 tshiozak Exp $
# $NetBSD: shl.mi,v 1.204 2003/03/22 12:44:02 jdolecek Exp $
# Note: libtermcap and libtermlib are hardlinked and share the same version.
./lib/libc.so.12.96 base-sys-shlib
./lib/libcrypt.so.0.1 base-sys-shlib
@ -10,7 +10,7 @@
./lib/libm.so.0.1 base-sys-shlib
./lib/libtermcap.so.0.5 base-sys-shlib
./lib/libtermlib.so.0.5 base-sys-shlib
./lib/libutil.so.7.1 base-sys-shlib
./lib/libutil.so.7.2 base-sys-shlib
./lib/libz.so.0.3 base-sys-shlib
./usr/lib/i18n/libBIG5.so.4.1 base-i18n-shlib
./usr/lib/i18n/libEUC.so.4.1 base-i18n-shlib
@ -63,6 +63,6 @@
./usr/lib/libtermcap.so.0.5 base-sys-shlib
./usr/lib/libtermlib.so.0.5 base-sys-shlib
./usr/lib/libusbhid.so.1.0 base-sys-shlib
./usr/lib/libutil.so.7.1 base-sys-shlib
./usr/lib/libutil.so.7.2 base-sys-shlib
./usr/lib/libwrap.so.0.2 base-net-shlib
./usr/lib/libz.so.0.3 base-sys-shlib

View File

@ -1,4 +1,4 @@
# $NetBSD: mi,v 1.545 2003/03/10 08:01:11 lukem Exp $
# $NetBSD: mi,v 1.546 2003/03/22 12:44:02 jdolecek Exp $
./usr/bin/addr2line comp-debug-bin
./usr/bin/ar comp-util-bin
./usr/bin/as comp-util-bin
@ -330,6 +330,7 @@
./usr/include/miscfs/umapfs/umap.h comp-c-include
./usr/include/miscfs/union comp-c-include
./usr/include/miscfs/union/union.h comp-c-include
./usr/include/mntopts.h comp-c-include
./usr/include/mpool.h comp-c-include
./usr/include/msdosfs comp-c-include
./usr/include/msdosfs/bootsect.h comp-c-include
@ -2066,6 +2067,7 @@
./usr/share/man/cat3/getmaxx.0 comp-c-catman
./usr/share/man/cat3/getmaxy.0 comp-c-catman
./usr/share/man/cat3/getmntinfo.0 comp-c-catman
./usr/share/man/cat3/getmntopts.0 comp-c-catman
./usr/share/man/cat3/getmode.0 comp-c-catman
./usr/share/man/cat3/getnameinfo.0 comp-c-catman
./usr/share/man/cat3/getnetbyaddr.0 comp-c-catman
@ -5117,6 +5119,7 @@
./usr/share/man/man3/getmaxx.3 comp-c-man
./usr/share/man/man3/getmaxy.3 comp-c-man
./usr/share/man/man3/getmntinfo.3 comp-c-man
./usr/share/man/man3/getmntopts.3 comp-c-man
./usr/share/man/man3/getmode.3 comp-c-man
./usr/share/man/man3/getnameinfo.3 comp-c-man
./usr/share/man/man3/getnetbyaddr.3 comp-c-man

View File

@ -1,4 +1,4 @@
/* $NetBSD: mntopts.h,v 1.11 2002/11/07 12:43:50 christos Exp $ */
/* $NetBSD: mntopts.h,v 1.1 2003/03/22 12:44:03 jdolecek Exp $ */
/*-
* Copyright (c) 1994

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.42 2002/12/12 09:45:33 scw Exp $
# $NetBSD: Makefile,v 1.43 2003/03/22 12:44:04 jdolecek Exp $
# @(#)Makefile 8.1 (Berkeley) 6/4/93
USE_SHLIBDIR= yes
@ -7,14 +7,17 @@ USE_SHLIBDIR= yes
LIB= util
CPPFLAGS+=-DLIBC_SCCS
SRCS= getbootfile.c getlabelsector.c getmaxpartitions.c getrawpartition.c \
SRCS= getbootfile.c getlabelsector.c getmaxpartitions.c \
getmntopts.c getrawpartition.c \
disklabel_dkcksum.c disklabel_scan.c \
login.c loginx.c login_cap.c login_tty.c logout.c logoutx.c \
logwtmp.c logwtmpx.c opendisk.c \
passwd.c pw_scan.c pidfile.c pidlock.c pty.c secure_path.c \
snprintb.c ttyaction.c ttymsg.c
MAN= getbootfile.3 getlabelsector.3 getmaxpartitions.3 getrawpartition.3 \
MAN= getbootfile.3 getlabelsector.3 getmaxpartitions.3 \
getmntopts.3 \
getrawpartition.3 \
login.3 login_cap.3 loginx.3 \
disklabel_dkcksum.3 disklabel_scan.3 \
opendisk.3 openpty.3 pidfile.3 pidlock.3 \

View File

@ -1,4 +1,4 @@
.\" $NetBSD: getmntopts.3,v 1.6 2002/02/08 01:30:44 ross Exp $
.\" $NetBSD: getmntopts.3,v 1.1 2003/03/22 12:44:04 jdolecek Exp $
.\"
.\" Copyright (c) 1994
.\" The Regents of the University of California. All rights reserved.
@ -33,16 +33,18 @@
.\"
.\" @(#)getmntopts.3 8.3 (Berkeley) 3/30/95
.\"
.Dd March 30, 1995
.Dd March 22, 2003
.Dt GETMNTOPTS 3
.Os
.Sh NAME
.Nm getmntopts
.Nd scan mount options
.Sh LIBRARY
.Lb libutil
.Sh SYNOPSIS
.Fd #include \*[Lt]mntopts.h\*[Gt]
.Ft void
.Fn getmntopts "char *options" "struct mntopt *mopts" "int *flagp" "int *altflagp"
.Fn getmntopts "const char *options" "const struct mntopt *mopts" "int *flagp" "int *altflagp"
.Sh DESCRIPTION
The
.Nm getmntopts
@ -71,7 +73,7 @@ The table,
has the following format:
.Bd -literal
struct mntopt {
char *m_option; /* option name */
const char *m_option; /* option name */
int m_inverse; /* is this a negative option, eg "dev" */
int m_flag; /* bit to set, eg MNT_RDONLY */
int m_altloc; /* non-zero to use altflagp rather than flagp */
@ -147,9 +149,9 @@ flag, would also have an
entry.
This can be declared and used as follows:
.Bd -literal
#include "mntopts.h"
#include <mntopts.h>
struct mntopt mopts[] = {
static const struct mntopt mopts[] = {
MOPT_STDOPTS,
MOPT_UPDATE,
{ NULL }
@ -179,3 +181,5 @@ The
.Fn getmntopts
function appeared in
.Bx 4.4 .
It was moved to utilities library in
.Nx 2.0 .

View File

@ -1,4 +1,4 @@
/* $NetBSD: getmntopts.c,v 1.6 1999/11/09 15:06:33 drochner Exp $ */
/* $NetBSD: getmntopts.c,v 1.1 2003/03/22 12:44:04 jdolecek Exp $ */
/*-
* Copyright (c) 1994
@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)getmntopts.c 8.3 (Berkeley) 3/29/95";
#else
__RCSID("$NetBSD: getmntopts.c,v 1.6 1999/11/09 15:06:33 drochner Exp $");
__RCSID("$NetBSD: getmntopts.c,v 1.1 2003/03/22 12:44:04 jdolecek Exp $");
#endif
#endif /* not lint */
@ -51,7 +51,7 @@ __RCSID("$NetBSD: getmntopts.c,v 1.6 1999/11/09 15:06:33 drochner Exp $");
#include <stdlib.h>
#include <string.h>
#include "mntopts.h"
#include <mntopts.h>
int getmnt_silent = 0;

View File

@ -1,5 +1,5 @@
# $NetBSD: shlib_version,v 1.31 2002/12/12 09:46:49 scw Exp $
# $NetBSD: shlib_version,v 1.32 2003/03/22 12:44:04 jdolecek Exp $
# Remember to update distrib/sets/lists/base/shl.* when changing
#
major=7
minor=1
minor=2

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.27 2003/01/19 12:37:41 tsutsui Exp $
# $NetBSD: Makefile,v 1.28 2003/03/22 12:44:04 jdolecek Exp $
# @(#)Makefile 8.6 (Berkeley) 5/8/95
.include <bsd.own.mk>
@ -6,9 +6,6 @@
PROG= mount
MAN= mount.8
SRCS= mount.c vfslist.c
# We do NOT install the getmntopts.3 man page.
# getmntopts.c in this directory is used by different mount programs which
# use .PATH directives to get it.
.if defined(RESCUEDIR)
CPPFLAGS+= -D_PATH_RESCUE=\"${RESCUEDIR}\"

View File

@ -1,13 +1,16 @@
# $NetBSD: Makefile,v 1.10 2002/08/19 10:16:55 lukem Exp $
# $NetBSD: Makefile,v 1.11 2003/03/22 12:43:57 jdolecek Exp $
.include <bsd.own.mk>
PROG= mount_ados
SRCS= mount_ados.c getmntopts.c fattr.c
SRCS= mount_ados.c fattr.c
MAN= mount_ados.8
MOUNT= ${NETBSDSRCDIR}/sbin/mount
CPPFLAGS+= -I${NETBSDSRCDIR}/sys -I${MOUNT}
.PATH: ${MOUNT}
DPADD+=${LIBUTIL}
LDADD+=-lutil
.include <bsd.prog.mk>

View File

@ -1,15 +1,13 @@
# $NetBSD: Makefile,v 1.8 2002/09/21 18:43:33 christos Exp $
# $NetBSD: Makefile,v 1.9 2003/03/22 12:43:58 jdolecek Exp $
# @(#)Makefile 8.3 (Berkeley) 3/27/94
.include <bsd.own.mk>
PROG= mount_cd9660
SRCS= mount_cd9660.c getmntopts.c
SRCS= mount_cd9660.c
MAN= mount_cd9660.8
MOUNT= ${NETBSDSRCDIR}/sbin/mount
CPPFLAGS+= -I${MOUNT}
.PATH: ${MOUNT}
DPADD+=${LIBUTIL}
LDADD+=-lutil

View File

@ -1,15 +1,14 @@
# $NetBSD: Makefile,v 1.4 2002/08/19 10:16:56 lukem Exp $
# $NetBSD: Makefile,v 1.5 2003/03/22 12:43:58 jdolecek Exp $
#
# $OpenBSD: Makefile,v 1.1 1996/06/27 07:20:28 downsj Exp $
.include <bsd.own.mk>
PROG= mount_ext2fs
SRCS= mount_ext2fs.c getmntopts.c
SRCS= mount_ext2fs.c
MAN= mount_ext2fs.8
MOUNT= ${NETBSDSRCDIR}/sbin/mount
CPPFLAGS+= -I${MOUNT}
.PATH: ${MOUNT}
DPADD+=${LIBUTIL}
LDADD+=-lutil
.include <bsd.prog.mk>

View File

@ -1,14 +1,13 @@
# $NetBSD: Makefile,v 1.10 2002/08/19 10:16:56 lukem Exp $
# $NetBSD: Makefile,v 1.11 2003/03/22 12:43:58 jdolecek Exp $
# @(#)Makefile 8.2 (Berkeley) 3/27/94
.include <bsd.own.mk>
PROG= mount_fdesc
SRCS= mount_fdesc.c getmntopts.c
SRCS= mount_fdesc.c
MAN= mount_fdesc.8
MOUNT= ${NETBSDSRCDIR}/sbin/mount
CPPFLAGS+= -I${MOUNT}
.PATH: ${MOUNT}
DPADD+=${LIBUTIL}
LDADD+=-lutil
.include <bsd.prog.mk>

View File

@ -1,16 +1,15 @@
# $NetBSD: Makefile,v 1.5 2002/08/19 10:16:56 lukem Exp $
# $NetBSD: Makefile,v 1.6 2003/03/22 12:43:59 jdolecek Exp $
.include <bsd.own.mk>
PROG= mount_ffs
SRCS= mount_ffs.c getmntopts.c
SRCS= mount_ffs.c
MAN= mount_ffs.8
MLINKS= mount_ffs.8 mount_ufs.8
LINKS= ${BINDIR}/mount_ffs ${BINDIR}/mount_ufs
MOUNT= ${NETBSDSRCDIR}/sbin/mount
CPPFLAGS+= -I${MOUNT}
.PATH: ${MOUNT}
DPADD+=${LIBUTIL}
LDADD+=-lutil
.include <bsd.prog.mk>

View File

@ -1,11 +1,11 @@
# $NetBSD: Makefile,v 1.5 2002/09/21 18:43:34 christos Exp $
# $NetBSD: Makefile,v 1.6 2003/03/22 12:43:59 jdolecek Exp $
#
# Makefile 1.0 1998/6/26
.include <bsd.own.mk>
PROG= mount_filecore
SRCS= mount_filecore.c getmntopts.c fattr.c
SRCS= mount_filecore.c fattr.c
MAN= mount_filecore.8
MOUNT= ${NETBSDSRCDIR}/sbin/mount

View File

@ -1,14 +1,13 @@
# $NetBSD: Makefile,v 1.10 2002/08/19 10:16:57 lukem Exp $
# $NetBSD: Makefile,v 1.11 2003/03/22 12:43:59 jdolecek Exp $
# @(#)Makefile 8.2 (Berkeley) 3/27/94
.include <bsd.own.mk>
PROG= mount_kernfs
SRCS= mount_kernfs.c getmntopts.c
SRCS= mount_kernfs.c
MAN= mount_kernfs.8
MOUNT= ${NETBSDSRCDIR}/sbin/mount
CPPFLAGS+= -I${MOUNT}
.PATH: ${MOUNT}
DPADD+=${LIBUTIL}
LDADD+=-lutil
.include <bsd.prog.mk>

View File

@ -1,14 +1,13 @@
# $NetBSD: Makefile,v 1.7 2002/08/19 10:16:57 lukem Exp $
# $NetBSD: Makefile,v 1.8 2003/03/22 12:43:59 jdolecek Exp $
# @(#)Makefile 8.2 (Berkeley) 3/27/94
.include <bsd.own.mk>
PROG= mount_lfs
SRCS= mount_lfs.c getmntopts.c
SRCS= mount_lfs.c
MAN= mount_lfs.8
MOUNT= ${NETBSDSRCDIR}/sbin/mount
CPPFLAGS+= -I${MOUNT}
.PATH: ${MOUNT}
DPADD+=${LIBUTIL}
LDADD+=-lutil
.include <bsd.prog.mk>

View File

@ -1,9 +1,9 @@
# $NetBSD: Makefile,v 1.17 2002/09/21 18:43:35 christos Exp $
# $NetBSD: Makefile,v 1.18 2003/03/22 12:44:00 jdolecek Exp $
.include <bsd.own.mk>
PROG= mount_msdos
SRCS= mount_msdos.c getmntopts.c fattr.c
SRCS= mount_msdos.c fattr.c
MAN= mount_msdos.8
MOUNT= ${NETBSDSRCDIR}/sbin/mount

View File

@ -1,15 +1,13 @@
# $NetBSD: Makefile,v 1.12 2002/09/21 18:43:36 christos Exp $
# $NetBSD: Makefile,v 1.13 2003/03/22 12:44:00 jdolecek Exp $
# @(#)Makefile 8.2 (Berkeley) 3/27/94
.include <bsd.own.mk>
PROG= mount_nfs
SRCS= mount_nfs.c getmntopts.c
SRCS= mount_nfs.c
MAN= mount_nfs.8
MOUNT= ${NETBSDSRCDIR}/sbin/mount
CPPFLAGS+= -DNFS -I${MOUNT}
.PATH: ${MOUNT}
CPPFLAGS+= -DNFS
.if defined(notdef) # XXX no kernel kerb NFS support!
.if defined(KERBEROS)

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.6 2002/09/21 18:43:36 christos Exp $
# $NetBSD: Makefile,v 1.7 2003/03/22 12:44:00 jdolecek Exp $
#
# Id: Makefile,v 1.1.1.1 1999/02/03 03:51:19 semenu Exp
#
@ -6,7 +6,7 @@
.include <bsd.own.mk>
PROG= mount_ntfs
SRCS= mount_ntfs.c getmntopts.c fattr.c
SRCS= mount_ntfs.c fattr.c
MAN= mount_ntfs.8
MOUNT= ${NETBSDSRCDIR}/sbin/mount

View File

@ -1,14 +1,15 @@
# $NetBSD: Makefile,v 1.9 2002/08/19 10:16:58 lukem Exp $
# $NetBSD: Makefile,v 1.10 2003/03/22 12:44:00 jdolecek Exp $
# @(#)Makefile 8.3 (Berkeley) 3/27/94
.include <bsd.own.mk>
PROG= mount_null
SRCS= mount_null.c getmntopts.c
SRCS= mount_null.c
MAN= mount_null.8
MOUNT= ${NETBSDSRCDIR}/sbin/mount
CPPFLAGS+= -I${NETBSDSRCDIR}/sys -I${MOUNT}
.PATH: ${MOUNT}
CPPFLAGS+= -I${NETBSDSRCDIR}/sys
DPADD+=${LIBUTIL}
LDADD+=-lutil
.include <bsd.prog.mk>

View File

@ -1,14 +1,15 @@
# $NetBSD: Makefile,v 1.2 2002/08/19 10:16:58 lukem Exp $
# $NetBSD: Makefile,v 1.3 2003/03/22 12:44:01 jdolecek Exp $
# @(#)Makefile 8.3 (Berkeley) 3/27/94
.include <bsd.own.mk>
PROG= mount_overlay
SRCS= mount_overlay.c getmntopts.c
SRCS= mount_overlay.c
MAN= mount_overlay.8
MOUNT= ${NETBSDSRCDIR}/sbin/mount
CPPFLAGS+= -I${NETBSDSRCDIR}/sys -I${MOUNT}
.PATH: ${MOUNT}
CPPFLAGS+= -I${NETBSDSRCDIR}/sys
DPADD+=${LIBUTIL}
LDADD+=-lutil
.include <bsd.prog.mk>

View File

@ -1,19 +1,20 @@
# $NetBSD: Makefile,v 1.19 2002/08/19 10:16:58 lukem Exp $
# $NetBSD: Makefile,v 1.20 2003/03/22 12:44:01 jdolecek Exp $
# @(#)Makefile 8.3 (Berkeley) 3/27/94
.include <bsd.own.mk>
PROG= mount_portal
SRCS= mount_portal.c activate.c conf.c getmntopts.c pt_conf.c \
SRCS= mount_portal.c activate.c conf.c pt_conf.c \
pt_exec.c pt_file.c pt_tcp.c pt_filter.c
SUBDIR= examples
MAN= mount_portal.8
MOUNT= ${NETBSDSRCDIR}/sbin/mount
CPPFLAGS+= -I${NETBSDSRCDIR}/sys -I${MOUNT}
.PATH: ${MOUNT}
CPPFLAGS+= -I${NETBSDSRCDIR}/sys
CPPFLAGS+= -DINET6
DPADD+=${LIBUTIL}
LDADD+=-lutil
.include <bsd.prog.mk>
.include <bsd.subdir.mk>

View File

@ -1,16 +1,12 @@
# $NetBSD: Makefile,v 1.11 2002/09/21 18:43:38 christos Exp $
# $NetBSD: Makefile,v 1.12 2003/03/22 12:44:01 jdolecek Exp $
# @(#)Makefile 8.4 (Berkeley) 3/27/94
.include <bsd.own.mk>
PROG= mount_procfs
SRCS= mount_procfs.c getmntopts.c
SRCS= mount_procfs.c
MAN= mount_procfs.8
MOUNT= ${NETBSDSRCDIR}/sbin/mount
CPPFLAGS+= -I${MOUNT}
.PATH: ${MOUNT}
DPADD+=${LIBUTIL}
LDADD+=-lutil

View File

@ -1,19 +1,17 @@
# $NetBSD: Makefile,v 1.1 2003/02/18 20:35:30 jdolecek Exp $
# $NetBSD: Makefile,v 1.2 2003/03/22 12:44:01 jdolecek Exp $
.include <bsd.own.mk>
PROG= mount_smbfs
SRCS= mount_smbfs.c getmntopts.c
SRCS= mount_smbfs.c
SRCS+= rcfile.c ctx.c cfopt.c subr.c nls.c rap.c mbuf.c rq.c file.c \
print.c kiconv.c nb.c nb_name.c nb_net.c nbns_rq.c
MAN= mount_smbfs.8
MOUNT= ${NETBSDSRCDIR}/sbin/mount
SMBDIST=${NETBSDSRCDIR}/dist/smbfs
CPPFLAGS+= -I${MOUNT} -I${NETBSDSRCDIR}/sys -I${SMBDIST}/include
CPPFLAGS+= -I${NETBSDSRCDIR}/sys -I${SMBDIST}/include
.PATH: ${MOUNT}
.PATH: ${SMBDIST}/mount_smbfs ${SMBDIST}/lib/smb
DPADD+=${LIBUTIL}

View File

@ -1,14 +1,15 @@
# $NetBSD: Makefile,v 1.8 2002/08/19 10:16:59 lukem Exp $
# $NetBSD: Makefile,v 1.9 2003/03/22 12:44:01 jdolecek Exp $
# @(#)Makefile 8.3 (Berkeley) 3/27/94
.include <bsd.own.mk>
PROG= mount_umap
SRCS= mount_umap.c getmntopts.c
SRCS= mount_umap.c
MAN= mount_umap.8
MOUNT= ${NETBSDSRCDIR}/sbin/mount
CPPFLAGS+= -I${NETBSDSRCDIR}/sys -I${MOUNT}
.PATH: ${MOUNT}
CPPFLAGS+= -I${NETBSDSRCDIR}/sys
DPADD+=${LIBUTIL}
LDADD+=-lutil
.include <bsd.prog.mk>

View File

@ -1,15 +1,13 @@
# $NetBSD: Makefile,v 1.11 2002/09/21 18:43:38 christos Exp $
# $NetBSD: Makefile,v 1.12 2003/03/22 12:44:02 jdolecek Exp $
# @(#)Makefile 8.4 (Berkeley) 7/13/94
.include <bsd.own.mk>
PROG= mount_union
SRCS= mount_union.c getmntopts.c
SRCS= mount_union.c
MAN= mount_union.8
MOUNT= ${NETBSDSRCDIR}/sbin/mount
CPPFLAGS+= -I${NETBSDSRCDIR}/sys -I${MOUNT}
.PATH: ${MOUNT}
CPPFLAGS+= -I${NETBSDSRCDIR}/sys
DPADD+=${LIBUTIL}
LDADD+=-lutil