summaryrefslogtreecommitdiff
path: root/gl/lib
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2011-02-07 15:46:09 +0100
committerJim Meyering <meyering@redhat.com>2011-02-07 15:50:44 +0100
commitb9fc790ddc0db2522b0d20d08fd2b8d40ef0fa4e (patch)
tree96b967b3a0e5ca208933a97494fee2dd142c4855 /gl/lib
parent2e636af1ef3f6a5ef872bdd2297dd25198c69395 (diff)
downloadcoreutils-b9fc790ddc0db2522b0d20d08fd2b8d40ef0fa4e.tar.xz
di-set: provide a lookup method
This is required for patch, and hence is about to move to gnulib. * gl/lib/di-set.c (di_set_lookup): New function. * gl/lib/di-set.h: Declare it. * gl/tests/test-di-set.c (main): Exercise it. The bug was introduced on 2004-12-04 via commit 7380cf79.
Diffstat (limited to 'gl/lib')
-rw-r--r--gl/lib/di-set.c22
-rw-r--r--gl/lib/di-set.h2
2 files changed, 24 insertions, 0 deletions
diff --git a/gl/lib/di-set.c b/gl/lib/di-set.c
index 05d24d609..5e839a311 100644
--- a/gl/lib/di-set.c
+++ b/gl/lib/di-set.c
@@ -235,3 +235,25 @@ di_set_insert (struct di_set *dis, dev_t dev, ino_t ino)
/* Put I into the inode set. */
return hash_insert0 (ino_set, (void *) i, NULL);
}
+
+/* Look up the DEV,INO pair in the set DIS.
+ If found, return 1; if not found, return 0.
+ Upon any failure return -1. */
+int
+di_set_lookup (struct di_set *dis, dev_t dev, ino_t ino)
+{
+ hashint i;
+
+ /* Map the device number to a set of inodes. */
+ struct hash_table *ino_set = map_device (dis, dev);
+ if (! ino_set)
+ return -1;
+
+ /* Map the inode number to a small representative I. */
+ i = map_inode_number (dis, ino);
+ if (i == INO_MAP_INSERT_FAILURE)
+ return -1;
+
+ /* Perform the look-up. */
+ return !!hash_lookup (ino_set, (void const *) i);
+}
diff --git a/gl/lib/di-set.h b/gl/lib/di-set.h
index d30a31e92..f05e8760c 100644
--- a/gl/lib/di-set.h
+++ b/gl/lib/di-set.h
@@ -10,3 +10,5 @@
struct di_set *di_set_alloc (void);
int di_set_insert (struct di_set *, dev_t, ino_t) _ATTRIBUTE_NONNULL_ (1);
void di_set_free (struct di_set *) _ATTRIBUTE_NONNULL_ (1);
+int di_set_lookup (struct di_set *dis, dev_t dev, ino_t ino)
+ _ATTRIBUTE_NONNULL_ (1);;