Update.cvs/libc-ud-970507

	* locale/categories.def: Change type of _NL_CTYPE_CLASS_NAMES and
	_NL_CTYPE_MAP_NAMES field to stringlist.
	Change name of _NL_CTYPE_CODESET_NAME to "charmap".
	* locale/localeinfo.h (enum value_type): Add stringlist.
	* locale/programs/locale.c (show_info): Handle stringlist.

	* locale/programs/charmap.c (charmap_read): If charmap file is not
	using the given name try to find it by looking through all available
	charmap files and compare the code set name.
	* locale/programs/locale.c (write_charmaps): Also print names of
	charset in <code_set_name> fields in the files.

	* elf/ldd.bash.in: Correct translatable strings.

	* posix/TESTS: Add some more tests for character class matching.
	* posix/regex.c: Merge with GNU awk version.
	(regex_compile): Use ISO C/amend 1 functions for character class
	handling.
	* posix/regex.h: Merge with GNU awk version.

	* posix/getopt.c: Declare as master copies.
	* posix/getopt1.c: Likewise.
	* posix/getopt.h: Likewise.

	* sysdeps/unix/sysv/linux/sys/mount.h: Add definitions for option
	value to mount functions.
	Patch by a sun <asun@zoology.washington.edu>.

	* stdio-common/bug4.c (main): Use /tmp/bug4.test for concurrency
	with other tests.
	* sunrpc/svc_run.c (svc_exit): New, defined.
	(svc_run): Test for svc_stop variable.
	* sysdeps/m68k/s_cexp.c: Rewritten.
	* sysdeps/m68k/s_cexpf.c: Likewise.
	* sysdeps/m68k/s_cexpl.c: Likewise.

1 files changed, 45 insertions, 44 deletions

diff --git a/nis/rpcsvc/nislib.h b/nis/rpcsvc/nislib.h
index fa3ee4f65d..cbd8fbde51 100644
--- a/nis/rpcsvc/nislib.h
+++ b/nis/rpcsvc/nislib.h
@@ -29,58 +29,58 @@ typedef const char *const_nis_name;
 /* nis_names: These functions are used to locate and manipulate all NIS+
  * objects except the NIS+ entry objects.
  *
- * nis_lookup (name, flags) resolves a NIS+ name and returns a copy of 
+ * nis_lookup (name, flags) resolves a NIS+ name and returns a copy of
  *                          that object  from a NIS+ server.
  *    const nis_name name: name of the object to be resolved
- *    u_long flags: logically ORing zero or more flags (FOLLOW_LINKS, 
- *                  HARD_LOOKUP, [NO_CACHE], MASTER_ONLY, EXPAND_NAME) 
- *   
+ *    u_long flags: logically ORing zero or more flags (FOLLOW_LINKS,
+ *                  HARD_LOOKUP, [NO_CACHE], MASTER_ONLY, EXPAND_NAME)
+ *
  * nis_add (name, obj) adds objects to the NIS+ namespace.
  *    const nis_name name: fully qualified NIS+ name.
- *    const nis_object *obj: object members zo_name and zo_domain will be 
+ *    const nis_object *obj: object members zo_name and zo_domain will be
  *                           constructed from name.
  *
  * nis_remove (name, obj) removes objects from the NIS+ namespace.
  *    const nis_name name: fully qualified NIS+ name.
- *    const nis_object *obj: if not NULL, it is assumed to point to a copy 
- *                           of the object being removed. In this case, if 
+ *    const nis_object *obj: if not NULL, it is assumed to point to a copy
+ *                           of the object being removed. In this case, if
  *                           the object on the server does not have the same
  *                           object identifier as the  object  being  passed,
- *                           the operation will fail with the NIS_NOTSAMEOBJ 
+ *                           the operation will fail with the NIS_NOTSAMEOBJ
  *                           error.
  *
- * nis_modify (name, obj) can change specific attributes of an object 
+ * nis_modify (name, obj) can change specific attributes of an object
  *                        that already exists in the namespace.
  */
 extern nis_result *nis_lookup __P ((const_nis_name name, u_long flags));
 extern nis_result *nis_add __P ((const_nis_name name, const nis_object *obj));
 extern nis_result *nis_remove __P ((const_nis_name name,
 				    const nis_object *obj));
-extern nis_result *nis_modify __P ((const_nis_name name, 
+extern nis_result *nis_modify __P ((const_nis_name name,
 				    const nis_object *obj));
 
 /* nis_tables: These functions are used to search and modify NIS+ tables.
  *
- * nis_list (table_name, flags, callback(table_name, obj, userdata), userdata) 
+ * nis_list (table_name, flags, callback(table_name, obj, userdata), userdata)
  *           search a table in the NIS+ namespace.
  *    const nis_name table_name: indexed name ([xx=yy],table.dir)
  *    u_long flags: logically ORing one or more flags (FOLLOW_LINKS,
  *                  [FOLLOW_PATH], HARD_LOOKUP, [ALL_RESULTS], [NO_CACHE],
  *                  MASTER_ONLY, EXPAND_NAME, RETURN_RESULT)
- *    callback(): callback is an optional pointer to a function that will 
- *                process the ENTRY type objects that are returned from the 
+ *    callback(): callback is an optional pointer to a function that will
+ *                process the ENTRY type objects that are returned from the
  *                search. If this pointer is NULL, then all entries that match
  *                the search criteria are returned in the nis_result structure,
- *                otherwise  this  function  will  be  called once for each 
+ *                otherwise  this  function  will  be  called once for each
  *                entry returned.
- *    void *userdata: passed to callback function along with the returned 
+ *    void *userdata: passed to callback function along with the returned
  *                    entry object.
  *
  * nis_add_entry (table_name, obj, flags) will add the NIS+ object to the
  *                                        NIS+ table_name.
  *    const nis_name table_name
  *    const nis_object *obj
- *    u_long flags: 0, ADD_OVERWRITE, RETURN_RESULT 
+ *    u_long flags: 0, ADD_OVERWRITE, RETURN_RESULT
  *
  * nis_modify_entry (name, obj, flags) modifies an object identified by name.
  *    const nis_name name: object identifier
@@ -95,15 +95,15 @@ extern nis_result *nis_modify __P ((const_nis_name name,
  *    const nis_object *obj: if obj is non-null, it is presumed to point to
  *                           a cached copy of the entry. When the removal is
  *                           attempted, and the object that would be removed
- *                           is not the same as the cached object pointed to 
- *                           by object then the operation will fail with an 
+ *                           is not the same as the cached object pointed to
+ *                           by object then the operation will fail with an
  *                           NIS_NOTSAMEOBJ error
  *    u_long flags: 0, REM_MULTIPLE
  *
  * nis_first_entry (table_name) fetches entries from a table one at a time.
  *    const nis_name table_name
  *
- * nis_next_entry (table_name, cookie) retrieves the "next" entry from a 
+ * nis_next_entry (table_name, cookie) retrieves the "next" entry from a
  *                                     table specified by table_name.
  *    const nis_name table_name:
  *    const netobj *cookie: The value of cookie from the nis_result structure
@@ -117,25 +117,25 @@ extern nis_result *nis_list __P ((const_nis_name name, u_long flags,
 extern nis_result *nis_add_entry __P ((const_nis_name table_name,
 				       const nis_object *obj, u_long flags));
 extern nis_result *nis_modify_entry __P ((const_nis_name name,
-					  const nis_object *obj, 
+					  const nis_object *obj,
 					  u_long flags));
 extern nis_result *nis_remove_entry __P ((const_nis_name table_name,
 					  const nis_object *obj,
 					  u_long flags));
 extern nis_result *nis_first_entry __P ((const_nis_name table_name));
-extern nis_result *nis_next_entry __P ((const_nis_name table_name, 
+extern nis_result *nis_next_entry __P ((const_nis_name table_name,
 					const netobj *cookie));
 /*
 ** nis_server
 */
-extern nis_error nis_mkdir __P ((const_nis_name dirname, 
+extern nis_error nis_mkdir __P ((const_nis_name dirname,
 				 const nis_server *machine));
-extern nis_error nis_rmdir __P ((const_nis_name dirname, 
+extern nis_error nis_rmdir __P ((const_nis_name dirname,
 				 const nis_server *machine));
-extern nis_error nis_servstate __P ((const nis_server *machine, 
-				     const nis_tag *tags, int numtags, 
+extern nis_error nis_servstate __P ((const nis_server *machine,
+				     const nis_tag *tags, int numtags,
 				     nis_tag **result));
-extern nis_error nis_stats __P ((const nis_server *machine, 
+extern nis_error nis_stats __P ((const nis_server *machine,
 				 const nis_tag *tags, int numtags,
 				 nis_tag **result));
 extern void nis_freetags __P ((nis_tag *tags, int numtags));
@@ -146,7 +146,7 @@ extern void nis_freeservlist __P ((nis_server **machines));
 ** nis_subr
 */
 extern nis_name nis_leaf_of __P ((const_nis_name name));
-extern nis_name nis_leaf_of_r __P ((const_nis_name name, char *buffer, 
+extern nis_name nis_leaf_of_r __P ((const_nis_name name, char *buffer,
 				    size_t buflen));
 extern nis_name nis_name_of __P ((const_nis_name name));
 extern nis_name nis_name_of_r __P ((const_nis_name name, char *buffer,
@@ -157,7 +157,7 @@ extern nis_name nis_domain_of_r __P ((const_nis_name name, char *buffer,
 extern nis_name *nis_getnames __P ((const_nis_name name));
 extern void nis_freenames __P ((nis_name *namelist));
 extern name_pos nis_dir_cmp __P ((const_nis_name n1, const_nis_name n2));
-extern nis_object *nis_clone_object __P ((const nis_object *src, 
+extern nis_object *nis_clone_object __P ((const nis_object *src,
 					  nis_object *dest));
 extern void nis_destroy_object __P ((nis_object *obj));
 extern void nis_print_object __P ((const nis_object *obj));
@@ -182,11 +182,11 @@ extern char *nis_sperror_r __P ((const nis_error status, const char *label,
 /*
 ** nis_groups
 */
-extern bool_t nis_ismember __P ((const_nis_name principal, 
+extern bool_t nis_ismember __P ((const_nis_name principal,
 				 const_nis_name group));
-extern nis_error nis_addmember __P ((const_nis_name member, 
+extern nis_error nis_addmember __P ((const_nis_name member,
 				     const_nis_name group));
-extern nis_error nis_removemember __P ((const_nis_name member, 
+extern nis_error nis_removemember __P ((const_nis_name member,
 					const_nis_name group));
 extern nis_error nis_creategroup __P ((const_nis_name group, u_long flags));
 extern nis_error nis_destroygroup __P ((const_nis_name group));
@@ -224,20 +224,18 @@ extern bool_t nis_write_obj __P ((const char *file, const nis_object *obj));
 */
 extern directory_obj *nis_clone_directory __P ((const directory_obj *src,
 						directory_obj *dest));
-extern group_obj *nis_clone_group __P ((const group_obj *src, 
+extern group_obj *nis_clone_group __P ((const group_obj *src,
 					group_obj *dest));
-extern table_obj *nis_clone_table __P ((const table_obj *src, 
+extern table_obj *nis_clone_table __P ((const table_obj *src,
 					table_obj *dest));
-extern entry_obj *nis_clone_entry __P ((const entry_obj *src, 
+extern entry_obj *nis_clone_entry __P ((const entry_obj *src,
 					entry_obj *dest));
 extern link_obj *nis_clone_link __P ((const link_obj *src, link_obj *dest));
 extern objdata *nis_clone_objdata __P ((const objdata *src, objdata *dest));
-extern nis_result *nis_clone_result __P ((const nis_result *src, 
+extern nis_result *nis_clone_result __P ((const nis_result *src,
 					  nis_result *dest));
 
-/*
-** nis_free - nis_freeresult
-*/
+/* nis_free - nis_freeresult */
 extern void nis_freeresult __P ((nis_result *result));
 /* (XXX THE FOLLOWING ARE INTERNAL FUNCTIONS, SHOULD NOT BE USED !!) */
 extern void nis_free_attr __P ((nis_attr *attr));
@@ -251,12 +249,15 @@ extern void nis_free_entry __P ((entry_obj *enobj));
 extern void nis_free_link __P ((link_obj *lnkobj));
 extern void nis_free_object __P ((nis_object *obj));
 
-/* This is the SUN definition, but I don't know for what we need
-   the directory_obj parameter */
-/* extern fd_result *nis_finddirectory __P ((directory_obj *, nis_name)); */
-extern fd_result *__nis_finddirectory __P ((const_nis_name name));
-extern int __start_clock(int);
-extern u_long __stop_clock(int);
+/* (XXX INTERNAL FUNCTIONS, SHOULD NOT BE USED !!) */
+extern nis_name __nis_default_owner __P ((char *));
+extern nis_name __nis_default_group __P ((char *));
+extern u_long __nis_default_ttl __P ((char *));
+extern u_long __nis_default_access __P ((char *, u_long));
+extern fd_result *__nis_finddirectory __P ((directory_obj *, nis_name));
+extern log_result *__nis_dumplog __P ((nis_server *,nis_name, u_long));
+extern log_result *__nis_dump __P ((nis_server *, nis_name,
+				    int (*)(nis_name, nis_object *, void *)));
 
 __END_DECLS