diff options
author | jdp <jdp@FreeBSD.org> | 1998-06-10 16:20:21 +0000 |
---|---|---|
committer | jdp <jdp@FreeBSD.org> | 1998-06-10 16:20:21 +0000 |
commit | 0b6b117e6b05808b44ecd4fa519de023521171fd (patch) | |
tree | addd25728388883b2648c1c3f929260f6f414c2c /lib | |
parent | 67afc7e5a0e36986dc0f602e5cb66eeaeb12413f (diff) | |
download | FreeBSD-src-0b6b117e6b05808b44ecd4fa519de023521171fd.zip FreeBSD-src-0b6b117e6b05808b44ecd4fa519de023521171fd.tar.gz |
Move ftok() from libcompat to libc, so that it can be closer to its
friend shmget().
PR: closes misc/6763
Diffstat (limited to 'lib')
-rw-r--r-- | lib/libc/gen/Makefile.inc | 6 | ||||
-rw-r--r-- | lib/libcompat/Makefile | 9 | ||||
-rw-r--r-- | lib/libcompat/SysV/ftok.3 | 83 | ||||
-rw-r--r-- | lib/libcompat/SysV/ftok.c | 47 |
4 files changed, 4 insertions, 141 deletions
diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc index a9ae700..ab7f571 100644 --- a/lib/libc/gen/Makefile.inc +++ b/lib/libc/gen/Makefile.inc @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.6 (Berkeley) 5/4/95 -# $Id: Makefile.inc,v 1.44 1998/02/28 03:57:02 steve Exp $ +# $Id: Makefile.inc,v 1.45 1998/03/09 06:48:25 jb Exp $ # machine-independent gen sources .PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/gen ${.CURDIR}/../libc/gen @@ -8,7 +8,7 @@ SRCS+= _rand48.c _spinlock_stub.c alarm.c arc4random.c assert.c \ clock.c closedir.c confstr.c \ crypt.c ctermid.c daemon.c devname.c disklabel.c \ dlfcn.c drand48.c erand48.c err.c errlst.c \ - exec.c fnmatch.c fstab.c fts.c getbootfile.c getbsize.c \ + exec.c fnmatch.c fstab.c ftok.c fts.c getbootfile.c getbsize.c \ getcap.c getcwd.c getdomainname.c getgrent.c getgrouplist.c \ gethostname.c getloadavg.c getlogin.c getmntinfo.c getnetgrent.c \ getosreldate.c getpagesize.c getpass.c getpwent.c getttyent.c \ @@ -38,7 +38,7 @@ CFLAGS+=-D_NLIST_DO_ELF MAN3+= alarm.3 arc4random.3 clock.3 \ confstr.3 crypt.3 ctermid.3 daemon.3 \ devname.3 directory.3 dladdr.3 dlopen.3 \ - err.3 exec.3 fnmatch.3 frexp.3 fts.3 \ + err.3 exec.3 fnmatch.3 frexp.3 ftok.3 fts.3 \ getbootfile.3 getbsize.3 getcap.3 getcwd.3 \ getdiskbyname.3 getdomainname.3 getfsent.3 \ getgrent.3 getgrouplist.3 gethostname.3 getloadavg.3 \ diff --git a/lib/libcompat/Makefile b/lib/libcompat/Makefile index 5bf8c33..36c41a5 100644 --- a/lib/libcompat/Makefile +++ b/lib/libcompat/Makefile @@ -8,8 +8,7 @@ NOPIC= .PATH: ${.CURDIR}/4.1/${MACHINE} ${.CURDIR}/4.1 \ ${.CURDIR}/4.3/${MACHINE} ${.CURDIR}/4.3 \ ${.CURDIR}/4.4/${MACHINE} ${.CURDIR}/4.4 \ - ${.CURDIR}/regexp \ - ${.CURDIR}/SysV + ${.CURDIR}/regexp # compat 4.1 sources # XXX MISSING: tell.c vlimit.c vtimes.c @@ -65,10 +64,4 @@ MAN3+= regexp/regexp.3 # MLINKS+=regexp.3 regcomp.3 regexp.3 regexec.3 regexp.3 regerror.3 MLINKS+=regexp.3 regsub.3 -# SysV compat sources -SRCS+= ftok.c - -MAN3+= SysV/ftok.3 - - .include <bsd.lib.mk> diff --git a/lib/libcompat/SysV/ftok.3 b/lib/libcompat/SysV/ftok.3 deleted file mode 100644 index 180380d..0000000 --- a/lib/libcompat/SysV/ftok.3 +++ /dev/null @@ -1,83 +0,0 @@ -.\" Copyright (c) 1994 SigmaSoft, Th. Lockert <tholo@sigmasoft.com> -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. 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. -.\" 3. The name of the author may not be used to endorse or promote products -.\" derived from this software without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. -.\" -.\" $Id: ftok.3,v 1.8 1997/03/19 00:58:07 bde Exp $ -.Dd June 24, 1994 -.Os -.Dt ftok 3 -.Sh NAME -.Nm ftok -.Nd create IPC identifier from path name -.Sh SYNOPSIS -.Fd #include <sys/types.h> -.Fd #include <sys/ipc.h> -.Ft key_t -.Fn ftok "const char *path" "int id" -.Sh DESCRIPTION -.Bf -symbolic -This function is available from the compatibility library, libcompat. -.Ef -The -.Fn ftok -function attempts to create a unique key suitable for use with the -.Xr msgget 3 , -.Xr semget 2 -and -.Xr shmget 2 -functions given the -.Fa path -of an existing file and a user-selectable -.Fa id . -.Pp -The specified -.Fa path -must specify an existing file that is accessible to the calling process -or the call will fail. Also, note that links to files will return the -same key, given the same -.Fa id . -.Sh RETURN VALUES -The -.Fn ftok -function will return -1 if -.Fa path -does not exist or if it cannot be accessed by the calling process. -.Sh SEE ALSO -.Xr semget 2 , -.Xr shmget 2 , -.Xr msgget 3 -.Sh HISTORY -The -.Fn ftok -function originates with System V and is typically used by programs -that use the System V IPC routines. -.Sh AUTHORS -.An Thorsten Lockert Aq tholo@sigmasoft.com -.Sh BUGS -The returned key is computed based on the device minor number and inode of the -specified -.Fa path -in combination with the lower 8 bits of the given -.Fa id . -Thus it is quite possible for the routine to return duplicate keys. diff --git a/lib/libcompat/SysV/ftok.c b/lib/libcompat/SysV/ftok.c deleted file mode 100644 index 4f59725..0000000 --- a/lib/libcompat/SysV/ftok.c +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (c) 1994 SigmaSoft, Th. Lockert <tholo@sigmasoft.com> - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. 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. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. - */ - -#if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$Id$"; -#endif /* LIBC_SCCS and not lint */ - -#include <sys/types.h> -#include <sys/stat.h> -#include <sys/ipc.h> - -key_t -ftok(path, id) - const char *path; - char id; -{ - struct stat st; - - if (stat(path, &st) < 0) - return (key_t)-1; - - return (key_t) (id << 24 | (st.st_dev & 0xff) << 16 | (st.st_ino & 0xffff)); -} |