PERFORCE change 85643 for review
soc-bushman
soc-bushman at FreeBSD.org
Fri Oct 21 06:48:36 PDT 2005
http://perforce.freebsd.org/chv.cgi?CH=85643
Change 85643 by soc-bushman at soc-bushman_stinger on 2005/10/21 13:47:54
branch integrated
Affected files ...
.. //depot/projects/soc2005/nsswitch_cached/src/include/Makefile#2 edit
.. //depot/projects/soc2005/nsswitch_cached/src/include/histedit.h#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/include/netdb.h#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/include/pthread.h#2 integrate
.. //depot/projects/soc2005/nsswitch_cached/src/include/wchar.h#2 integrate
Differences ...
==== //depot/projects/soc2005/nsswitch_cached/src/include/Makefile#2 (text+ko) ====
==== //depot/projects/soc2005/nsswitch_cached/src/include/histedit.h#2 (text+ko) ====
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -34,8 +30,8 @@
* SUCH DAMAGE.
*
* @(#)histedit.h 8.2 (Berkeley) 1/3/94
- * $NetBSD: histedit.h,v 1.15 2000/02/28 17:41:05 chopps Exp $
- * $FreeBSD: src/include/histedit.h,v 1.9 2003/07/14 16:31:20 imp Exp $
+ * $NetBSD: histedit.h,v 1.28 2005/07/14 15:00:58 christos Exp $
+ * $FreeBSD: src/include/histedit.h,v 1.10 2005/08/07 20:51:52 stefanf Exp $
*/
/*
@@ -52,6 +48,7 @@
/*
* ==== Editing ====
*/
+
typedef struct editline EditLine;
/*
@@ -63,7 +60,6 @@
const char *lastchar;
} LineInfo;
-
/*
* EditLine editor function return codes.
* For user-defined function interface
@@ -83,16 +79,15 @@
* Initialization, cleanup, and resetting
*/
EditLine *el_init(const char *, FILE *, FILE *, FILE *);
+void el_end(EditLine *);
void el_reset(EditLine *);
-void el_end(EditLine *);
-
/*
* Get a line, a character or push a string back in the input queue
*/
const char *el_gets(EditLine *, int *);
int el_getc(EditLine *, char *);
-void el_push(EditLine *, const char *);
+void el_push(EditLine *, char *);
/*
* Beep!
@@ -103,13 +98,16 @@
* High level function internals control
* Parses argc, argv array and executes builtin editline commands
*/
-int el_parse(EditLine *, int, char **);
+int el_parse(EditLine *, int, const char **);
/*
* Low level editline access functions
*/
int el_set(EditLine *, int, ...);
int el_get(EditLine *, int, void *);
+#if 0
+unsigned char _el_fn_complete(EditLine *, int);
+#endif
/*
* el_set/el_get parameters
@@ -128,7 +126,13 @@
#define EL_HIST 10 /* , hist_fun_t, const char *); */
#define EL_EDITMODE 11 /* , int); */
#define EL_RPROMPT 12 /* , el_pfunc_t); */
+#define EL_GETCFN 13 /* , el_rfunc_t); */
+#define EL_CLIENTDATA 14 /* , void *); */
+#define EL_UNBUFFERED 15 /* , int); */
+#define EL_PREP_TERM 16 /* , int); */
+#define EL_BUILTIN_GETCFN (NULL)
+
/*
* Source named file or $PWD/.editrc or $HOME/.editrc
*/
@@ -155,6 +159,7 @@
int el_insertstr(EditLine *, const char *);
void el_deletestr(EditLine *, int);
+
/*
* ==== History ====
*/
@@ -183,7 +188,7 @@
#define H_PREV 5 /* , void); */
#define H_NEXT 6 /* , void); */
#define H_CURR 8 /* , const int); */
-#define H_SET 7 /* , void); */
+#define H_SET 7 /* , int); */
#define H_ADD 9 /* , const char *); */
#define H_ENTER 10 /* , const char *); */
#define H_APPEND 11 /* , const char *); */
@@ -195,6 +200,27 @@
#define H_LOAD 17 /* , const char *); */
#define H_SAVE 18 /* , const char *); */
#define H_CLEAR 19 /* , void); */
+#define H_SETUNIQUE 20 /* , int); */
+#define H_GETUNIQUE 21 /* , void); */
+#define H_DEL 22 /* , int); */
+
+
+/*
+ * ==== Tokenization ====
+ */
+
+typedef struct tokenizer Tokenizer;
+
+/*
+ * String tokenization functions, using simplified sh(1) quoting rules
+ */
+Tokenizer *tok_init(const char *);
+void tok_end(Tokenizer *);
+void tok_reset(Tokenizer *);
+int tok_line(Tokenizer *, const LineInfo *,
+ int *, const char ***, int *, int *);
+int tok_str(Tokenizer *, const char *,
+ int *, const char ***);
__END_DECLS
==== //depot/projects/soc2005/nsswitch_cached/src/include/netdb.h#2 (text+ko) ====
@@ -55,7 +55,7 @@
/*
* @(#)netdb.h 8.1 (Berkeley) 6/2/93
* From: Id: netdb.h,v 8.9 1996/11/19 08:39:29 vixie Exp $
- * $FreeBSD: src/include/netdb.h,v 1.38 2005/06/03 03:32:06 ume Exp $
+ * $FreeBSD: src/include/netdb.h,v 1.39 2005/07/22 18:21:28 ume Exp $
*/
#ifndef _NETDB_H_
@@ -63,8 +63,6 @@
#include <sys/cdefs.h>
#include <sys/_types.h>
-#include <machine/_limits.h>
-#include <machine/endian.h>
#ifndef _SIZE_T_DECLARED
typedef __size_t size_t;
@@ -125,29 +123,12 @@
int p_proto; /* protocol # */
};
-/*
- * Note: ai_addrlen used to be a size_t, per RFC 2553.
- * In XNS5.2, and subsequently in POSIX-2001 and RFC 3493 it was
- * changed to a socklen_t.
- * To accomodate for this while preserving binary compatibility with the
- * old interface, we prepend or append 32 bits of padding, depending on
- * the (LP64) architecture's endianness.
- *
- * This should be deleted the next time the libc major number is
- * incremented.
- */
struct addrinfo {
int ai_flags; /* AI_PASSIVE, AI_CANONNAME, AI_NUMERICHOST */
int ai_family; /* PF_xxx */
int ai_socktype; /* SOCK_xxx */
int ai_protocol; /* 0 or IPPROTO_xxx for IPv4 and IPv6 */
-#if __LONG_BIT == 64 && _BYTE_ORDER == _BIG_ENDIAN
- uint32_t __ai_pad0; /* ABI compatibility */
-#endif
socklen_t ai_addrlen; /* length of ai_addr */
-#if __LONG_BIT == 64 && _BYTE_ORDER == _LITTLE_ENDIAN
- uint32_t __ai_pad0; /* ABI compatibility */
-#endif
char *ai_canonname; /* canonical name for hostname */
struct sockaddr *ai_addr; /* binary address */
struct addrinfo *ai_next; /* next structure in linked list */
==== //depot/projects/soc2005/nsswitch_cached/src/include/pthread.h#2 (text+ko) ====
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/include/pthread.h,v 1.36 2005/05/31 15:18:17 rodrigc Exp $
+ * $FreeBSD: src/include/pthread.h,v 1.39 2005/09/01 15:33:22 stefanf Exp $
*/
#ifndef _PTHREAD_H_
#define _PTHREAD_H_
@@ -39,20 +39,20 @@
* Header files.
*/
#include <sys/cdefs.h>
-#include <sys/types.h>
#include <sys/_pthreadtypes.h>
-#include <sys/time.h>
-#include <sys/signal.h>
-#include <limits.h>
+#include <machine/_limits.h>
+#include <machine/_types.h>
+#include <sys/_sigset.h>
#include <sched.h>
+#include <time.h>
/*
* Run-time invariant values:
*/
#define PTHREAD_DESTRUCTOR_ITERATIONS 4
#define PTHREAD_KEYS_MAX 256
-#define PTHREAD_STACK_MIN MINSIGSTKSZ
-#define PTHREAD_THREADS_MAX ULONG_MAX
+#define PTHREAD_STACK_MIN __MINSIGSTKSZ
+#define PTHREAD_THREADS_MAX __ULONG_MAX
#define PTHREAD_BARRIER_SERIAL_THREAD -1
/*
@@ -121,8 +121,6 @@
*
* PTHREAD_MUTEX_NORMAL
* PTHREAD_MUTEX_RECURSIVE
- * MUTEX_TYPE_FAST (deprecated)
- * MUTEX_TYPE_COUNTING_FAST (deprecated)
*
* will deviate from POSIX specified semantics.
*/
@@ -130,23 +128,19 @@
PTHREAD_MUTEX_ERRORCHECK = 1, /* Default POSIX mutex */
PTHREAD_MUTEX_RECURSIVE = 2, /* Recursive mutex */
PTHREAD_MUTEX_NORMAL = 3, /* No error checking */
- MUTEX_TYPE_MAX
+ PTHREAD_MUTEX_TYPE_MAX
};
#define PTHREAD_MUTEX_DEFAULT PTHREAD_MUTEX_ERRORCHECK
-#define MUTEX_TYPE_FAST PTHREAD_MUTEX_NORMAL
-#define MUTEX_TYPE_COUNTING_FAST PTHREAD_MUTEX_RECURSIVE
/*
* Thread function prototype definitions:
*/
__BEGIN_DECLS
-int pthread_atfork(void (*prepare)(void), void (*parent)(void),
- void (*child)(void));
+int pthread_atfork(void (*)(void), void (*)(void), void (*)(void));
int pthread_attr_destroy(pthread_attr_t *);
int pthread_attr_getstack(const pthread_attr_t * __restrict,
- void ** __restrict stackaddr,
- size_t * __restrict stacksize);
+ void ** __restrict, size_t * __restrict);
int pthread_attr_getstacksize(const pthread_attr_t *, size_t *);
int pthread_attr_getguardsize(const pthread_attr_t *, size_t *);
int pthread_attr_getstackaddr(const pthread_attr_t *, void **);
@@ -167,7 +161,7 @@
int pthread_barrierattr_init(pthread_barrierattr_t *);
int pthread_barrierattr_setpshared(pthread_barrierattr_t *, int);
void pthread_cleanup_pop(int);
-void pthread_cleanup_push(void (*) (void *), void *routine_arg);
+void pthread_cleanup_push(void (*) (void *), void *);
int pthread_condattr_destroy(pthread_condattr_t *);
int pthread_condattr_init(pthread_condattr_t *);
int pthread_condattr_getclock(const pthread_condattr_t *,
@@ -226,7 +220,7 @@
int pthread_rwlockattr_destroy(pthread_rwlockattr_t *);
pthread_t pthread_self(void);
int pthread_setspecific(pthread_key_t, const void *);
-int pthread_sigmask(int, const sigset_t *, sigset_t *);
+int pthread_sigmask(int, const __sigset_t *, __sigset_t *);
int pthread_spin_init(pthread_spinlock_t *, int);
int pthread_spin_destroy(pthread_spinlock_t *);
==== //depot/projects/soc2005/nsswitch_cached/src/include/wchar.h#2 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/include/wchar.h,v 1.45 2004/08/12 12:19:10 tjr Exp $
+ * $FreeBSD: src/include/wchar.h,v 1.46 2005/08/13 05:54:33 tjr Exp $
*/
/*-
@@ -214,6 +214,7 @@
wchar_t *fgetwln(struct __sFILE * __restrict, size_t * __restrict);
size_t mbsnrtowcs(wchar_t * __restrict, const char ** __restrict, size_t,
size_t, mbstate_t * __restrict);
+wchar_t *wcsdup(const wchar_t *);
size_t wcsnrtombs(char * __restrict, const wchar_t ** __restrict, size_t,
size_t, mbstate_t * __restrict);
size_t wcslcat(wchar_t *, const wchar_t *, size_t);
More information about the p4-projects
mailing list