PERFORCE change 16292 for review
Robert Watson
rwatson at freebsd.org
Mon Aug 19 19:56:08 GMT 2002
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16292
Change 16292 by rwatson at rwatson_paprika on 2002/08/19 12:55:43
Integ the FreeBSD 5.0-CURRENT tree into the TrustedBSD base
branch, bringing in UFS2 extended attribute supporting,
trickling back in break out of vnode and pipe MAC check
entry points, active/file cred changes, mac_syscall, and
more.
Affected files ...
.. //depot/projects/trustedbsd/base/bin/ls/ls.1#10 integrate
.. //depot/projects/trustedbsd/base/bin/sh/jobs.c#6 integrate
.. //depot/projects/trustedbsd/base/bin/test/test.c#12 integrate
.. //depot/projects/trustedbsd/base/include/ctype.h#5 integrate
.. //depot/projects/trustedbsd/base/include/wchar.h#6 integrate
.. //depot/projects/trustedbsd/base/lib/libc/gen/getcwd.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/gen/vis.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libc/locale/Makefile.inc#6 integrate
.. //depot/projects/trustedbsd/base/lib/libc/locale/isctype.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/locale/iswctype.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/locale/mbrlen.3#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/locale/mbrlen.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/locale/mbrtowc.3#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/locale/mbrtowc.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/locale/mbsinit.3#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/locale/mbsinit.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/locale/mbsrtowcs.3#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/locale/mbsrtowcs.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/locale/wcrtomb.3#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/locale/wcrtomb.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/locale/wcsrtombs.3#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/locale/wcsrtombs.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/locale/wcwidth.c#1 branch
.. //depot/projects/trustedbsd/base/lib/libc/stdio/asprintf.c#5 integrate
.. //depot/projects/trustedbsd/base/lib/libc/stdio/vasprintf.c#4 integrate
.. //depot/projects/trustedbsd/base/libexec/rpc.rstatd/rstat_proc.c#4 integrate
.. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#22 integrate
.. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#37 integrate
.. //depot/projects/trustedbsd/base/sbin/camcontrol/camcontrol.c#7 integrate
.. //depot/projects/trustedbsd/base/sbin/dmesg/dmesg.c#3 integrate
.. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.8#11 integrate
.. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.c#7 integrate
.. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw.8#12 integrate
.. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw2.c#7 integrate
.. //depot/projects/trustedbsd/base/sbin/ldconfig/ldconfig.8#3 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/netintro.4#5 integrate
.. //depot/projects/trustedbsd/base/share/man/man4/tcp.4#5 integrate
.. //depot/projects/trustedbsd/base/share/man/man5/rc.conf.5#14 integrate
.. //depot/projects/trustedbsd/base/share/man/man7/tuning.7#12 integrate
.. //depot/projects/trustedbsd/base/share/man/man9/ifnet.9#4 integrate
.. //depot/projects/trustedbsd/base/share/misc/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/share/misc/latin1#1 branch
.. //depot/projects/trustedbsd/base/share/termcap/termcap.src#8 integrate
.. //depot/projects/trustedbsd/base/sys/boot/forth/loader.conf#10 integrate
.. //depot/projects/trustedbsd/base/sys/compat/linux/linux_ioctl.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/conf/files#31 integrate
.. //depot/projects/trustedbsd/base/sys/conf/kern.post.mk#15 integrate
.. //depot/projects/trustedbsd/base/sys/conf/majors#7 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-all.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-cam.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/fxp/if_fxp.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/dev/isp/isp.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/dev/isp/isp_freebsd.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/dev/isp/isp_pci.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/dev/isp/ispmbox.h#9 integrate
.. //depot/projects/trustedbsd/base/sys/dev/isp/ispvar.h#9 integrate
.. //depot/projects/trustedbsd/base/sys/dev/pst/pst-iop.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/pst/pst-iop.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/pst/pst-raid.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sound/pci/ich.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sound/pci/ich.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sound/pci/via8233.c#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/sound/pci/via8233.h#1 branch
.. //depot/projects/trustedbsd/base/sys/dev/sound/pci/via82c686.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sound/pci/via82c686.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/dsp.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/syscons/syscons.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/dev/vx/if_vx.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/i386/conf/NEWCARD.hints#3 delete
.. //depot/projects/trustedbsd/base/sys/i386/i386/pmap.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_ktrace.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_mac.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_poll.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_time.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/kern/sys_pipe.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/kern/tty_tty.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_mount.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_syscalls.c#27 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_vnops.c#26 integrate
.. //depot/projects/trustedbsd/base/sys/modules/osf1/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/sys/modules/sound/driver/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/sys/modules/sound/driver/via8233/Makefile#1 branch
.. //depot/projects/trustedbsd/base/sys/net/if.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/net/if.h#8 integrate
.. //depot/projects/trustedbsd/base/sys/net/if_ethersubr.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/net/if_tap.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/net/if_var.h#8 integrate
.. //depot/projects/trustedbsd/base/sys/net/rtsock.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/atm_if.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/ip_fw2.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/tcp_input.c#18 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/tcp_output.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/tcp_subr.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/tcp_usrreq.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/tcp_var.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/netinet6/in6_var.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/nfsclient/bootp_subr.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/pci/if_dc.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/pci/if_rl.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/pci/if_sis.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/pci/if_ste.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/pci/if_stereg.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/pci/ohci_pci.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/pci/uhci_pci.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/security/lomac/kernel_util.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/security/mac_biba/mac_biba.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/security/mac_bsdextended/mac_bsdextended.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/security/mac_mls/mac_mls.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/security/mac_none/mac_none.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/security/mac_test/mac_test.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/include/asmacros.h#9 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/include/signal.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/include/tsb.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/include/tte.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/exception.S#4 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/genassym.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/locore.S#2 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/mp_locore.S#2 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/mp_machdep.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/pmap.c#23 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/swtch.S#2 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/tsb.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/sys/consio.h#5 integrate
.. //depot/projects/trustedbsd/base/sys/sys/mac.h#5 integrate
.. //depot/projects/trustedbsd/base/sys/sys/mac_policy.h#6 integrate
.. //depot/projects/trustedbsd/base/sys/sys/mount.h#12 integrate
.. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_vnops.c#7 integrate
.. //depot/projects/trustedbsd/base/usr.bin/basename/basename.c#6 integrate
.. //depot/projects/trustedbsd/base/usr.bin/chat/chat.c#3 integrate
.. //depot/projects/trustedbsd/base/usr.bin/chflags/chflags.c#5 integrate
.. //depot/projects/trustedbsd/base/usr.bin/col/col.c#5 integrate
.. //depot/projects/trustedbsd/base/usr.bin/colcrt/colcrt.c#5 integrate
.. //depot/projects/trustedbsd/base/usr.bin/cut/cut.c#4 integrate
.. //depot/projects/trustedbsd/base/usr.bin/find/find.1#8 integrate
.. //depot/projects/trustedbsd/base/usr.bin/find/option.c#6 integrate
.. //depot/projects/trustedbsd/base/usr.bin/hesinfo/hesinfo.c#6 integrate
.. //depot/projects/trustedbsd/base/usr.bin/id/id.c#4 integrate
.. //depot/projects/trustedbsd/base/usr.bin/make/nonints.h#4 integrate
.. //depot/projects/trustedbsd/base/usr.bin/msgs/msgs.c#4 integrate
.. //depot/projects/trustedbsd/base/usr.bin/nl/nl.c#4 integrate
.. //depot/projects/trustedbsd/base/usr.bin/rpcinfo/rpcinfo.c#4 integrate
.. //depot/projects/trustedbsd/base/usr.bin/talk/talk.c#5 integrate
.. //depot/projects/trustedbsd/base/usr.bin/touch/touch.c#5 integrate
.. //depot/projects/trustedbsd/base/usr.bin/unifdef/unifdef.c#5 integrate
.. //depot/projects/trustedbsd/base/usr.bin/whereis/whereis.c#2 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/iostat/iostat.c#2 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/kernbb/kernbb.c#2 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/mrouted/config.c#2 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/vidcontrol/vidcontrol.1#5 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/vidcontrol/vidcontrol.c#5 integrate
Differences ...
==== //depot/projects/trustedbsd/base/bin/ls/ls.1#10 (text+ko) ====
@@ -33,9 +33,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)ls.1 8.7 (Berkeley) 7/29/94
-.\" $FreeBSD: src/bin/ls/ls.1,v 1.67 2002/05/29 15:09:49 ru Exp $
+.\" $FreeBSD: src/bin/ls/ls.1,v 1.68 2002/08/19 07:15:20 ru Exp $
.\"
-.Dd December 29, 2002
+.Dd May 19, 2002
.Dt LS 1
.Os
.Sh NAME
==== //depot/projects/trustedbsd/base/bin/sh/jobs.c#6 (text+ko) ====
@@ -40,7 +40,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.54 2002/07/25 10:47:38 tjr Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.56 2002/08/18 06:43:44 tjr Exp $");
#include <fcntl.h>
#include <signal.h>
@@ -741,9 +741,6 @@
TRACE(("Child shell %d\n", (int)getpid()));
wasroot = rootshell;
rootshell = 0;
- for (i = njobs, p = jobtab ; --i >= 0 ; p++)
- if (p->used)
- freejob(p);
closescript();
INTON;
clear_traps();
@@ -785,6 +782,11 @@
}
}
#endif
+ INTOFF;
+ for (i = njobs, p = jobtab ; --i >= 0 ; p++)
+ if (p->used)
+ freejob(p);
+ INTON;
if (wasroot && iflag) {
setsignal(SIGINT);
setsignal(SIGQUIT);
@@ -966,13 +968,8 @@
sig = WTERMSIG(status);
}
if (sig != 0 && sig != SIGINT && sig != SIGPIPE) {
- if (jp->foreground) {
-#if JOBS
- if (WIFSTOPPED(status))
- i = WSTOPSIG(status);
- else
-#endif
- i = WTERMSIG(status);
+ if (thisjob->foreground && !WIFSTOPPED(status)) {
+ i = WTERMSIG(status);
if ((i & 0x7F) < NSIG && sys_siglist[i & 0x7F])
out1str(sys_siglist[i & 0x7F]);
else
==== //depot/projects/trustedbsd/base/bin/test/test.c#12 (text+ko) ====
@@ -11,7 +11,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/test/test.c,v 1.51 2002/08/15 14:53:20 maxim Exp $");
+__FBSDID("$FreeBSD: src/bin/test/test.c,v 1.52 2002/08/19 09:19:31 maxim Exp $");
#include <sys/types.h>
#include <sys/stat.h>
==== //depot/projects/trustedbsd/base/include/ctype.h#5 (text+ko) ====
@@ -39,7 +39,7 @@
* SUCH DAMAGE.
*
* @(#)ctype.h 8.4 (Berkeley) 1/21/94
- * $FreeBSD: src/include/ctype.h,v 1.19 2002/08/16 13:42:59 keichii Exp $
+ * $FreeBSD: src/include/ctype.h,v 1.21 2002/08/19 08:58:51 ache Exp $
*/
#ifndef _CTYPE_H_
@@ -65,10 +65,8 @@
#define _CTYPE_I 0x00080000L /* Ideogram */
#define _CTYPE_T 0x00100000L /* Special */
#define _CTYPE_Q 0x00200000L /* Phonogram */
-#define _CTYPE_SWM 0xe0000000L /* Mask to get screen width data */
-#define _CTYPE_SWS 30 /* Bits to shift to get width */
#define _CTYPE_SW0 0x20000000L /* 0 width character */
-#define _CTYPE_SW1 0x00000000L /* 1 width character / default*/
+#define _CTYPE_SW1 0x40000000L /* 1 width character */
#define _CTYPE_SW2 0x80000000L /* 2 width character */
#define _CTYPE_SW3 0xc0000000L /* 3 width character */
==== //depot/projects/trustedbsd/base/include/wchar.h#6 (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.11 2002/08/13 09:30:40 tjr Exp $
+ * $FreeBSD: src/include/wchar.h,v 1.12 2002/08/18 06:30:10 tjr Exp $
*/
/*-
@@ -117,22 +117,16 @@
int fwide(FILE *, int);
wint_t getwc(FILE *);
wint_t getwchar(void);
-#if 0
-/* XXX: not implemented */
size_t mbrlen(const char * __restrict, size_t, mbstate_t * __restrict);
size_t mbrtowc(wchar_t * __restrict, const char * __restrict, size_t,
mbstate_t * __restrict);
int mbsinit(const mbstate_t *);
size_t mbsrtowcs(wchar_t * __restrict, const char ** __restrict, size_t,
mbstate_t * __restrict);
-#endif
wint_t putwc(wchar_t, FILE *);
wint_t putwchar(wchar_t);
wint_t ungetwc(wint_t, FILE *);
-#if 0
-/* XXX: not implemented */
size_t wcrtomb(char * __restrict, wchar_t, mbstate_t * __restrict);
-#endif
wchar_t *wcscat(wchar_t * __restrict, const wchar_t * __restrict);
wchar_t *wcschr(const wchar_t *, wchar_t);
int wcscmp(const wchar_t *, const wchar_t *);
@@ -147,11 +141,8 @@
wchar_t *wcsncpy(wchar_t * __restrict , const wchar_t * __restrict, size_t);
wchar_t *wcspbrk(const wchar_t *, const wchar_t *);
wchar_t *wcsrchr(const wchar_t *, wchar_t);
-#if 0
-/* XXX: not implemented */
size_t wcsrtombs(char * __restrict, const wchar_t ** __restrict, size_t,
mbstate_t * __restrict);
-#endif
size_t wcsspn(const wchar_t *, const wchar_t *);
wchar_t *wcsstr(const wchar_t *, const wchar_t *);
#if 0
==== //depot/projects/trustedbsd/base/lib/libc/gen/getcwd.c#3 (text+ko) ====
@@ -35,7 +35,7 @@
static char sccsid[] = "@(#)getcwd.c 8.5 (Berkeley) 2/7/95";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/getcwd.c,v 1.21 2002/02/01 01:08:48 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/getcwd.c,v 1.22 2002/08/19 17:14:58 jmallett Exp $");
#include "namespace.h"
#include <sys/param.h>
@@ -155,7 +155,7 @@
/*
* Build pointer to the parent directory, allocating memory
* as necessary. Max length is 3 for "../", the largest
- * possible component name, plus a trailing NULL.
+ * possible component name, plus a trailing NUL.
*/
if (bup + 3 + MAXNAMLEN + 1 >= eup) {
if ((up = reallocf(up, upsize *= 2)) == NULL)
==== //depot/projects/trustedbsd/base/lib/libc/gen/vis.c#4 (text+ko) ====
@@ -35,7 +35,7 @@
static char sccsid[] = "@(#)vis.c 8.1 (Berkeley) 7/19/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/vis.c,v 1.10 2002/05/28 16:59:39 alfred Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/vis.c,v 1.11 2002/08/19 17:14:58 jmallett Exp $");
#include <sys/types.h>
#include <limits.h>
@@ -159,7 +159,7 @@
* strvis, strvisx - visually encode characters from src into dst
*
* Dst must be 4 times the size of src to account for possible
- * expansion. The length of dst, not including the trailing NULL,
+ * expansion. The length of dst, not including the trailing NUL,
* is returned.
*
* Strvisx encodes exactly len bytes from src into dst.
==== //depot/projects/trustedbsd/base/lib/libc/locale/Makefile.inc#6 (text+ko) ====
@@ -1,23 +1,29 @@
# from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/libc/locale/Makefile.inc,v 1.28 2002/08/06 00:49:59 tjr Exp $
+# $FreeBSD: src/lib/libc/locale/Makefile.inc,v 1.30 2002/08/18 06:30:10 tjr Exp $
# locale sources
.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/locale ${.CURDIR}/../libc/locale
SRCS+= ansi.c big5.c btowc.c collate.c collcmp.c euc.c fix_grouping.c frune.c \
isctype.c iswctype.c \
- ldpart.c lmessages.c lmonetary.c lnumeric.c localeconv.c mbrune.c \
+ ldpart.c lmessages.c lmonetary.c lnumeric.c localeconv.c mbrlen.c \
+ mbrtowc.c mbrune.c mbsinit.c mbsrtowcs.c \
mskanji.c nl_langinfo.c nomacros.c none.c rune.c \
runetype.c setinvalidrune.c setlocale.c setrunelocale.c table.c \
- tolower.c toupper.c utf2.c wctob.c wctrans.c wctype.c
+ tolower.c toupper.c utf2.c wcrtomb.c wcsrtombs.c wctob.c wctrans.c \
+ wctype.c wcwidth.c
.if ${LIB} == "c"
MAN+= btowc.3 \
ctype.3 digittoint.3 isalnum.3 isalpha.3 isascii.3 isblank.3 iscntrl.3 \
isdigit.3 isgraph.3 islower.3 isprint.3 ispunct.3 isspace.3 \
- isupper.3 iswalnum.3 isxdigit.3 mbrune.3 multibyte.3 nl_langinfo.3 \
+ isupper.3 iswalnum.3 isxdigit.3 mbrlen.3 mbrtowc.3 mbrune.3 mbsinit.3 \
+ mbsrtowcs.3 multibyte.3 \
+ nl_langinfo.3 \
rune.3 \
- setlocale.3 toascii.3 tolower.3 toupper.3 towlower.3 wctrans.3 wctype.3
+ setlocale.3 toascii.3 tolower.3 toupper.3 towlower.3 wcsrtombs.3 \
+ wcrtomb.3 \
+ wctrans.3 wctype.3
MAN+= euc.4 utf2.4
MLINKS+=btowc.3 wctob.3
==== //depot/projects/trustedbsd/base/lib/libc/locale/isctype.c#3 (text+ko) ====
@@ -43,7 +43,7 @@
static char sccsid[] = "@(#)isctype.c 8.3 (Berkeley) 2/24/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/isctype.c,v 1.8 2002/03/22 21:52:18 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/isctype.c,v 1.9 2002/08/17 20:03:44 ache Exp $");
#include <ctype.h>
@@ -52,7 +52,7 @@
digittoint(c)
int c;
{
- return (__maskrune((c), 0xFF));
+ return (__maskrune(c, 0xFF));
}
#undef isalnum
@@ -60,7 +60,7 @@
isalnum(c)
int c;
{
- return (__istype((c), _CTYPE_A|_CTYPE_D));
+ return (__istype(c, _CTYPE_A|_CTYPE_D));
}
#undef isalpha
@@ -68,7 +68,7 @@
isalpha(c)
int c;
{
- return (__istype((c), _CTYPE_A));
+ return (__istype(c, _CTYPE_A));
}
#undef isascii
@@ -76,7 +76,7 @@
isascii(c)
int c;
{
- return (((c) & ~0x7F) == 0);
+ return ((c & ~0x7F) == 0);
}
#undef isblank
@@ -84,7 +84,7 @@
isblank(c)
int c;
{
- return (__istype((c), _CTYPE_B));
+ return (__istype(c, _CTYPE_B));
}
#undef iscntrl
@@ -92,7 +92,7 @@
iscntrl(c)
int c;
{
- return (__istype((c), _CTYPE_C));
+ return (__istype(c, _CTYPE_C));
}
#undef isdigit
@@ -100,7 +100,7 @@
isdigit(c)
int c;
{
- return (__isctype((c), _CTYPE_D));
+ return (__isctype(c, _CTYPE_D));
}
#undef isgraph
@@ -108,7 +108,7 @@
isgraph(c)
int c;
{
- return (__istype((c), _CTYPE_G));
+ return (__istype(c, _CTYPE_G));
}
#undef ishexnumber
@@ -116,7 +116,7 @@
ishexnumber(c)
int c;
{
- return (__istype((c), _CTYPE_X));
+ return (__istype(c, _CTYPE_X));
}
#undef isideogram
@@ -124,7 +124,7 @@
isideogram(c)
int c;
{
- return (__istype((c), _CTYPE_I));
+ return (__istype(c, _CTYPE_I));
}
#undef islower
@@ -132,7 +132,7 @@
islower(c)
int c;
{
- return (__istype((c), _CTYPE_L));
+ return (__istype(c, _CTYPE_L));
}
#undef isnumber
@@ -140,7 +140,7 @@
isnumber(c)
int c;
{
- return (__istype((c), _CTYPE_D));
+ return (__istype(c, _CTYPE_D));
}
#undef isphonogram
@@ -148,7 +148,7 @@
isphonogram(c)
int c;
{
- return (__istype((c), _CTYPE_Q));
+ return (__istype(c, _CTYPE_Q));
}
#undef isprint
@@ -156,7 +156,7 @@
isprint(c)
int c;
{
- return (__istype((c), _CTYPE_R));
+ return (__istype(c, _CTYPE_R));
}
#undef ispunct
@@ -164,7 +164,7 @@
ispunct(c)
int c;
{
- return (__istype((c), _CTYPE_P));
+ return (__istype(c, _CTYPE_P));
}
#undef isrune
@@ -172,7 +172,7 @@
isrune(c)
int c;
{
- return (__istype((c), 0xFFFFFF00L));
+ return (__istype(c, 0xFFFFFF00L));
}
#undef isspace
@@ -180,7 +180,7 @@
isspace(c)
int c;
{
- return (__istype((c), _CTYPE_S));
+ return (__istype(c, _CTYPE_S));
}
#undef isspecial
@@ -188,7 +188,7 @@
isspecial(c)
int c;
{
- return (__istype((c), _CTYPE_T));
+ return (__istype(c, _CTYPE_T));
}
#undef isupper
@@ -196,7 +196,7 @@
isupper(c)
int c;
{
- return (__istype((c), _CTYPE_U));
+ return (__istype(c, _CTYPE_U));
}
#undef isxdigit
@@ -204,7 +204,7 @@
isxdigit(c)
int c;
{
- return (__isctype((c), _CTYPE_X));
+ return (__isctype(c, _CTYPE_X));
}
#undef toascii
@@ -212,7 +212,7 @@
toascii(c)
int c;
{
- return ((c) & 0x7F);
+ return (c & 0x7F);
}
#undef tolower
==== //depot/projects/trustedbsd/base/lib/libc/locale/iswctype.c#3 (text+ko) ====
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/iswctype.c,v 1.2 2002/08/16 13:45:23 keichii Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/iswctype.c,v 1.6 2002/08/17 20:30:34 ache Exp $");
#include <wctype.h>
@@ -49,7 +49,7 @@
iswalnum(wc)
wint_t wc;
{
- return (__istype((wc), _CTYPE_A|_CTYPE_D));
+ return (__istype(wc, _CTYPE_A|_CTYPE_D));
}
#undef iswalpha
@@ -57,7 +57,7 @@
iswalpha(wc)
wint_t wc;
{
- return (__istype((wc), _CTYPE_A));
+ return (__istype(wc, _CTYPE_A));
}
#undef iswascii
@@ -65,7 +65,7 @@
iswascii(wc)
wint_t wc;
{
- return (((wc) & ~0x7F) == 0);
+ return ((wc & ~0x7F) == 0);
}
#undef iswblank
@@ -73,7 +73,7 @@
iswblank(wc)
wint_t wc;
{
- return (__istype((wc), _CTYPE_B));
+ return (__istype(wc, _CTYPE_B));
}
#undef iswcntrl
@@ -81,7 +81,7 @@
iswcntrl(wc)
wint_t wc;
{
- return (__istype((wc), _CTYPE_C));
+ return (__istype(wc, _CTYPE_C));
}
#undef iswdigit
@@ -89,7 +89,7 @@
iswdigit(wc)
wint_t wc;
{
- return (__isctype((wc), _CTYPE_D));
+ return (__isctype(wc, _CTYPE_D));
}
#undef iswgraph
@@ -97,7 +97,7 @@
iswgraph(wc)
wint_t wc;
{
- return (__istype((wc), _CTYPE_G));
+ return (__istype(wc, _CTYPE_G));
}
#undef iswhexnumber
@@ -105,7 +105,7 @@
iswhexnumber(wc)
wint_t wc;
{
- return (__istype((wc), _CTYPE_X));
+ return (__istype(wc, _CTYPE_X));
}
#undef iswideogram
@@ -113,7 +113,7 @@
iswideogram(wc)
wint_t wc;
{
- return (__istype((wc), _CTYPE_I));
+ return (__istype(wc, _CTYPE_I));
}
#undef iswlower
@@ -121,7 +121,7 @@
iswlower(wc)
wint_t wc;
{
- return (__istype((wc), _CTYPE_L));
+ return (__istype(wc, _CTYPE_L));
}
#undef iswnumber
@@ -129,7 +129,7 @@
iswnumber(wc)
wint_t wc;
{
- return (__istype((wc), _CTYPE_D));
+ return (__istype(wc, _CTYPE_D));
}
#undef iswphonogram
@@ -137,7 +137,7 @@
iswphonogram(wc)
wint_t wc;
{
- return (__istype((wc), _CTYPE_Q));
+ return (__istype(wc, _CTYPE_Q));
}
#undef iswprint
@@ -145,7 +145,7 @@
iswprint(wc)
wint_t wc;
{
- return (__istype((wc), _CTYPE_R));
+ return (__istype(wc, _CTYPE_R));
}
#undef iswpunct
@@ -153,7 +153,7 @@
iswpunct(wc)
wint_t wc;
{
- return (__istype((wc), _CTYPE_P));
+ return (__istype(wc, _CTYPE_P));
}
#undef iswrune
@@ -161,7 +161,7 @@
iswrune(wc)
wint_t wc;
{
- return (__istype((wc), 0xFFFFFF00L));
+ return (__istype(wc, 0xFFFFFF00L));
}
#undef iswspace
@@ -169,7 +169,7 @@
iswspace(wc)
wint_t wc;
{
- return (__istype((wc), _CTYPE_S));
+ return (__istype(wc, _CTYPE_S));
}
#undef iswspecial
@@ -177,7 +177,7 @@
iswspecial(wc)
wint_t wc;
{
- return (__istype((wc), _CTYPE_T));
+ return (__istype(wc, _CTYPE_T));
}
#undef iswupper
@@ -185,7 +185,7 @@
iswupper(wc)
wint_t wc;
{
- return (__istype((wc), _CTYPE_U));
+ return (__istype(wc, _CTYPE_U));
}
#undef iswxdigit
@@ -193,7 +193,7 @@
iswxdigit(wc)
wint_t wc;
{
- return (__isctype((wc), _CTYPE_X));
+ return (__isctype(wc, _CTYPE_X));
}
#undef towlower
@@ -212,12 +212,3 @@
return (__toupper(wc));
}
-#undef wcwidth
-int
-wcwidth(wc)
- wchar_t wc;
-{
- int width = (unsigned)__maskrune((wc), _CTYPE_SWM) >> _CTYPE_SWS;
- return width ? width : iswprint(wc);
-}
-
==== //depot/projects/trustedbsd/base/lib/libc/stdio/asprintf.c#5 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/asprintf.c,v 1.10 2002/08/13 09:30:41 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/asprintf.c,v 1.11 2002/08/19 03:52:36 jmallett Exp $");
#include <stdio.h>
#include <stdlib.h>
@@ -54,7 +54,7 @@
errno = ENOMEM;
return (-1);
}
- f._bf._size = f._w = 127; /* Leave room for the NULL */
+ f._bf._size = f._w = 127; /* Leave room for the NUL */
f._extra = &ext;
INITEXTRA(&f);
ret = __vfprintf(&f, fmt, ap); /* Use unlocked __vfprintf */
==== //depot/projects/trustedbsd/base/lib/libc/stdio/vasprintf.c#4 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/vasprintf.c,v 1.14 2002/08/13 09:30:41 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/vasprintf.c,v 1.15 2002/08/19 03:52:36 jmallett Exp $");
#include <stdio.h>
#include <stdlib.h>
@@ -53,7 +53,7 @@
errno = ENOMEM;
return (-1);
}
- f._bf._size = f._w = 127; /* Leave room for the NULL */
+ f._bf._size = f._w = 127; /* Leave room for the NUL */
f._extra = &ext;
INITEXTRA(&f);
ret = __vfprintf(&f, fmt, ap);
==== //depot/projects/trustedbsd/base/libexec/rpc.rstatd/rstat_proc.c#4 (text+ko) ====
@@ -33,7 +33,7 @@
static char sccsid[] = "from: @(#)rstat_proc.c 2.2 88/08/01 4.0 RPCSRC";
#endif
static const char rcsid[] =
- "$FreeBSD: src/libexec/rpc.rstatd/rstat_proc.c,v 1.18 2002/04/28 15:18:47 des Exp $";
+ "$FreeBSD: src/libexec/rpc.rstatd/rstat_proc.c,v 1.19 2002/08/18 17:57:07 bde Exp $";
#endif
/*
@@ -55,6 +55,7 @@
#include <fcntl.h>
#include <kvm.h>
#include <limits.h>
+#include <nlist.h>
#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
==== //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#22 (text+ko) ====
@@ -31,7 +31,7 @@
<sect1>
<sect1info>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.95 2002/08/12 18:38:26 bmah Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.97 2002/08/18 04:08:04 bmah Exp $</pubdate>
</sect1info>
<title>Supported Devices</title>
@@ -2447,9 +2447,9 @@
</itemizedlist>
</para>
- <para arch="i386,alpha">Comtrol Rocketport card (rp driver)</para>
+ <para arch="i386,alpha">Comtrol Rocketport card (&man.rp.4; driver)</para>
- <para arch="i386">Cyclades Cyclom-y serial board (&man.cy.4; driver)</para>
+ <para arch="i386">Cyclades Cyclom-Y serial board (&man.cy.4; driver)</para>
<para arch="i386">STB 4 port card using shared IRQ</para>
@@ -2943,7 +2943,7 @@
</listitem>
</itemizedlist>
</para>
- <para arch="i386,pc98">Scanners (through SANE) (&man.uscanner.4; driver)
+ <para arch="i386,pc98">Scanners (through <application>SANE</application>) (&man.uscanner.4; driver)
<itemizedlist>
<listitem>
<para>Perfection 636U</para>
@@ -3027,8 +3027,8 @@
</itemizedlist>
</para>
- <para arch="i386,alpha"><quote>PC standard</quote>parallel ports (&man.ppc.4; driver)</para>
- <para arch="pc98"><quote>PC-9821 standard</quote>parallel ports (&man.ppc.4; driver)</para>
+ <para arch="i386,alpha"><quote>PC standard</quote> parallel ports (&man.ppc.4; driver)</para>
+ <para arch="pc98"><quote>PC-9821 standard</quote> parallel ports (&man.ppc.4; driver)</para>
<para arch="i386">PC-compatible joysticks (&man.joy.4; driver)</para>
==== //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#37 (text+ko) ====
@@ -3,7 +3,7 @@
<corpauthor>The FreeBSD Project</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.406 2002/08/10 17:34:42 hrs Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.409 2002/08/19 17:13:08 bmah Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -1988,6 +1988,13 @@
url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-02:37.kqueue.asc">FreeBSD-SA-02:37</ulink>.
&merged;</para>
+ <para>Several bounds-checking bugs in system calls, which could
+ result in some system calls returning a large portion of kernel
+ memory, have been fixed. More information can be found in
+ security advisory <ulink
+ url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-02:38.signed-error.asc">FreeBSD-SA-02:38</ulink>.
+ &merged;</para>
+
</sect2>
<sect2 id="userland">
@@ -2031,7 +2038,7 @@
<para>&man.biff.1; now accepts a <option>b</option> argument to
enable <quote>bell notification</quote> of new mail (which does
not disturb the terminal contents as <command>biff y</command>
- would).</para>
+ would). &merged;</para>
<para>&man.biff.1; now uses the first terminal associated with the
standard input, standard output or standard error file
@@ -2104,6 +2111,10 @@
<para>&man.chmod.1; now supports a <option>-h</option> for
changing the mode of a symbolic link.</para>
+ <para>&man.chmod.1; now also, when the mode is modified, prints
+ the old and new modes if the <option>-v</option> option is
+ specified more than once.</para>
+
<para role="historic">&man.chown.8; now correctly follows symbolic links named as
command line arguments if run without
<option>-R</option>. &merged;</para>
@@ -2138,7 +2149,7 @@
<para>&man.cp.1; now takes a (nonstandard) <option>-n</option>
option to automatically answer <quote>no</quote> when it would
- ask to overwrite a file.</para>
+ ask to overwrite a file. &merged;</para>
<para>A new &man.csplit.1; utility, which splits files based on
context, has been added.</para>
@@ -2721,9 +2732,9 @@
This makes it easier to use &man.mtree.8; as a part of an
intrusion-detection system. &merged;</para>
- <para>&man.mv.1; now takes a (nonstandard) <option>-n</option> to
+ <para>&man.mv.1; now takes a (nonstandard) <option>-n</option> option to
automatically answer <quote>no</quote> when it would ask to
- overwrite a file.</para>
+ overwrite a file. &merged;</para>
<para role="historic">&man.natd.8; now supports a
<option>-log_ipfw_denied</option> option to log packets that
@@ -2804,6 +2815,13 @@
files, NIS, or Hesiod. The old
<filename>hosts.conf</filename> file is no longer used.</para>
+ <para>&man.od.1; now supports the <option>-A</option> option to
+ specify the input address base, the <option>-N</option> option to
+ specify the number of bytes to dump, the <option>-j</option>
+ option to specify the number of bytes to skip, the
+ <option>-s</option> option to output signed decimal shorts, and
+ the <option>-t</option> option to specify output type. &merged;</para>
+
<para><application>PAM</application> support has been added for
account management and sessions.</para>
@@ -3605,7 +3623,7 @@
<para>The &man.csh.1; shell has been replaced by &man.tcsh.1;,
although it can still be run as <command>csh</command>.
<application>tcsh</application> has been updated to version
- 6.12.</para>
+ 6.12. &merged;</para>
<para>The contributed version of
<application>tcp_wrappers</application> now includes the
@@ -3619,7 +3637,7 @@
4.2. &merged;</para>
<para><application>top</application> has been updated to version
- 3.5b12.</para>
+ 3.5b12. &merged;</para>
<para><application>traceroute</application> has been updated to
LBL version 1.4a12.</para>
@@ -3818,7 +3836,7 @@
<title>OpenSSL</title>
<para><application>OpenSSL</application> has been updated to
- 0.9.6g.</para>
+ 0.9.6g. &merged;</para>
<para role="historic"><application>OpenSSL</application> now has support for
>>> TRUNCATED FOR MAIL (1000 lines) <<<
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message
More information about the trustedbsd-cvs
mailing list