about summary refs log tree commit diff
path: root/sysvipc
diff options
context:
space:
mode:
Diffstat (limited to 'sysvipc')
-rw-r--r--sysvipc/Makefile5
-rw-r--r--sysvipc/ftok.c4
2 files changed, 5 insertions, 4 deletions
diff --git a/sysvipc/Makefile b/sysvipc/Makefile
index 7cedab62e9..2e9471bbc3 100644
--- a/sysvipc/Makefile
+++ b/sysvipc/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1995 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1996 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -24,7 +24,8 @@ subdir	:= sysvipc
 headers	:= sys/ipc.h sys/msg.h sys/sem.h sys/shm.h \
 	   sys/ipc_buf.h sys/msq_buf.h sys/sem_buf.h sys/shm_buf.h
 
-routines := msgsnd msgrcv msgget msgctl \
+routines := ftok \
+	    msgsnd msgrcv msgget msgctl \
 	    semop semget semctl \
 	    shmat shmdt shmget shmctl
 
diff --git a/sysvipc/ftok.c b/sysvipc/ftok.c
index 4ecc3e6822..20d98b9d33 100644
--- a/sysvipc/ftok.c
+++ b/sysvipc/ftok.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 1996 Free Software Foundation, Inc.
 This file is part of the GNU C Library.
 Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, August 1995.
 
@@ -31,7 +31,7 @@ ftok (pathname, proj_id)
   if (__stat (pathname, &st) < 0)
     return (key_t) -1;
 
-  key = (st.st_ino & 0xffff) | ((st.st_dev & 0xff) << 16) | (id << 24);
+  key = (st.st_ino & 0xffff) | ((st.st_dev & 0xff) << 16) | (proj_id << 24);
 
   return key;
 }