Date: Sat, 21 Sep 2002 11:58:49 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 17869 for review Message-ID: <200209211858.g8LIwnd4032853@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17869 Change 17869 by peter@peter_overcee on 2002/09/21 11:58:46 IFC @17867 Affected files ... .. //depot/projects/hammer/bin/cp/cp.c#2 integrate .. //depot/projects/hammer/bin/ls/ls.c#3 integrate .. //depot/projects/hammer/etc/Makefile#3 integrate .. //depot/projects/hammer/etc/newsyslog.conf#3 integrate .. //depot/projects/hammer/etc/syslog.conf#3 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes2#4 integrate .. //depot/projects/hammer/include/fts.h#2 integrate .. //depot/projects/hammer/include/limits.h#2 integrate .. //depot/projects/hammer/include/stdlib.h#4 integrate .. //depot/projects/hammer/include/unistd.h#3 integrate .. //depot/projects/hammer/include/wchar.h#4 integrate .. //depot/projects/hammer/lib/libc/gen/fts.3#2 integrate .. //depot/projects/hammer/lib/libc/gen/fts.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/sysconf.c#2 integrate .. //depot/projects/hammer/lib/libc/stdio/Makefile.inc#3 integrate .. //depot/projects/hammer/lib/libc/stdio/fwprintf.c#1 branch .. //depot/projects/hammer/lib/libc/stdio/local.h#4 integrate .. //depot/projects/hammer/lib/libc/stdio/stdio.3#3 integrate .. //depot/projects/hammer/lib/libc/stdio/swprintf.c#1 branch .. //depot/projects/hammer/lib/libc/stdio/vfwprintf.c#1 branch .. //depot/projects/hammer/lib/libc/stdio/vswprintf.c#1 branch .. //depot/projects/hammer/lib/libc/stdio/vwprintf.c#1 branch .. //depot/projects/hammer/lib/libc/stdio/wprintf.3#1 branch .. //depot/projects/hammer/lib/libc/stdio/wprintf.c#1 branch .. //depot/projects/hammer/lib/libc/string/wcscat.c#3 integrate .. //depot/projects/hammer/lib/libc/string/wcschr.c#2 integrate .. //depot/projects/hammer/lib/libc/string/wcscmp.c#2 integrate .. //depot/projects/hammer/lib/libc/string/wcscpy.c#3 integrate .. //depot/projects/hammer/lib/libc/string/wcscspn.c#2 integrate .. //depot/projects/hammer/lib/libc/string/wcslcat.c#2 integrate .. //depot/projects/hammer/lib/libc/string/wcslcpy.c#2 integrate .. //depot/projects/hammer/lib/libc/string/wcslen.c#2 integrate .. //depot/projects/hammer/lib/libc/string/wcsncat.c#3 integrate .. //depot/projects/hammer/lib/libc/string/wcsncmp.c#2 integrate .. //depot/projects/hammer/lib/libc/string/wcsncpy.c#3 integrate .. //depot/projects/hammer/lib/libc/string/wcspbrk.c#2 integrate .. //depot/projects/hammer/lib/libc/string/wcsrchr.c#2 integrate .. //depot/projects/hammer/lib/libc/string/wcsspn.c#2 integrate .. //depot/projects/hammer/lib/libc/string/wcsstr.c#3 integrate .. //depot/projects/hammer/lib/libc/string/wmemchr.c#2 integrate .. //depot/projects/hammer/lib/libc/string/wmemcmp.c#2 integrate .. //depot/projects/hammer/lib/libc/string/wmemcpy.c#3 integrate .. //depot/projects/hammer/lib/libc/string/wmemmove.c#2 integrate .. //depot/projects/hammer/lib/libc/string/wmemset.c#2 integrate .. //depot/projects/hammer/share/man/man8/yp.8#3 integrate .. //depot/projects/hammer/sys/ddb/db_command.c#2 integrate .. //depot/projects/hammer/sys/ddb/ddb.h#3 integrate .. //depot/projects/hammer/sys/dev/awi/awi.c#2 integrate .. //depot/projects/hammer/sys/dev/awi/awi_wep.c#2 integrate .. //depot/projects/hammer/sys/dev/firewire/sbp.c#2 integrate .. //depot/projects/hammer/sys/dev/null/null.c#2 integrate .. //depot/projects/hammer/sys/dev/ppbus/vpoio.c#2 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_wakeup.c#3 integrate .. //depot/projects/hammer/sys/i386/apm/apm.c#2 integrate .. //depot/projects/hammer/sys/i386/include/cpufunc.h#2 integrate .. //depot/projects/hammer/sys/i386/isa/clock.c#3 integrate .. //depot/projects/hammer/sys/modules/Makefile#4 integrate .. //depot/projects/hammer/sys/net/bpf.c#3 integrate .. //depot/projects/hammer/sys/pc98/pc98/clock.c#2 integrate .. //depot/projects/hammer/sys/security/mac_biba/mac_biba.c#4 integrate .. //depot/projects/hammer/sys/security/mac_mls/mac_mls.c#4 integrate .. //depot/projects/hammer/sys/sparc64/include/bus.h#3 integrate .. //depot/projects/hammer/sys/sys/_posix.h#2 integrate .. //depot/projects/hammer/sys/sys/syslimits.h#2 integrate .. //depot/projects/hammer/sys/sys/unistd.h#2 integrate .. //depot/projects/hammer/sys/vm/vm_object.h#3 integrate .. //depot/projects/hammer/usr.bin/find/find.c#2 integrate .. //depot/projects/hammer/usr.sbin/ctm/ctm_dequeue/ctm_dequeue.c#2 integrate .. //depot/projects/hammer/usr.sbin/mtree/create.c#2 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/lib/match.c#2 integrate Differences ... ==== //depot/projects/hammer/bin/cp/cp.c#2 (text+ko) ==== @@ -46,7 +46,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.40 2002/07/23 00:42:56 johan Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.41 2002/09/21 01:28:33 wollman Exp $"); /* * Cp copies source files to target files. @@ -92,7 +92,7 @@ enum op { FILE_TO_FILE, FILE_TO_DIR, DIR_TO_DNE }; static int copy(char *[], enum op, int); -static int mastercmp(const FTSENT **, const FTSENT **); +static int mastercmp(const FTSENT * const *, const FTSENT * const *); int main(int argc, char *argv[]) @@ -484,7 +484,7 @@ * files first reduces seeking. */ int -mastercmp(const FTSENT **a, const FTSENT **b) +mastercmp(const FTSENT * const *a, const FTSENT * const *b) { int a_info, b_info; ==== //depot/projects/hammer/bin/ls/ls.c#3 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.65 2002/08/25 13:01:45 charnier Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.66 2002/09/21 01:28:36 wollman Exp $"); #include <sys/types.h> #include <sys/stat.h> @@ -82,7 +82,7 @@ static void display(FTSENT *, FTSENT *); static u_quad_t makenines(u_long); -static int mastercmp(const FTSENT **, const FTSENT **); +static int mastercmp(const FTSENT * const *, const FTSENT * const *); static void traverse(int, char **, int); static void (*printfcn)(DISPLAY *); @@ -759,7 +759,7 @@ * All other levels use the sort function. Error entries remain unsorted. */ static int -mastercmp(const FTSENT **a, const FTSENT **b) +mastercmp(const FTSENT * const *a, const FTSENT * const *b) { int a_info, b_info; ==== //depot/projects/hammer/etc/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.293 2002/09/20 22:12:27 markm Exp $ +# $FreeBSD: src/etc/Makefile,v 1.294 2002/09/21 12:07:35 markm Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail @@ -136,7 +136,7 @@ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 /dev/null \ ${DESTDIR}/var/log/cron ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 /dev/null \ - ${DESTDIR}/var/log/ftp.log + ${DESTDIR}/var/log/xferlog ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \ ${DESTDIR}/var/log/lpd-errs ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 640 /dev/null \ ==== //depot/projects/hammer/etc/newsyslog.conf#3 (text+ko) ==== @@ -1,5 +1,5 @@ # configuration file for newsyslog -# $FreeBSD: src/etc/newsyslog.conf,v 1.41 2002/09/20 22:10:01 markm Exp $ +# $FreeBSD: src/etc/newsyslog.conf,v 1.42 2002/09/21 12:07:35 markm Exp $ # # Note: some sites will want to select more restrictive protections than the # defaults. In particular, it may be desirable to switch many of the 644 @@ -13,7 +13,7 @@ /var/log/auth.log 600 7 100 * J /var/log/kerberos.log 600 7 100 * J /var/log/lpd-errs 644 7 100 * J -/var/log/ftp.log 600 7 100 * J +/var/log/xferlog 600 7 100 * J /var/log/maillog 640 7 * @T00 J /var/log/sendmail.st 640 10 * 168 B /var/log/messages 644 5 100 * J ==== //depot/projects/hammer/etc/syslog.conf#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/syslog.conf,v 1.22 2002/09/20 22:10:01 markm Exp $ +# $FreeBSD: src/etc/syslog.conf,v 1.23 2002/09/21 12:07:35 markm Exp $ # # Spaces ARE valid field separators in this file. However, # other *nix-like systems still insist on using tabs as field @@ -11,7 +11,7 @@ auth.info;authpriv.info /var/log/auth.log mail.info /var/log/maillog lpr.info /var/log/lpd-errs -ftp.info /var/log/ftp.log +ftp.info /var/log/xferlog cron.* /var/log/cron *.emerg * # uncomment this to log all writes to /dev/console to /var/log/console.log ==== //depot/projects/hammer/games/fortune/datfiles/fortunes2#4 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes2,v 1.48 2002/09/11 11:21:36 tg Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes2,v 1.49 2002/09/21 16:13:20 schweikh Exp $ % ======================================================================= @@ -30593,7 +30593,7 @@ Many a town that didn't have enough work to support a single lawyer can easily support two or more. % -Many a writer seems to thing he is never profound +Many a writer seems to think he is never profound except when he can't understand his own meaning. -- George D. Prentice % ==== //depot/projects/hammer/include/fts.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)fts.h 8.3 (Berkeley) 8/14/94 - * $FreeBSD: src/include/fts.h,v 1.6 2002/03/26 01:35:05 bde Exp $ + * $FreeBSD: src/include/fts.h,v 1.7 2002/09/21 01:28:36 wollman Exp $ */ #ifndef _FTS_H_ @@ -47,7 +47,7 @@ int fts_pathlen; /* sizeof(path) */ int fts_nitems; /* elements in the sort array */ int (*fts_compar) /* compare function */ - (const struct _ftsent **, const struct _ftsent **); + (const struct _ftsent * const *, const struct _ftsent * const *); #define FTS_COMFOLLOW 0x001 /* follow command line symlinks */ #define FTS_LOGICAL 0x002 /* logical walk */ @@ -62,6 +62,7 @@ #define FTS_NAMEONLY 0x100 /* (private) child names only */ #define FTS_STOP 0x200 /* (private) unrecoverable error */ int fts_options; /* fts_open options, global flags */ + void *fts_clientptr; /* thunk for sort function */ } FTS; typedef struct _ftsent { @@ -113,7 +114,8 @@ u_short fts_instr; /* fts_set() instructions */ struct stat *fts_statp; /* stat(2) information */ - char fts_name[1]; /* file name */ + char *fts_name; /* file name */ + FTS *fts_fts; /* back pointer to main FTS */ } FTSENT; #include <sys/cdefs.h> @@ -121,10 +123,15 @@ __BEGIN_DECLS FTSENT *fts_children(FTS *, int); int fts_close(FTS *); +void *fts_get_clientptr(FTS *); +#define fts_get_clientptr(fts) ((fts)->fts_clientptr) +FTS *fts_get_stream(FTSENT *); +#define fts_get_stream(ftsent) ((ftsent)->fts_fts) FTS *fts_open(char * const *, int, - int (*)(const FTSENT **, const FTSENT **)); + int (*)(const FTSENT * const *, const FTSENT * const *)); FTSENT *fts_read(FTS *); int fts_set(FTS *, FTSENT *, int); +void fts_set_clientptr(FTS *, void *); __END_DECLS #endif /* !_FTS_H_ */ ==== //depot/projects/hammer/include/limits.h#2 (text+ko) ==== @@ -31,14 +31,14 @@ * SUCH DAMAGE. * * @(#)limits.h 8.2 (Berkeley) 1/4/94 - * $FreeBSD: src/include/limits.h,v 1.11 2001/06/18 20:24:18 wollman Exp $ + * $FreeBSD: src/include/limits.h,v 1.12 2002/09/21 02:00:44 wollman Exp $ */ #ifndef _LIMITS_H_ #define _LIMITS_H_ -#include <sys/_posix.h> +#include <sys/cdefs.h> -#ifndef _ANSI_SOURCE +#if __POSIX_VISIBLE #define _POSIX_ARG_MAX 4096 #define _POSIX_CHILD_MAX 6 #define _POSIX_LINK_MAX 8 @@ -61,11 +61,9 @@ #define _POSIX2_EXPR_NEST_MAX 32 #define _POSIX2_LINE_MAX 2048 #define _POSIX2_RE_DUP_MAX 255 +#endif -#define _XOPEN_IOV_MAX 16 - -#ifdef _P1003_1B_VISIBLE - +#if __POSIX_VISIBLE >= 199309 #define _POSIX_AIO_LISTIO_MAX 16 #define _POSIX_AIO_MAX 1 #define _POSIX_DELAYTIMER_MAX 32 @@ -76,12 +74,14 @@ #define _POSIX_SEM_VALUE_MAX 32767 #define _POSIX_SIGQUEUE_MAX 32 #define _POSIX_TIMER_MAX 32 +#endif +#if __POSIX_VISIBLE >= 200112 +#define _POSIX_HOST_NAME_MAX 255 #endif -#endif /* !_ANSI_SOURCE */ - -#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE) || defined(_XOPEN_SOURCE) +#if __XSI_VISIBLE +#define _XOPEN_IOV_MAX 16 #define PASS_MAX 128 /* _PASSWORD_LEN from <pwd.h> */ #define NL_ARGMAX 99 /* max # of position args for printf */ @@ -93,7 +93,7 @@ #endif #include <machine/limits.h> -#if !defined(_ANSI_SOURCE) +#if __POSIX_VISIBLE #include <sys/syslimits.h> #endif ==== //depot/projects/hammer/include/stdlib.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)stdlib.h 8.5 (Berkeley) 5/19/95 - * $FreeBSD: src/include/stdlib.h,v 1.42 2002/09/10 02:02:49 wollman Exp $ + * $FreeBSD: src/include/stdlib.h,v 1.43 2002/09/21 02:03:58 wollman Exp $ */ #ifndef _STDLIB_H_ @@ -40,7 +40,7 @@ #include <sys/cdefs.h> #include <sys/_types.h> -#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE) +#if __BSD_VISIBLE #ifndef _RUNE_T_DECLARED typedef __rune_t rune_t; #define _RUNE_T_DECLARED @@ -69,16 +69,6 @@ long rem; /* remainder */ } ldiv_t; -#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE) -#ifdef __LONG_LONG_SUPPORTED -/* LONGLONG */ -typedef struct { - long long quot; - long long rem; -} lldiv_t; -#endif -#endif - #ifndef NULL #define NULL 0 #endif @@ -92,7 +82,6 @@ #define MB_CUR_MAX __mb_cur_max __BEGIN_DECLS -void _Exit(int) __dead2; void abort(void) __dead2; int abs(int) __pure2; int atexit(void (*)(void)); @@ -109,53 +98,137 @@ long labs(long) __pure2; ldiv_t ldiv(long, long) __pure2; void *malloc(size_t); +int mblen(const char *, size_t); +size_t mbstowcs(wchar_t *__restrict , const char *__restrict, size_t); +int mbtowc(wchar_t * __restrict, const char * __restrict, size_t); void qsort(void *, size_t, size_t, int (*)(const void *, const void *)); int rand(void); void *realloc(void *, size_t); void srand(unsigned); -double strtod(const char * __restrict, char ** __restrict); -long strtol(const char * __restrict, char ** __restrict, int); +double strtod(const char *__restrict, char **__restrict); +/* float strtof(const char *__restrict, char **__restrict); */ +long strtol(const char *__restrict, char **__restrict, int); +/* long double + strtold(const char *__restrict, char **__restrict); */ unsigned long strtoul(const char * __restrict, char ** __restrict, int); int system(const char *); - -int mblen(const char *, size_t); -size_t mbstowcs(wchar_t * __restrict , const char * __restrict, size_t); int wctomb(char *, wchar_t); -int mbtowc(wchar_t * __restrict, const char * __restrict, size_t); size_t wcstombs(char * __restrict, const wchar_t * __restrict, size_t); -#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE) -extern const char *_malloc_options; -extern void (*_malloc_message)(const char *p1, const char *p2, const char *p3, const char *p4); +/* + * Functions added in C99 which we make conditionally available in the + * BSD^C89 namespace if the compiler supports `long long'. + * The #if test is more complicated than it ought to be because + * __BSD_VISIBLE implies __ISO_C_VISIBLE == 1999 *even if* `long long' + * is not supported in the compilation environment (which therefore means + * that it can't really be ISO C99). + * + * (The only other extension made by C99 in thie header is _Exit().) + */ +#if __ISO_C_VISIBLE >= 1999 +#ifdef __LONG_LONG_SUPPORTED +/* LONGLONG */ +typedef struct { + long long quot; + long long rem; +} lldiv_t; + +/* LONGLONG */ +long long + atoll(const char *); +/* LONGLONG */ +long long + llabs(long long) __pure2; +/* LONGLONG */ +lldiv_t lldiv(long long, long long) __pure2; +/* LONGLONG */ +long long + strtoll(const char *__restrict, char **__restrict, int); +/* LONGLONG */ +unsigned long long + strtoull(const char *__restrict, char **__restrict, int); +#endif /* __LONG_LONG_SUPPORTED */ + +void _Exit(int) __dead2; +#endif /* __ISO_C_VISIBLE >= 1999 */ -int putenv(const char *); +/* + * Extensions made by POSIX relative to C. We don't know yet which edition + * of POSIX made these extensions, so assume they've always been there until + * research can be done. + */ +#if __POSIX_VISIBLE /* >= ??? */ +/* int posix_memalign(void **, size_t, size_t); (ADV) */ +int rand_r(unsigned *); /* (TSF) */ int setenv(const char *, const char *, int); +void unsetenv(const char *); +#endif +/* + * The only changes to the XSI namespace in revision 6 were the deletion + * of the ttyslot() and valloc() functions, which FreeBSD never declared + * in this header. For revision 7, ecvt(), fcvt(), and gcvt(), which + * FreeBSD also does not have, and mktemp(), are to be deleted. + */ +#if __XSI_VISIBLE +/* XXX XSI requires pollution from <sys/wait.h> here. We'd rather not. */ +/* long a64l(const char *); */ double drand48(void); +/* char *ecvt(double, int, int *__restrict, int *__restrict); */ double erand48(unsigned short[3]); +/* char *fcvt(double, int, int *__restrict, int *__restrict); */ +/* char *gcvt(double, int, int *__restrict, int *__restrict); */ +#ifndef _GETSUBOPT_DECLARED +int getsubopt(char **, char *const *, char **); +#define _GETSUBOPT_DECLARED +#endif +/* int grantpt(int); */ +char *initstate(unsigned long /* XSI requires u_int */, char *, long); long jrand48(unsigned short[3]); +/* char *l64a(long); */ void lcong48(unsigned short[7]); long lrand48(void); +#ifndef _MKSTEMP_DECLARED +int mkstemp(char *); +#define _MKSTEMP_DECLARED +#endif +#ifndef _MKTEMP_DECLARED +char *mktemp(char *); +#define _MKTEMP_DECLARED +#endif long mrand48(void); long nrand48(unsigned short[3]); +/* int posix_openpt(int); */ +/* char *ptsname(int); */ +int putenv(const char *); +long random(void); +char *realpath(const char *, char resolved_path[]); unsigned short *seed48(unsigned short[3]); +#ifndef _SETKEY_DECLARED +int setkey(const char *); +#define _SETKEY_DECLARED +#endif +char *setstate(/* const */ char *); void srand48(long); +void srandom(unsigned long); +/* int unlockpt(int); */ +#endif /* __XSI_VISIBLE */ + +#if __BSD_VISIBLE +extern const char *_malloc_options; +extern void (*_malloc_message)(const char *, const char *, const char *, const char *); + void *alloca(size_t); /* built-in for gcc */ - /* getcap(3) functions */ __uint32_t arc4random(void); void arc4random_addrandom(unsigned char *dat, int datlen); void arc4random_stir(void); -#ifdef __LONG_LONG_SUPPORTED -/* LONGLONG */ -long long - atoll(const char *); -#endif char *getbsize(int *, long *); + /* getcap(3) functions */ char *cgetcap(char *, const char *, int); int cgetclose(void); int cgetent(char **, char **, const char *); @@ -174,44 +247,23 @@ getprogname(void); int heapsort(void *, size_t, size_t, int (*)(const void *, const void *)); -char *initstate(unsigned long, char *, long); -#ifdef __LONG_LONG_SUPPORTED -/* LONGLONG */ -long long - llabs(long long) __pure2; -lldiv_t lldiv(long long, long long) __pure2; -#endif int mergesort(void *, size_t, size_t, int (*)(const void *, const void *)); void qsort_r(void *, size_t, size_t, void *, int (*)(void *, const void *, const void *)); int radixsort(const unsigned char **, int, const unsigned char *, unsigned); -int rand_r(unsigned *); -long random(void); void *reallocf(void *, size_t); -char *realpath(const char *, char resolved_path[]); void setprogname(const char *); -char *setstate(char *); int sradixsort(const unsigned char **, int, const unsigned char *, unsigned); void sranddev(void); -void srandom(unsigned long); void srandomdev(void); -#ifdef __LONG_LONG_SUPPORTED -/* LONGLONG */ -long long - strtoll(const char * __restrict, char ** __restrict, int); -#endif + +/* Deprecated interfaces, to be removed in FreeBSD 6.0. */ __int64_t strtoq(const char *, char **, int); -#ifdef __LONG_LONG_SUPPORTED -/* LONGLONG */ -unsigned long long - strtoull(const char * __restrict, char ** __restrict, int); -#endif __uint64_t strtouq(const char *, char **, int); -void unsetenv(const char *); -#endif /* !_ANSI_SOURCE && !_POSIX_SOURCE */ +#endif /* __BSD_VISIBLE */ __END_DECLS #endif /* !_STDLIB_H_ */ ==== //depot/projects/hammer/include/unistd.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)unistd.h 8.12 (Berkeley) 4/27/95 - * $FreeBSD: src/include/unistd.h,v 1.57 2002/09/06 11:23:32 tjr Exp $ + * $FreeBSD: src/include/unistd.h,v 1.58 2002/09/21 02:08:32 wollman Exp $ */ #ifndef _UNISTD_H_ @@ -81,6 +81,230 @@ #define F_TEST 3 /* test a section for locks by other procs */ #endif +/* + * POSIX options and option groups we unconditionally do or don't + * implement. This list includes those options which are exclusively + * implemented (or not) in user mode. Please keep this list in + * alphabetical order. + * + * Anything which is defined as zero below **must** have an + * implementation for the corresponding sysconf() which is able to + * determine conclusively whether or not the feature is supported. + * Anything which is defined as other than -1 below **must** have + * complete headers, types, and function declarations as specified by + * the POSIX standard; however, if the relevant sysconf() function + * returns -1, the functions may be stubbed out. + */ +#define _POSIX_BARRIERS -1 +#define _POSIX_READER_WRITER_LOCKS 200112L +#define _POSIX_REGEXP 1 +#define _POSIX_SHELL 1 +#define _POSIX_SPAWN -1 +#define _POSIX_SPIN_LOCKS -1 +#define _POSIX_THREAD_ATTR_STACKADDR 200112L +#define _POSIX_THREAD_ATTR_STACKSIZE 200112L +#define _POSIX_THREAD_CPUTIME -1 +#define _POSIX_THREAD_PRIO_INHERIT 200112L +#define _POSIX_THREAD_PRIO_PROTECT 200112L +#define _POSIX_THREAD_PRIORITY_SCHEDULING 200112L +#define _POSIX_THREAD_PROCESS_SHARED -1 +#define _POSIX_THREAD_SAFE_FUNCTIONS -1 +#define _POSIX_THREAD_SPORADIC_SERVER -1 +#define _POSIX_THREADS 200112L +#define _POSIX_TRACE -1 +#define _POSIX_TRACE_EVENT_FILTER -1 +#define _POSIX_TRACE_INHERIT -1 +#define _POSIX_TRACE_LOG -1 +#define _POSIX2_C_BIND 200112L /* mandatory */ +#define _POSIX2_C_DEV -1 /* need c99 utility */ +#define _POSIX2_CHAR_TERM 1 +#define _POSIX2_FORT_DEV -1 /* need fort77 utility */ +#define _POSIX2_FORT_RUN 200112L +#define _POSIX2_LOCALEDEF -1 +#define _POSIX2_PBS -1 +#define _POSIX2_PBS_ACCOUNTING -1 +#define _POSIX2_PBS_CHECKPOINT -1 +#define _POSIX2_PBS_LOCATE -1 +#define _POSIX2_PBS_MESSAGE -1 +#define _POSIX2_PBS_TRACK -1 +#define _POSIX2_SW_DEV -1 /* XXX ??? */ +#define _POSIX2_UPE 200112L +#define _V6_ILP32_OFF32 -1 +#define _V6_ILP32_OFFBIG 0 +#define _V6_LP64_OFF64 0 +#define _V6_LPBIG_OFFBIG -1 + +#if __XSI_VISIBLE +#define _XOPEN_CRYPT -1 /* XXX ??? */ +#define _XOPEN_ENH_I18N -1 /* mandatory in XSI */ +#define _XOPEN_LEGACY -1 +#define _XOPEN_REALTIME -1 +#define _XOPEN_REALTIME_THREADS -1 +#define _XOPEN_UNIX -1 +#endif + +/* Define the versions we target for compliance. */ +#define _POSIX_VERSION 200112L +#define _POSIX2_VERSION 200112L + +/* + * POSIX-style system configuration variable accessors (for the + * sysconf function). The kernel does not directly implement the + * sysconf() interface; rather, a C library stub translates references + * to sysconf() into calls to sysctl() using a giant switch statement. + * Those that are marked `user' are implemented entirely in the C + * library and never query the kernel. pathconf() is implemented + * directly by the kernel so those are not defined here. + */ +#define _SC_ARG_MAX 1 +#define _SC_CHILD_MAX 2 +#define _SC_CLK_TCK 3 +#define _SC_NGROUPS_MAX 4 +#define _SC_OPEN_MAX 5 +#define _SC_JOB_CONTROL 6 +#define _SC_SAVED_IDS 7 +#define _SC_VERSION 8 +#define _SC_BC_BASE_MAX 9 /* user */ +#define _SC_BC_DIM_MAX 10 /* user */ +#define _SC_BC_SCALE_MAX 11 /* user */ +#define _SC_BC_STRING_MAX 12 /* user */ +#define _SC_COLL_WEIGHTS_MAX 13 /* user */ +#define _SC_EXPR_NEST_MAX 14 /* user */ +#define _SC_LINE_MAX 15 /* user */ +#define _SC_RE_DUP_MAX 16 /* user */ +#define _SC_2_VERSION 17 /* user */ +#define _SC_2_C_BIND 18 /* user */ +#define _SC_2_C_DEV 19 /* user */ +#define _SC_2_CHAR_TERM 20 /* user */ +#define _SC_2_FORT_DEV 21 /* user */ +#define _SC_2_FORT_RUN 22 /* user */ +#define _SC_2_LOCALEDEF 23 /* user */ +#define _SC_2_SW_DEV 24 /* user */ +#define _SC_2_UPE 25 /* user */ +#define _SC_STREAM_MAX 26 /* user */ +#define _SC_TZNAME_MAX 27 /* user */ + +#if __POSIX_VISIBLE >= 199309 +#define _SC_ASYNCHRONOUS_IO 28 +#define _SC_MAPPED_FILES 29 +#define _SC_MEMLOCK 30 +#define _SC_MEMLOCK_RANGE 31 +#define _SC_MEMORY_PROTECTION 32 +#define _SC_MESSAGE_PASSING 33 +#define _SC_PRIORITIZED_IO 34 +#define _SC_PRIORITY_SCHEDULING 35 +#define _SC_REALTIME_SIGNALS 36 +#define _SC_SEMAPHORES 37 +#define _SC_FSYNC 38 +#define _SC_SHARED_MEMORY_OBJECTS 39 +#define _SC_SYNCHRONIZED_IO 40 +#define _SC_TIMERS 41 +#define _SC_AIO_LISTIO_MAX 42 +#define _SC_AIO_MAX 43 +#define _SC_AIO_PRIO_DELTA_MAX 44 +#define _SC_DELAYTIMER_MAX 45 +#define _SC_MQ_OPEN_MAX 46 +#define _SC_PAGESIZE 47 +#define _SC_RTSIG_MAX 48 +#define _SC_SEM_NSEMS_MAX 49 +#define _SC_SEM_VALUE_MAX 50 +#define _SC_SIGQUEUE_MAX 51 +#define _SC_TIMER_MAX 52 +#endif + +#if __POSIX_VISIBLE >= 200112 +#define _SC_2_PBS 59 /* user */ +#define _SC_2_PBS_ACCOUNTING 60 /* user */ +#define _SC_2_PBS_CHECKPOINT 61 /* user */ +#define _SC_2_PBS_LOCATE 62 /* user */ +#define _SC_2_PBS_MESSAGE 63 /* user */ +#define _SC_2_PBS_TRACK 64 /* user */ +#define _SC_ADVISORY_INFO 65 +#define _SC_BARRIERS 66 /* user */ +#define _SC_CLOCK_SELECTION 67 +#define _SC_CPUTIME 68 +#define _SC_FILE_LOCKING 69 +#define _SC_GETGR_R_SIZE_MAX 70 /* user */ +#define _SC_GETPW_R_SIZE_MAX 71 /* user */ +#define _SC_HOST_NAME_MAX 72 +#define _SC_LOGIN_NAME_MAX 73 +#define _SC_MONOTONIC_CLOCK 74 +#define _SC_MQ_PRIO_MAX 75 +#define _SC_READER_WRITER_LOCKS 76 /* user */ +#define _SC_REGEXP 77 /* user */ +#define _SC_SHELL 78 /* user */ +#define _SC_SPAWN 79 /* user */ +#define _SC_SPIN_LOCKS 80 /* user */ +#define _SC_SPORADIC_SERVER 81 +#define _SC_THREAD_ATTR_STACKADDR 82 /* user */ +#define _SC_THREAD_ATTR_STACKSIZE 83 /* user */ +#define _SC_THREAD_CPUTIME 84 /* user */ +#define _SC_THREAD_DESTRUCTOR_ITERATIONS 85 /* user */ +#define _SC_THREAD_KEYS_MAX 86 /* user */ +#define _SC_THREAD_PRIO_INHERIT 87 /* user */ +#define _SC_THREAD_PRIO_PROTECT 88 /* user */ +#define _SC_THREAD_PRIORITY_SCHEDULING 89 /* user */ +#define _SC_THREAD_PROCESS_SHARED 90 /* user */ +#define _SC_THREAD_SAFE_FUNCTIONS 91 /* user */ +#define _SC_THREAD_SPORADIC_SERVER 92 /* user */ +#define _SC_THREAD_STACK_MIN 93 /* user */ +#define _SC_THREAD_THREADS_MAX 94 /* user */ +#define _SC_TIMEOUTS 95 /* user */ +#define _SC_THREADS 96 /* user */ +#define _SC_TRACE 97 /* user */ +#define _SC_TRACE_EVENT_FILTER 98 /* user */ +#define _SC_TRACE_INHERIT 99 /* user */ +#define _SC_TRACE_LOG 100 /* user */ +#define _SC_TTY_NAME_MAX 101 /* user */ +#define _SC_TYPED_MEMORY_OBJECTS 102 +#define _SC_V6_ILP32_OFF32 103 /* user */ +#define _SC_V6_ILP32_OFFBIG 104 /* user */ +#define _SC_V6_LP64_OFF64 105 /* user */ +#define _SC_V6_LPBIG_OFFBIG 106 /* user */ +#endif + +#if __XSI_VISIBLE +#define _SC_ATEXIT_MAX 107 /* user */ +#define _SC_IOV_MAX 56 +#define _SC_PAGE_SIZE _SC_PAGESIZE +#define _SC_XOPEN_CRYPT 108 /* user */ +#define _SC_XOPEN_ENH_I18N 109 /* user */ +#define _SC_XOPEN_LEGACY 110 /* user */ +#define _SC_XOPEN_REALTIME 111 +#define _SC_XOPEN_REALTIME_THREADS 112 +#define _SC_XOPEN_SHM 113 +#define _SC_XOPEN_STREAMS 114 +#define _SC_XOPEN_UNIX 115 +#define _SC_XOPEN_VERSION 116 +#define _SC_XOPEN_XCU_VERSION 117 /* user */ +#endif + +#if __BSD_VISIBLE +#define _SC_NPROCESSORS_CONF 57 +#define _SC_NPROCESSORS_ONLN 58 +#endif + +/* Keys for the confstr(3) function. */ +#if __POSIX_VISIBLE >= 199209 +#define _CS_PATH 1 /* default value of PATH */ +#endif + +#if __POSIX_VISIBLE >= 200112 +#define _CS_POSIX_V6_ILP32_OFF32_CFLAGS 2 +#define _CS_POSIX_V6_ILP32_OFF32_LDFLAGS 3 +#define _CS_POSIX_V6_ILP32_OFF32_LIBS 4 +#define _CS_POSIX_V6_ILP32_OFFBIG_CFLAGS 5 +#define _CS_POSIX_V6_ILP32_OFFBIG_LDFLAGS 6 +#define _CS_POSIX_V6_ILP32_OFFBIG_LIBS 7 +#define _CS_POSIX_V6_LP64_OFF64_CFLAGS 8 +#define _CS_POSIX_V6_LP64_OFF64_LDFLAGS 9 +#define _CS_POSIX_V6_LP64_OFF64_LIBS 10 +#define _CS_POSIX_V6_LPBIG_OFFBIG_CFLAGS 11 +#define _CS_POSIX_V6_LPBIG_OFFBIG_LDFLAGS 12 +#define _CS_POSIX_V6_LPBIG_OFFBIG_LIBS 13 +#define _CS_POSIX_V6_WIDTH_RESTRICTED_ENVS 14 +#endif + __BEGIN_DECLS /* 1003.1-1990 */ void _exit(int) __dead2; @@ -141,8 +365,6 @@ extern char *optarg; /* getopt(3) external variables */ extern int optind, opterr, optopt; - -#define _CS_PATH 1 /* default value of PATH */ #endif /* ISO/IEC 9945-1: 1996 */ @@ -167,27 +389,12 @@ int gethostname(char *, int /* socklen_t */); int setegid(gid_t); int seteuid(uid_t); - -/* X/Open mistake copied by POSIX */ -#define _CS_POSIX_V6_ILP32_OFF32_CFLAGS 2 -#define _CS_POSIX_V6_ILP32_OFF32_LDFLAGS 3 -#define _CS_POSIX_V6_ILP32_OFF32_LIBS 4 -#define _CS_POSIX_V6_ILP32_OFFBIG_CFLAGS 5 -#define _CS_POSIX_V6_ILP32_OFFBIG_LDFLAGS 6 -#define _CS_POSIX_V6_ILP32_OFFBIG_LIBS 7 -#define _CS_POSIX_V6_LP64_OFF64_CFLAGS 8 -#define _CS_POSIX_V6_LP64_OFF64_LDFLAGS 9 -#define _CS_POSIX_V6_LP64_OFF64_LIBS 10 -#define _CS_POSIX_V6_LPBIG_OFFBIG_CFLAGS 11 -#define _CS_POSIX_V6_LPBIG_OFFBIG_LDFLAGS 12 -#define _CS_POSIX_V6_LPBIG_OFFBIG_LIBS 13 -#define _CS_POSIX_V6_WIDTH_RESTRICTED_ENVS 14 #endif /* * symlink() was originally in POSIX.1a, which was withdrawn after * being overtaken by events (1003.1-2001). It was in XPG4.2, and of - * course has been in BSD practically forever. + * course has been in BSD since 4.2. */ #if __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE >= 402 || __BSD_VISIBLE int symlink(const char * __restrict, const char * __restrict); @@ -254,9 +461,15 @@ int issetugid(void); char *mkdtemp(char *); int mknod(const char *, mode_t, dev_t); +#ifndef _MKSTEMP_DECLARED int mkstemp(char *); +#define _MKSTEMP_DECLARED +#endif int mkstemps(char *, int); +#ifndef _MKTEMP_DECLARED char *mktemp(char *); +#define _MKTEMP_DECLARED +#endif int nfsclnt(int, void *); int nfssvc(int, void *); int profil(char *, size_t, vm_offset_t, int); @@ -281,7 +494,10 @@ int setgroups(int, const gid_t *); void sethostid(long); int sethostname(const char *, int); +#ifndef _SETKEY_DECLARED int setkey(const char *); +#define _SETKEY_DECLARED +#endif int setlogin(const char *); void *setmode(const char *); int setresgid(gid_t, gid_t, gid_t); @@ -299,7 +515,10 @@ void *valloc(size_t); /* obsoleted by malloc() */ extern char *suboptarg; /* getsubopt(3) external variable */ +#ifndef _GETSUBOPT_DECLARED int getsubopt(char **, char * const *, char **); +#define _GETSUBOPT_DECLARED +#endif extern int optreset; /* getopt(3) external variable */ #endif /* __BSD_VISIBLE */ __END_DECLS ==== //depot/projects/hammer/include/wchar.h#4 (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.26 2002/09/15 08:38:50 tjr Exp $ + * $FreeBSD: src/include/wchar.h,v 1.28 2002/09/21 13:00:29 tjr Exp $ */ /*- @@ -111,6 +111,7 @@ wint_t fputwc(wchar_t, struct __sFILE *); int fputws(const wchar_t * __restrict, struct __sFILE * __restrict); int fwide(struct __sFILE *, int); +int fwprintf(struct __sFILE * __restrict, const wchar_t * __restrict, ...); wint_t getwc(struct __sFILE *); wint_t getwchar(void); size_t mbrlen(const char * __restrict, size_t, mbstate_t * __restrict); @@ -121,7 +122,14 @@ mbstate_t * __restrict); wint_t putwc(wchar_t, struct __sFILE *); wint_t putwchar(wchar_t); +int swprintf(wchar_t * __restrict, size_t n, const wchar_t * __restrict, + ...); wint_t ungetwc(wint_t, struct __sFILE *); +int vfwprintf(struct __sFILE * __restrict, const wchar_t * __restrict, + __va_list); +int vswprintf(wchar_t * __restrict, size_t n, const wchar_t * __restrict, + __va_list); +int vwprintf(const wchar_t * __restrict, __va_list); size_t wcrtomb(char * __restrict, wchar_t, mbstate_t * __restrict); wchar_t *wcscat(wchar_t * __restrict, const wchar_t * __restrict); wchar_t *wcschr(const wchar_t *, wchar_t); @@ -130,8 +138,6 @@ size_t wcscspn(const wchar_t *, const wchar_t *); size_t wcsftime(wchar_t * __restrict, size_t, const wchar_t * __restrict, const struct tm * __restrict); -size_t wcslcat(wchar_t *, const wchar_t *, size_t); -size_t wcslcpy(wchar_t *, const wchar_t *, size_t); size_t wcslen(const wchar_t *); wchar_t *wcsncat(wchar_t * __restrict, const wchar_t * __restrict, size_t); @@ -155,11 +161,17 @@ wchar_t *wmemcpy(wchar_t * __restrict, const wchar_t * __restrict, size_t); wchar_t *wmemmove(wchar_t *, const wchar_t *, size_t); wchar_t *wmemset(wchar_t *, wchar_t, size_t); +int wprintf(const wchar_t * __restrict, ...); #if __XSI_VISIBLE int wcswidth(const wchar_t *, size_t); int wcwidth(wchar_t); #endif + +#if __BSD_VISIBLE +size_t wcslcat(wchar_t *, const wchar_t *, size_t); +size_t wcslcpy(wchar_t *, const wchar_t *, size_t); +#endif __END_DECLS #define getwc(fp) fgetwc(fp) ==== //depot/projects/hammer/lib/libc/gen/fts.3#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)fts.3 8.5 (Berkeley) 4/16/94 -.\" $FreeBSD: src/lib/libc/gen/fts.3,v 1.13 2001/09/20 12:32:45 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/fts.3,v 1.14 2002/09/21 01:28:38 wollman Exp $ .\" -.Dd April 16, 1994 +.Dd September 15, 2002 .Dt FTS 3 .Os .Sh NAME @@ -52,6 +52,12 @@ .Fn fts_children "FTS *ftsp" "int options" .Ft int .Fn fts_set "FTS *ftsp" "FTSENT *f" "int options" +.Ft void +.Fn fts_set_clientptr "FTS *ftsp" "void *clientdata" +.Ft void * +.Fn fts_get_clientptr "FTS *ftsp" +.Ft FTS * +.Fn fts_get_stream "FTSENT *f" .Ft int .Fn fts_close "FTS *ftsp" .Sh DESCRIPTION @@ -105,7 +111,27 @@ .Dq Fa FTSENT No structure are generally interchangeable. +.Pp +The +.Fa FTS +structure contains space for a single pointer, which may be used to +store application data or per-hierarchy state. The +.Fn fts_set_clientptr +and >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200209211858.g8LIwnd4032853>