summaryrefslogtreecommitdiff
path: root/libshouldbeinlibc
diff options
context:
space:
mode:
Diffstat (limited to 'libshouldbeinlibc')
-rw-r--r--libshouldbeinlibc/cacheq.c2
-rw-r--r--libshouldbeinlibc/idvec-funcs.c2
-rw-r--r--libshouldbeinlibc/idvec.c2
-rw-r--r--libshouldbeinlibc/idvec.h25
-rw-r--r--libshouldbeinlibc/localhost.c23
-rw-r--r--libshouldbeinlibc/maptime-funcs.c2
-rw-r--r--libshouldbeinlibc/maptime.h17
-rw-r--r--libshouldbeinlibc/ugids-xinl.c4
-rw-r--r--libshouldbeinlibc/ugids.c4
-rw-r--r--libshouldbeinlibc/ugids.h19
10 files changed, 75 insertions, 25 deletions
diff --git a/libshouldbeinlibc/cacheq.c b/libshouldbeinlibc/cacheq.c
index eb41c6e9..5649903a 100644
--- a/libshouldbeinlibc/cacheq.c
+++ b/libshouldbeinlibc/cacheq.c
@@ -106,7 +106,7 @@ cacheq_set_length (struct cacheq *cq, int length)
th->next = next_th;
}
- /* Call user hooks as appropiate. */
+ /* Call user hooks as appropriate. */
if (fh && th)
{
if (cq->move_entry)
diff --git a/libshouldbeinlibc/idvec-funcs.c b/libshouldbeinlibc/idvec-funcs.c
index 1bc6d85f..3bb0318d 100644
--- a/libshouldbeinlibc/idvec-funcs.c
+++ b/libshouldbeinlibc/idvec-funcs.c
@@ -1,2 +1,2 @@
-#define IDVEC_EI
+#define IDVEC_DEFINE_EI
#include "idvec.h"
diff --git a/libshouldbeinlibc/idvec.c b/libshouldbeinlibc/idvec.c
index 692c4788..24adeb8f 100644
--- a/libshouldbeinlibc/idvec.c
+++ b/libshouldbeinlibc/idvec.c
@@ -202,7 +202,7 @@ idvec_merge (struct idvec *idvec, const struct idvec *new)
return idvec_merge_ids (idvec, new->ids, new->num);
}
-/* Remove any occurances of ID in IDVEC after position POS.
+/* Remove any occurrences of ID in IDVEC after position POS.
Returns true if anything was done. */
int
idvec_remove (struct idvec *idvec, unsigned pos, uid_t id)
diff --git a/libshouldbeinlibc/idvec.h b/libshouldbeinlibc/idvec.h
index 41441259..abbc273e 100644
--- a/libshouldbeinlibc/idvec.h
+++ b/libshouldbeinlibc/idvec.h
@@ -24,9 +24,12 @@
#include <hurd/hurd_types.h>
#include <errno.h>
#include <string.h>
+#include <features.h>
-#ifndef IDVEC_EI
-#define IDVEC_EI extern inline
+#ifdef IDVEC_DEFINE_EI
+#define IDVEC_EI
+#else
+#define IDVEC_EI __extern_inline
#endif
struct idvec
@@ -50,6 +53,14 @@ void idvec_free_wrapper (struct idvec *idvec);
/* Free IDVEC and any storage associated with it. */
void idvec_free (struct idvec *idvec);
+extern void idvec_clear (struct idvec *idvec);
+
+extern int idvec_is_empty (const struct idvec *idvec);
+
+extern int idvec_equal (const struct idvec *idvec1, const struct idvec *idvec2);
+
+#if defined(__USE_EXTERN_INLINES) || defined(IDVEC_DEFINE_EI)
+
/* Mark IDVEC as not containing any ids. */
IDVEC_EI void
idvec_clear (struct idvec *idvec)
@@ -74,6 +85,8 @@ idvec_equal (const struct idvec *idvec1, const struct idvec *idvec2)
|| memcmp (idvec1->ids, idvec2->ids, num * sizeof *idvec1->ids) == 0);
}
+#endif /* Use extern inlines. */
+
/* 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
@@ -87,6 +100,10 @@ error_t idvec_grow (struct idvec *idvec, unsigned inc);
/* Returns true if IDVEC contains ID, at or after position POS. */
int idvec_tail_contains (const struct idvec *idvec, unsigned pos, uid_t id);
+extern int idvec_contains (const struct idvec *idvec, uid_t id);
+
+#if defined(__USE_EXTERN_INLINES) || defined(IDVEC_DEFINE_EI)
+
/* Returns true if IDVEC contains ID. */
IDVEC_EI int
idvec_contains (const struct idvec *idvec, uid_t id)
@@ -94,6 +111,8 @@ idvec_contains (const struct idvec *idvec, uid_t id)
return idvec_tail_contains (idvec, 0, id);
}
+#endif /* Use extern inlines. */
+
/* Insert ID into IDVEC at position POS, returning ENOMEM if there wasn't
enough memory, or 0. */
error_t idvec_insert (struct idvec *idvec, unsigned pos, uid_t id);
@@ -131,7 +150,7 @@ int idvec_subtract (struct idvec *idvec, const struct idvec *sub);
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
+/* Remove any occurrences of ID in IDVEC after position POS> Returns true if
anything was done. */
int idvec_remove (struct idvec *idvec, unsigned pos, uid_t id);
diff --git a/libshouldbeinlibc/localhost.c b/libshouldbeinlibc/localhost.c
index f0c67541..f0225116 100644
--- a/libshouldbeinlibc/localhost.c
+++ b/libshouldbeinlibc/localhost.c
@@ -39,18 +39,27 @@ localhost ()
errno = 0;
if (buf) {
+ char *new;
buf_len += buf_len;
- buf = realloc (buf, buf_len);
+ new = realloc (buf, buf_len);
+ if (! new)
+ {
+ free (buf);
+ buf = 0;
+ errno = ENOMEM;
+ return 0;
+ }
+ else
+ buf = new;
} else {
buf_len = 128; /* Initial guess */
buf = malloc (buf_len);
+ if (! buf)
+ {
+ errno = ENOMEM;
+ return 0;
+ }
}
-
- if (! buf)
- {
- errno = ENOMEM;
- return 0;
- }
} while ((gethostname(buf, buf_len) == 0 && !memchr (buf, '\0', buf_len))
|| errno == ENAMETOOLONG);
diff --git a/libshouldbeinlibc/maptime-funcs.c b/libshouldbeinlibc/maptime-funcs.c
index eeac3b3e..080e3ae6 100644
--- a/libshouldbeinlibc/maptime-funcs.c
+++ b/libshouldbeinlibc/maptime-funcs.c
@@ -1,4 +1,4 @@
-#define MAPTIME_EI
+#define MAPTIME_DEFINE_EI
#include <errno.h>
#include <sys/types.h>
#include <sys/time.h>
diff --git a/libshouldbeinlibc/maptime.h b/libshouldbeinlibc/maptime.h
index ac97b411..947ad640 100644
--- a/libshouldbeinlibc/maptime.h
+++ b/libshouldbeinlibc/maptime.h
@@ -21,13 +21,16 @@
#ifndef __MAPTIME_H__
#define __MAPTIME_H__
-#ifndef MAPTIME_EI
-#define MAPTIME_EI extern inline
-#endif
-
#include <mach/time_value.h>
#include <sys/time.h>
#include <errno.h>
+#include <features.h>
+
+#ifdef MAPTIME_DEFINE_EI
+#define MAPTIME_EI
+#else
+#define MAPTIME_EI __extern_inline
+#endif
/* Return the mach mapped time page in MTIME. If USE_MACH_DEV is false, then
the hurd time device DEV_NAME, or "/dev/time" if DEV_NAME is 0, is
@@ -37,6 +40,10 @@
error_t maptime_map (int use_mach_dev, char *dev_name,
volatile struct mapped_time_value **mtime);
+extern void maptime_read (volatile struct mapped_time_value *mtime, struct timeval *tv);
+
+#if defined(__USE_EXTERN_INLINES) || defined(MAPTIME_DEFINE_EI)
+
/* Read the current time from MTIME into TV. This should be very fast. */
MAPTIME_EI void
maptime_read (volatile struct mapped_time_value *mtime, struct timeval *tv)
@@ -49,4 +56,6 @@ maptime_read (volatile struct mapped_time_value *mtime, struct timeval *tv)
while (tv->tv_sec != mtime->check_seconds);
}
+#endif /* Use extern inlines. */
+
#endif /* __MAPTIME_H__ */
diff --git a/libshouldbeinlibc/ugids-xinl.c b/libshouldbeinlibc/ugids-xinl.c
index 26df93cc..107de8b9 100644
--- a/libshouldbeinlibc/ugids-xinl.c
+++ b/libshouldbeinlibc/ugids-xinl.c
@@ -19,7 +19,5 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#define UGIDS_EI
-#undef __OPTIMIZE__
-#define __OPTIMIZE__ 1
+#define UGIDS_DEFINE_EI
#include "ugids.h"
diff --git a/libshouldbeinlibc/ugids.c b/libshouldbeinlibc/ugids.c
index 057dcf81..2b9b6b71 100644
--- a/libshouldbeinlibc/ugids.c
+++ b/libshouldbeinlibc/ugids.c
@@ -49,7 +49,7 @@ ugids_add_gid (struct ugids *ugids, gid_t gid, int avail)
error_t err =
idvec_add_new (avail ? &ugids->avail_gids : &ugids->eff_gids, gid);
if (! err)
- /* Since this gid is now explicit, remove it from the appropiate implied
+ /* Since this gid is now explicit, remove it from the appropriate implied
set. */
idvec_remove (avail ? &ugids->imp_avail_gids : &ugids->imp_eff_gids,
0, gid);
@@ -70,7 +70,7 @@ ugids_add_user (struct ugids *ugids, uid_t uid, int avail)
idvec_merge_implied_gids (&imp_gids, &uids);
/* Now remove any gids we already know about from IMP_GIDS. For gids
- that weren't in the appropiate implied set before, this will
+ that weren't in the appropriate implied set before, this will
ensure that they remain out after we merge IMP_GIDS into it, and
ones that *were*, they will remain so. */
idvec_subtract (&imp_gids, gids);
diff --git a/libshouldbeinlibc/ugids.h b/libshouldbeinlibc/ugids.h
index 8440b608..10e7a242 100644
--- a/libshouldbeinlibc/ugids.h
+++ b/libshouldbeinlibc/ugids.h
@@ -23,9 +23,12 @@
#include <stdlib.h> /* For inline function stuff. */
#include <idvec.h>
+#include <features.h>
-#ifndef UGIDS_EI
-#define UGIDS_EI extern inline
+#ifdef UGIDS_DEFINE_EI
+#define UGIDS_EI
+#else
+#define UGIDS_EI __extern_inline
#endif
/* A structure holding a set of the common various types of ids. */
@@ -47,6 +50,16 @@ struct ugids
/* Return a new ugids structure, or 0 if an allocation error occurs. */
struct ugids *make_ugids ();
+extern void ugids_fini (struct ugids *ugids);
+
+extern void ugids_free (struct ugids *ugids);
+
+extern int ugids_is_empty (const struct ugids *ugids);
+
+extern int ugids_equal (const struct ugids *ugids1, const struct ugids *ugids2);
+
+#if defined(__USE_EXTERN_INLINES) || defined(UGIDS_DEFINE_EI)
+
/* Free all resources used by UGIDS except UGIDS itself. */
UGIDS_EI void
ugids_fini (struct ugids *ugids)
@@ -93,6 +106,8 @@ ugids_equal (const struct ugids *ugids1, const struct ugids *ugids2)
&& idvec_equal (&ugids1->imp_avail_gids, &ugids2->imp_avail_gids);
}
+#endif /* Use extern inlines. */
+
/* Add all ids in NEW to UGIDS. */
error_t ugids_merge (struct ugids *ugids, const struct ugids *new);
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-06 22:03:21 +0000