(idvec_subtract, idvec_keep, idvec_rep, idvec_uids_rep, idvec_gids_rep,

  idvec_merge_implied_gids, idvec_verify):
    New declarations.
(idvec_equal):
  New inline function.
(idvec_is_empty):
  New function.
(idvec_contains):
  Now an inline function.
(idvec_fini):
  New macro.
(idvec_set, idvec_merge):
  Make NEW arg const.
(IDVEC_INIT):
  New macro.
(idvec_set_ids, idvec_merge_ids):
  Make IDS arg const.
(idvec_contains, idvec_tail_contains):
  Make IDVEC arg const.

1 files changed, 76 insertions, 7 deletions

diff --git a/libshouldbeinlibc/idvec.h b/libshouldbeinlibc/idvec.h
index b07605e6..806aed09 100644
--- a/libshouldbeinlibc/idvec.h
+++ b/libshouldbeinlibc/idvec.h
@@ -1,6 +1,6 @@
 /* Routines for vectors of uids/gids
 
-   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
 
    Written by Miles Bader <miles@gnu.ai.mit.edu>
 
@@ -35,11 +35,14 @@ struct idvec
   unsigned num, alloced;
 };
 
+#define IDVEC_INIT { 0 }
+
 /* Return a new, empty, idvec, or NULL if there wasn't enough memory.  */
 struct idvec *make_idvec (void);
 
 /* Free the storage pointed to by IDVEC->ids.  */
 void idvec_free_contents (struct idvec *idvec);
+#define idvec_fini idvec_free_contents
 
 /* Free IDVEC, but not the storage pointed to by the IDS field.  */
 void idvec_free_wrapper (struct idvec *idvec);
@@ -54,6 +57,23 @@ idvec_clear (struct idvec *idvec)
   idvec->num = 0;
 }
 
+/* Returns true if IDVEC contains no ids.  */
+IDVEC_EI int
+idvec_is_empty (const struct idvec *idvec)
+{
+  return idvec->num == 0;
+}
+
+/* Return true if IDVEC1 has contents identical to IDVEC2.  */
+IDVEC_EI int
+idvec_equal (const struct idvec *idvec1, const struct idvec *idvec2)
+{
+  size_t num = idvec1->num;
+  return idvec2->num == num
+    && (num == 0
+	|| memcmp (idvec1->ids, idvec2->ids, num * sizeof *idvec1->ids) == 0);
+}
+
 /* Ensure that IDVEC has enough spaced allocated to hold NUM ids, thus
    ensuring that any subsequent ids added won't return a memory allocation
    error unless it would result in more ids that NUM.  ENOMEM is returned if
@@ -65,10 +85,14 @@ error_t idvec_ensure (struct idvec *idvec, unsigned num);
 error_t idvec_grow (struct idvec *idvec, unsigned inc);
 
 /* Returns true if IDVEC contains ID, at or after position POS.  */
-int idvec_tail_contains (struct idvec *idvec, unsigned pos, uid_t id);
+int idvec_tail_contains (const struct idvec *idvec, unsigned pos, uid_t id);
 
 /* Returns true if IDVEC contains ID.  */
-int idvec_contains (struct idvec *idvec, uid_t id);
+IDVEC_EI int
+idvec_contains (const struct idvec *idvec, uid_t id)
+{
+  return idvec_tail_contains (idvec, 0, id);
+}
 
 /* Insert ID into IDVEC at position POS, returning ENOMEM if there wasn't
    enough memory, or 0.  */
@@ -88,17 +112,24 @@ error_t idvec_insert_new (struct idvec *idvec, unsigned pos, uid_t id);
 
 /* Set the ids in IDVEC to IDS (NUM elements long); delete whatever
    the previous ids were. */
-error_t idvec_set_ids (struct idvec *idvec, uid_t *ids, unsigned num);
+error_t idvec_set_ids (struct idvec *idvec, const uid_t *ids, unsigned num);
 
 /* Like idvec_set_ids, but get the new ids from new. */
-error_t idvec_set (struct idvec *idvec, struct idvec *new);
+error_t idvec_set (struct idvec *idvec, const struct idvec *new);
 
 /* Adds each id in the vector IDS (NUM elements long) to IDVEC, as if with
    idvec_add_new().  */
-error_t idvec_merge_ids (struct idvec *idvec, uid_t *ids, unsigned num);
+error_t idvec_merge_ids (struct idvec *idvec, const uid_t *ids, unsigned num);
 
 /* Adds each id from  NEW to IDVEC, as if with idvec_add_new().  */
-error_t idvec_merge (struct idvec *idvec, struct idvec *new);
+error_t idvec_merge (struct idvec *idvec, const struct idvec *new);
+
+/* Remove all ids in SUB from IDVEC, returning true if anything was done. */ 
+int idvec_subtract (struct idvec *idvec, const struct idvec *sub);
+
+/* Remove all ids from IDVEC that are *not* in KEEP, returning true if
+   anything was changed. */
+int idvec_keep (struct idvec *idvec, const struct idvec *keep);
 
 /* Remove any occurances of ID in IDVEC after position POS>  Returns true if
    anything was done.  */
@@ -128,4 +159,42 @@ error_t idvec_merge_auth (struct idvec *eff_uids, struct idvec *avail_uids,
 			  struct idvec *eff_gids, struct idvec *avail_gids,
 			  auth_t auth);
 
+/* Add to GIDS those group ids implied by the users in UIDS.  */
+error_t idvec_merge_implied_gids (struct idvec *gids, const struct idvec *uids);
+
+/* Make sure the user has the right to the ids in UIDS and GIDS, given that
+   we know he already has HAVE_UIDS and HAVE_GIDS, asking for passwords (with
+   GETPASS, which defaults to the standard libc function getpass) where
+   necessary; any of the arguments may be 0, which is treated the same as if
+   they were empty.  0 is returned if access should be allowed, otherwise
+   EINVAL if an incorrect password was entered, or an error relating to
+   resource failure.  Any uid/gid < 0 will be guaranteed to fail regardless
+   of what the user types.  */
+error_t idvec_verify (const struct idvec *uids, const struct idvec *gids,
+		      const struct idvec *have_uids,
+		      const struct idvec *have_gids,
+		      char *(*getpass_fn)(const char *prompt));
+
+/* Return a string representation of the ids in IDVEC, each id separated by
+   the string SEP (default ",").  SHOW_VALUES and SHOW_NAMES reflect how each
+   id is printed (if SHOW_NAMES is true values are used where names aren't
+   available); if both are true, the `VALUE(NAME)' format is used.
+   ID_NAME_FN is used to map each id to a name; it should return a malloced
+   string, which will be freed here.  The empty string is returned for an
+   empty list, and 0 for an allocation error.  */
+char *idvec_rep (const struct idvec *idvec,
+		 int show_values, int show_names,
+		 char *(*id_name_fn) (uid_t id),
+		 const char *sep);
+
+/* Like idvec_rep, mapping ids to user names.  */
+char *idvec_uids_rep (const struct idvec *idvec,
+		      int show_values, int show_names,
+		      const char *sep);
+
+/* Like idvec_rep, mapping ids to group names.  */
+char *idvec_gids_rep (const struct idvec *idvec,
+		      int show_values, int show_names,
+		      const char *sep);
+
 #endif /* __IDVEC_H__ */