Date: Thu, 19 Dec 2002 15:53:00 -0800 (PST) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 22533 for review Message-ID: <200212192353.gBJNr05I032379@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=22533 Change 22533 by marcel@marcel_vaio on 2002/12/19 15:52:57 IFC @22531 The acpidump changes were expected to conflict. This has been resolved by checking the -x hint after the sysctl, but before scanning the 1MB of memory (if applicable). Affected files ... .. //depot/projects/ia64/bin/ls/print.c#10 integrate .. //depot/projects/ia64/contrib/one-true-awk/FIXES#4 integrate .. //depot/projects/ia64/contrib/one-true-awk/FREEBSD-upgrade#5 integrate .. //depot/projects/ia64/contrib/one-true-awk/b.c#4 integrate .. //depot/projects/ia64/contrib/one-true-awk/main.c#5 integrate .. //depot/projects/ia64/contrib/one-true-awk/run.c#4 integrate .. //depot/projects/ia64/lib/libc/compat-43/killpg.2#3 integrate .. //depot/projects/ia64/lib/libc/compat-43/sigpause.2#3 integrate .. //depot/projects/ia64/lib/libc/compat-43/sigvec.2#3 integrate .. //depot/projects/ia64/lib/libc/db/man/btree.3#2 integrate .. //depot/projects/ia64/lib/libc/db/man/dbm.3#3 integrate .. //depot/projects/ia64/lib/libc/db/man/dbopen.3#4 integrate .. //depot/projects/ia64/lib/libc/db/man/hash.3#2 integrate .. //depot/projects/ia64/lib/libc/db/man/mpool.3#3 integrate .. //depot/projects/ia64/lib/libc/gen/dllockinit.3#3 integrate .. //depot/projects/ia64/lib/libc/gen/dlopen.3#7 integrate .. //depot/projects/ia64/lib/libc/gen/exec.3#3 integrate .. //depot/projects/ia64/lib/libc/gen/fmtcheck.3#5 integrate .. //depot/projects/ia64/lib/libc/gen/fts.3#4 integrate .. //depot/projects/ia64/lib/libc/gen/getcap.3#3 integrate .. //depot/projects/ia64/lib/libc/gen/getdomainname.3#3 integrate .. //depot/projects/ia64/lib/libc/gen/gethostname.3#3 integrate .. //depot/projects/ia64/lib/libc/gen/getmntinfo.3#2 integrate .. //depot/projects/ia64/lib/libc/gen/getttyent.3#2 integrate .. //depot/projects/ia64/lib/libc/gen/getvfsbyname.3#4 integrate .. //depot/projects/ia64/lib/libc/gen/getvfsent.3#4 integrate .. //depot/projects/ia64/lib/libc/gen/glob.3#3 integrate .. //depot/projects/ia64/lib/libc/gen/makecontext.3#4 integrate .. //depot/projects/ia64/lib/libc/gen/msgctl.3#3 integrate .. //depot/projects/ia64/lib/libc/gen/msgrcv.3#3 integrate .. //depot/projects/ia64/lib/libc/gen/msgsnd.3#3 integrate .. //depot/projects/ia64/lib/libc/gen/rand48.3#3 integrate .. //depot/projects/ia64/lib/libc/gen/scandir.3#2 integrate .. //depot/projects/ia64/lib/libc/gen/siginterrupt.3#2 integrate .. //depot/projects/ia64/lib/libc/gen/signal.3#4 integrate .. //depot/projects/ia64/lib/libc/gen/sysctl.3#7 integrate .. //depot/projects/ia64/lib/libc/gen/syslog.3#2 integrate .. //depot/projects/ia64/lib/libc/gen/tcsendbreak.3#2 integrate .. //depot/projects/ia64/lib/libc/gen/tcsetattr.3#3 integrate .. //depot/projects/ia64/lib/libc/gen/timezone.3#3 integrate .. //depot/projects/ia64/lib/libc/gen/ulimit.3#4 integrate .. //depot/projects/ia64/lib/libc/gen/vis.3#3 integrate .. //depot/projects/ia64/lib/libc/gmon/moncontrol.3#3 integrate .. //depot/projects/ia64/lib/libc/i386/sys/i386_get_ldt.2#3 integrate .. //depot/projects/ia64/lib/libc/i386/sys/i386_set_watch.3#3 integrate .. //depot/projects/ia64/lib/libc/i386/sys/i386_vm86.2#3 integrate .. //depot/projects/ia64/lib/libc/locale/rune.3#7 integrate .. //depot/projects/ia64/lib/libc/net/addr2ascii.3#2 integrate .. //depot/projects/ia64/lib/libc/net/getaddrinfo.3#4 integrate .. //depot/projects/ia64/lib/libc/net/gethostbyname.3#4 integrate .. //depot/projects/ia64/lib/libc/net/getnameinfo.3#3 integrate .. //depot/projects/ia64/lib/libc/net/getnetent.3#3 integrate .. //depot/projects/ia64/lib/libc/net/inet6_option_space.3#3 integrate .. //depot/projects/ia64/lib/libc/net/inet_net.3#2 integrate .. //depot/projects/ia64/lib/libc/net/rcmdsh.3#5 integrate .. //depot/projects/ia64/lib/libc/net/resolver.3#3 integrate .. //depot/projects/ia64/lib/libc/net/sockatmark.3#3 integrate .. //depot/projects/ia64/lib/libc/posix1e/mac_set.3#4 integrate .. //depot/projects/ia64/lib/libc/regex/regex.3#4 integrate .. //depot/projects/ia64/lib/libc/rpc/des_crypt.3#3 integrate .. //depot/projects/ia64/lib/libc/rpc/getnetconfig.3#3 integrate .. //depot/projects/ia64/lib/libc/rpc/rpc.3#3 integrate .. //depot/projects/ia64/lib/libc/rpc/rpc_clnt_auth.3#2 integrate .. //depot/projects/ia64/lib/libc/rpc/rpc_clnt_calls.3#3 integrate .. //depot/projects/ia64/lib/libc/rpc/rpc_clnt_create.3#6 integrate .. //depot/projects/ia64/lib/libc/rpc/rpc_secure.3#3 integrate .. //depot/projects/ia64/lib/libc/rpc/rpc_soc.3#5 integrate .. //depot/projects/ia64/lib/libc/rpc/rpc_svc_calls.3#3 integrate .. //depot/projects/ia64/lib/libc/rpc/rpc_svc_create.3#3 integrate .. //depot/projects/ia64/lib/libc/rpc/rpc_svc_err.3#2 integrate .. //depot/projects/ia64/lib/libc/rpc/rpc_svc_reg.3#2 integrate .. //depot/projects/ia64/lib/libc/rpc/rpcbind.3#3 integrate .. //depot/projects/ia64/lib/libc/rpc/rtime.3#3 integrate .. //depot/projects/ia64/lib/libc/stdio/fflush.3#2 integrate .. //depot/projects/ia64/lib/libc/stdio/fopen.3#6 integrate .. //depot/projects/ia64/lib/libc/stdio/fputs.3#4 integrate .. //depot/projects/ia64/lib/libc/stdio/fseek.3#5 integrate .. //depot/projects/ia64/lib/libc/stdio/perror.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/setbuf.3#5 integrate .. //depot/projects/ia64/lib/libc/stdlib/lsearch.3#4 integrate .. //depot/projects/ia64/lib/libc/stdlib/tsearch.3#6 integrate .. //depot/projects/ia64/lib/libc/stdtime/ctime.3#3 integrate .. //depot/projects/ia64/lib/libc/stdtime/strptime.3#6 integrate .. //depot/projects/ia64/lib/libc/string/strcpy.3#10 integrate .. //depot/projects/ia64/lib/libc/string/strerror.3#8 integrate .. //depot/projects/ia64/lib/libc/sys/accept.2#6 integrate .. //depot/projects/ia64/lib/libc/sys/access.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/acct.2#5 integrate .. //depot/projects/ia64/lib/libc/sys/aio_cancel.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/aio_error.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/aio_read.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/aio_return.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/aio_suspend.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/aio_write.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/bind.2#5 integrate .. //depot/projects/ia64/lib/libc/sys/chdir.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/chflags.2#6 integrate .. //depot/projects/ia64/lib/libc/sys/chmod.2#6 integrate .. //depot/projects/ia64/lib/libc/sys/chown.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/chroot.2#6 integrate .. //depot/projects/ia64/lib/libc/sys/clock_gettime.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/close.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/connect.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/dup.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/execve.2#7 integrate .. //depot/projects/ia64/lib/libc/sys/extattr_get_file.2#7 integrate .. //depot/projects/ia64/lib/libc/sys/fcntl.2#6 integrate .. //depot/projects/ia64/lib/libc/sys/fhopen.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/flock.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/fork.2#6 integrate .. //depot/projects/ia64/lib/libc/sys/fsync.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/getdirentries.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/getfh.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/getfsstat.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/getgroups.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/getitimer.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/getlogin.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/getpeername.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/getpriority.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/getrlimit.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/getrusage.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/getsockname.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/getsockopt.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/gettimeofday.2#6 integrate .. //depot/projects/ia64/lib/libc/sys/ioctl.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/kenv.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/kill.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/kldsym.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/kqueue.2#6 integrate .. //depot/projects/ia64/lib/libc/sys/kse.2#6 integrate .. //depot/projects/ia64/lib/libc/sys/ktrace.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/link.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/listen.2#5 integrate .. //depot/projects/ia64/lib/libc/sys/lseek.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/mkdir.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/mkfifo.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/mknod.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/mlock.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/mmap.2#8 integrate .. //depot/projects/ia64/lib/libc/sys/mount.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/msync.2#5 integrate .. //depot/projects/ia64/lib/libc/sys/munmap.2#5 integrate .. //depot/projects/ia64/lib/libc/sys/nanosleep.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/open.2#5 integrate .. //depot/projects/ia64/lib/libc/sys/pathconf.2#5 integrate .. //depot/projects/ia64/lib/libc/sys/poll.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/profil.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/ptrace.2#6 integrate .. //depot/projects/ia64/lib/libc/sys/quotactl.2#6 integrate .. //depot/projects/ia64/lib/libc/sys/read.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/readlink.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/reboot.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/recv.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/rename.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/revoke.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/rfork.2#5 integrate .. //depot/projects/ia64/lib/libc/sys/rmdir.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/rtprio.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/sched_get_priority_max.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/sched_setscheduler.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/select.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/semctl.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/semget.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/send.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/sendfile.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/setgroups.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/setregid.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/shmat.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/shmctl.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/shmget.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/sigaction.2#10 integrate .. //depot/projects/ia64/lib/libc/sys/sigprocmask.2#6 integrate .. //depot/projects/ia64/lib/libc/sys/sigreturn.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/socket.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/stat.2#5 integrate .. //depot/projects/ia64/lib/libc/sys/statfs.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/swapon.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/symlink.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/sysarch.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/syscall.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/truncate.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/undelete.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/unlink.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/utimes.2#6 integrate .. //depot/projects/ia64/lib/libc/sys/uuidgen.2#8 integrate .. //depot/projects/ia64/lib/libc/sys/wait.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/write.2#4 integrate .. //depot/projects/ia64/lib/libc/uuid/uuid.3#3 integrate .. //depot/projects/ia64/lib/libc/xdr/xdr.3#3 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_accept.c#3 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_connect.c#3 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_recvfrom.c#3 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_recvmsg.c#3 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_sendmsg.c#3 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_sendto.c#3 integrate .. //depot/projects/ia64/lib/libstand/Makefile#12 integrate .. //depot/projects/ia64/lib/libstand/gzipfs.c#2 integrate .. //depot/projects/ia64/lib/libstand/libstand.3#5 integrate .. //depot/projects/ia64/lib/libstand/stand.h#11 integrate .. //depot/projects/ia64/lib/libstand/zipfs.c#3 delete .. //depot/projects/ia64/share/man/man4/trm.4#2 integrate .. //depot/projects/ia64/share/man/man4/usb.4#7 integrate .. //depot/projects/ia64/share/man/man5/device.hints.5#6 integrate .. //depot/projects/ia64/share/termcap/termcap.src#12 integrate .. //depot/projects/ia64/sys/boot/alpha/common/conf.c#2 integrate .. //depot/projects/ia64/sys/boot/arc/loader/conf.c#2 integrate .. //depot/projects/ia64/sys/boot/efi/loader/conf.c#6 integrate .. //depot/projects/ia64/sys/boot/i386/loader/conf.c#5 integrate .. //depot/projects/ia64/sys/boot/ia64/skiload/conf.c#2 integrate .. //depot/projects/ia64/sys/boot/powerpc/loader/conf.c#2 integrate .. //depot/projects/ia64/sys/boot/sparc64/loader/main.c#11 integrate .. //depot/projects/ia64/sys/geom/geom_mbr.c#19 integrate .. //depot/projects/ia64/sys/net/bpf_compat.h#2 integrate .. //depot/projects/ia64/sys/net/bridge.c#13 integrate .. //depot/projects/ia64/sys/net/if_ethersubr.c#21 integrate .. //depot/projects/ia64/sys/net/radix.c#6 integrate .. //depot/projects/ia64/sys/net/radix.h#3 integrate .. //depot/projects/ia64/sys/net/raw_cb.c#6 integrate .. //depot/projects/ia64/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#2 integrate .. //depot/projects/ia64/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#2 integrate .. //depot/projects/ia64/sys/netgraph/ng_bridge.c#6 integrate .. //depot/projects/ia64/sys/netgraph/ng_l2tp.c#2 integrate .. //depot/projects/ia64/sys/netgraph/ng_one2many.c#5 integrate .. //depot/projects/ia64/sys/netgraph/ng_ppp.c#8 integrate .. //depot/projects/ia64/sys/netgraph/ng_pptpgre.c#7 integrate .. //depot/projects/ia64/sys/netgraph/ng_source.c#3 integrate .. //depot/projects/ia64/sys/netgraph/ng_tee.c#4 integrate .. //depot/projects/ia64/sys/netinet/ip_encap.c#5 integrate .. //depot/projects/ia64/sys/netinet/ip_fw.c#10 integrate .. //depot/projects/ia64/sys/netinet6/esp_core.c#4 integrate .. //depot/projects/ia64/sys/netinet6/ip6_fw.c#6 integrate .. //depot/projects/ia64/sys/netinet6/ip6_input.c#10 integrate .. //depot/projects/ia64/sys/netinet6/ipcomp_output.c#3 integrate .. //depot/projects/ia64/sys/netipsec/keysock.c#2 integrate .. //depot/projects/ia64/sys/netkey/keysock.c#10 integrate .. //depot/projects/ia64/sys/netsmb/smb_trantcp.c#11 integrate .. //depot/projects/ia64/sys/sys/ipc.h#5 integrate .. //depot/projects/ia64/sys/vm/vm_fault.c#22 integrate .. //depot/projects/ia64/sys/vm/vm_object.c#30 integrate .. //depot/projects/ia64/sys/vm/vm_object.h#11 integrate .. //depot/projects/ia64/sys/vm/vm_page.c#29 integrate .. //depot/projects/ia64/sys/vm/vm_page.h#20 integrate .. //depot/projects/ia64/tools/regression/lib/libc/locale/test-wcrtomb.c#3 integrate .. //depot/projects/ia64/tools/regression/lib/libc/stdio/Makefile#1 branch .. //depot/projects/ia64/tools/regression/lib/libc/stdio/test-perror.c#1 branch .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.birthday#4 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.wissenschaft#2 integrate .. //depot/projects/ia64/usr.sbin/acpi/acpidump/acpi.c#7 integrate .. //depot/projects/ia64/usr.sbin/acpi/acpidump/acpi_user.c#6 integrate .. //depot/projects/ia64/usr.sbin/acpi/acpidump/acpidump.c#9 integrate .. //depot/projects/ia64/usr.sbin/acpi/acpidump/acpidump.h#7 integrate Differences ... ==== //depot/projects/ia64/bin/ls/print.c#10 (text+ko) ==== @@ -40,7 +40,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.63 2002/11/06 01:18:12 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.64 2002/12/19 01:13:23 tjr Exp $"); #include <sys/param.h> #include <sys/stat.h> @@ -674,6 +674,14 @@ else snprintf(name, sizeof(name), "%s/%s", p->fts_parent->fts_accpath, p->fts_name); + /* + * We have no way to tell whether a symbolic link has an ACL since + * pathconf() and acl_get_file() both follow them. + */ + if (S_ISLNK(p->fts_statp->st_mode)) { + *haveacls = 1; + return; + } if ((ret = pathconf(name, _PC_ACL_EXTENDED)) <= 0) { if (ret < 0 && errno != EINVAL) warn("%s", name); ==== //depot/projects/ia64/contrib/one-true-awk/FIXES#4 (text+ko) ==== @@ -25,6 +25,12 @@ This file lists all bug fixes, changes, etc., made since the AWK book was sent to the printers in August, 1987. +Dec 13, 2002: + for the moment, the internationalization changes of nov 29 are + rolled back -- programs like x = 1.2 don't work in some locales, + because the parser is expecting x = 1,2. until i understand this + better, this will have to wait. + Nov 29, 2002: modified b.c (with tiny changes in main and run) to support locales, using strcoll and iswhatever tests for posix character ==== //depot/projects/ia64/contrib/one-true-awk/FREEBSD-upgrade#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/contrib/one-true-awk/FREEBSD-upgrade,v 1.4 2002/12/13 05:03:15 obrien Exp $ +# $FreeBSD: src/contrib/one-true-awk/FREEBSD-upgrade,v 1.5 2002/12/19 04:34:00 obrien Exp $ Import of the February 1998 version of the "one true awk", as described in "The AWK Programming Language", by Al Aho, Brian Kernighan, @@ -20,4 +20,4 @@ The vendor import was done by: - cvs import src/contrib/one-true-awk BELL_LABS bwk_20021129 + cvs import src/contrib/one-true-awk BELL_LABS bwk_20021213 ==== //depot/projects/ia64/contrib/one-true-awk/b.c#4 (text+ko) ==== @@ -282,24 +282,9 @@ return c; } -static int collate_range_cmp(int a, int b) -{ - int r; - static char s[2][2]; - - if ((uschar)a == (uschar)b) - return 0; - s[0][0] = a; - s[1][0] = b; - if ((r = strcoll(s[0], s[1])) == 0) - r = (uschar)a - (uschar)b; - return r; -} - char *cclenter(const char *argp) /* add a character class */ { int i, c, c2; - int j; uschar *p = (uschar *) argp; uschar *op, *bp; static uschar *buf = 0; @@ -318,18 +303,15 @@ c2 = *p++; if (c2 == '\\') c2 = quoted((char **) &p); - if (collate_range_cmp(c, c2) > 0) { /* empty; ignore */ + if (c > c2) { /* empty; ignore */ bp--; i--; continue; } - for (j = 0; j < NCHARS; j++) { - if ((collate_range_cmp(c, j) > 0) || - collate_range_cmp(j, c2) > 0) - continue; + while (c < c2) { if (!adjbuf((char **) &buf, &bufsz, bp-buf+2, 100, (char **) &bp, 0)) FATAL("out of space for character class [%.10s...] 2", p); - *bp++ = j; + *bp++ = ++c; i++; } continue; @@ -713,24 +695,23 @@ * relex(), the expanded character class (prior to range expansion) * must be less than twice the size of their full name. */ - struct charclass { const char *cc_name; int cc_namelen; - int (*cc_func)(int); + const char *cc_expand; } charclasses[] = { - { "alnum", 5, isalnum }, - { "alpha", 5, isalpha }, - { "blank", 5, isblank }, - { "cntrl", 5, iscntrl }, - { "digit", 5, isdigit }, - { "graph", 5, isgraph }, - { "lower", 5, islower }, - { "print", 5, isprint }, - { "punct", 5, ispunct }, - { "space", 5, isspace }, - { "upper", 5, isupper }, - { "xdigit", 6, isxdigit }, + { "alnum", 5, "0-9A-Za-z" }, + { "alpha", 5, "A-Za-z" }, + { "blank", 5, " \t" }, + { "cntrl", 5, "\000-\037\177" }, + { "digit", 5, "0-9" }, + { "graph", 5, "\041-\176" }, + { "lower", 5, "a-z" }, + { "print", 5, " \041-\176" }, + { "punct", 5, "\041-\057\072-\100\133-\140\173-\176" }, + { "space", 5, " \f\n\r\t\v" }, + { "upper", 5, "A-Z" }, + { "xdigit", 6, "0-9A-Fa-f" }, { NULL, 0, NULL }, }; @@ -743,7 +724,7 @@ static int bufsz = 100; uschar *bp; struct charclass *cc; - int i; + const uschar *p; switch (c = *prestr++) { case '|': return OR; @@ -792,14 +773,8 @@ if (cc->cc_name != NULL && prestr[1 + cc->cc_namelen] == ':' && prestr[2 + cc->cc_namelen] == ']') { prestr += cc->cc_namelen + 3; - for (i = 0; i < NCHARS; i++) { - if (!adjbuf((char **) &buf, &bufsz, bp-buf+1, 100, (char **) &bp, 0)) - FATAL("out of space for reg expr %.10s...", lastre); - if (cc->cc_func(i)) { - *bp++ = i; - n++; - } - } + for (p = (const uschar *) cc->cc_expand; *p; p++) + *bp++ = *p; } else *bp++ = c; } else if (c == '\0') { ==== //depot/projects/ia64/contrib/one-true-awk/main.c#5 (text+ko) ==== @@ -22,12 +22,11 @@ THIS SOFTWARE. ****************************************************************/ -const char *version = "version 20021129"; +const char *version = "version 20021213"; #define DEBUG #include <stdio.h> #include <ctype.h> -#include <locale.h> #include <stdlib.h> #include <string.h> #include <signal.h> @@ -55,7 +54,6 @@ { const char *fs = NULL; - setlocale(LC_ALL, ""); cmdname = argv[0]; if (argc == 1) { fprintf(stderr, "Usage: %s [-f programfile | 'program'] [-Ffieldsep] [-v var=value] [files]\n", cmdname); ==== //depot/projects/ia64/contrib/one-true-awk/run.c#4 (text+ko) ==== @@ -1509,11 +1509,11 @@ if (t == FTOUPPER) { for (p = buf; *p; p++) if (islower((uschar) *p)) - *p = toupper((uschar)*p); + *p = toupper(*p); } else { for (p = buf; *p; p++) if (isupper((uschar) *p)) - *p = tolower((uschar)*p); + *p = tolower(*p); } tempfree(x); x = gettemp(); ==== //depot/projects/ia64/lib/libc/compat-43/killpg.2#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)killpg.2 8.1 (Berkeley) 6/2/93 -.\" $FreeBSD: src/lib/libc/compat-43/killpg.2,v 1.11 2002/12/18 12:45:08 ru Exp $ +.\" $FreeBSD: src/lib/libc/compat-43/killpg.2,v 1.12 2002/12/19 09:40:21 ru Exp $ .\" .Dd June 2, 1993 .Dt KILLPG 2 @@ -76,7 +76,9 @@ will fail and no signal will be sent if: .Bl -tag -width Er .It Bq Er EINVAL -.Fa Sig +The +.Fa sig +argument is not a valid signal number. .It Bq Er ESRCH No process can be found in the process group specified by ==== //depot/projects/ia64/lib/libc/compat-43/sigpause.2#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)sigpause.2 8.1 (Berkeley) 6/2/93 -.\" $FreeBSD: src/lib/libc/compat-43/sigpause.2,v 1.11 2002/12/18 12:45:08 ru Exp $ +.\" $FreeBSD: src/lib/libc/compat-43/sigpause.2,v 1.12 2002/12/19 09:40:21 ru Exp $ .\" .Dd June 2, 1993 .Dt SIGPAUSE 2 @@ -56,7 +56,9 @@ to the set of masked signals and then waits for a signal to arrive; on return the set of masked signals is restored. -.Fa Sigmask +The +.Fa sigmask +argument is usually 0 to indicate that no signals are to be blocked. The ==== //depot/projects/ia64/lib/libc/compat-43/sigvec.2#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)sigvec.2 8.2 (Berkeley) 4/19/94 -.\" $FreeBSD: src/lib/libc/compat-43/sigvec.2,v 1.20 2002/12/18 12:45:08 ru Exp $ +.\" $FreeBSD: src/lib/libc/compat-43/sigvec.2,v 1.21 2002/12/19 09:40:21 ru Exp $ .\" .Dd April 19, 1994 .Dt SIGVEC 2 @@ -274,7 +274,9 @@ points to memory that is not a valid part of the process address space. .It Bq Er EINVAL -.Fa Sig +The +.Fa sig +argument is not a valid signal number. .It Bq Er EINVAL An attempt is made to ignore or supply a handler for @@ -312,8 +314,10 @@ .Fa sig is the signal number, into which the hardware faults and traps are mapped as defined below. -.Fa Code -is a parameter that is either a constant +The +.Fa code +argument +is either a constant as given below or, for compatibility mode faults, the code provided by the hardware (Compatibility mode faults are distinguished from the other @@ -321,7 +325,9 @@ traps by having .Dv PSL_CM set in the psl). -.Fa Scp +The +.Fa scp +argument is a pointer to the .Fa sigcontext structure (defined in ==== //depot/projects/ia64/lib/libc/db/man/btree.3#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)btree.3 8.4 (Berkeley) 8/18/94 -.\" $FreeBSD: src/lib/libc/db/man/btree.3,v 1.5 2001/10/01 16:08:50 ru Exp $ +.\" $FreeBSD: src/lib/libc/db/man/btree.3,v 1.6 2002/12/19 09:40:21 ru Exp $ .\" .Dd August 18, 1994 .Dt BTREE 3 @@ -172,7 +172,9 @@ (no comparison function is specified), the keys are compared lexically, with shorter keys considered less than longer keys. .It Va prefix -.Va Prefix +The +.Va prefix +element is the prefix comparison function. If specified, this routine must return the number of bytes of the second key argument which are necessary to determine that it is greater than the first @@ -206,10 +208,11 @@ If the file already exists (and the .Dv O_TRUNC flag is not specified), the -values specified for the parameters +values specified for the .Va flags , lorder and .Va psize +arguments are ignored in favor of the values used when the tree was created. .Pp ==== //depot/projects/ia64/lib/libc/db/man/dbm.3#3 (text+ko) ==== @@ -13,7 +13,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/db/man/dbm.3,v 1.6 2002/12/18 12:45:08 ru Exp $ +.\" $FreeBSD: src/lib/libc/db/man/dbm.3,v 1.7 2002/12/19 09:40:21 ru Exp $ .\" .\" Note: The date here should be updated whenever a non-trivial .\" change is made to the manual page. @@ -77,7 +77,9 @@ .Fn dbm_open base flags mode function opens or creates a database. +The .Fa base +argument is the basename of the file containing the database; the actual database has a .Pa .db @@ -88,9 +90,11 @@ .Qq Li /home/me/mystuff then the actual database is in the file .Pa /home/me/mystuff.db . +The .Fa flags and .Fa mode +arguments are passed to .Xr open 2 . .Pq Dv O_RDWR | O_CREAT @@ -129,7 +133,9 @@ .Fn dbm_store db key data flags function inserts or replaces an entry in the database. +The .Fa flags +argument is either .Dv DBM_INSERT or ==== //depot/projects/ia64/lib/libc/db/man/dbopen.3#4 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)dbopen.3 8.5 (Berkeley) 1/2/94 -.\" $FreeBSD: src/lib/libc/db/man/dbopen.3,v 1.7 2002/12/18 12:45:08 ru Exp $ +.\" $FreeBSD: src/lib/libc/db/man/dbopen.3,v 1.8 2002/12/19 09:40:21 ru Exp $ .\" .Dd January 2, 1994 .Dt DBOPEN 3 @@ -69,7 +69,9 @@ .Fa file for reading and/or writing. Files never intended to be preserved on disk may be created by setting -the file parameter to +the +.Fa file +argument to .Dv NULL . .Pp The @@ -180,15 +182,16 @@ or .Va sync function may result in inconsistent or lost information. -.Va Close +.Va close routines return -1 on error (setting .Va errno ) and 0 on success. .It Va del A pointer to a routine to remove key/data pairs from the database. .Pp -The parameter +The .Fa flags +argument may be set to the following value: .Bl -tag -width indent .It Dv R_CURSOR @@ -196,7 +199,7 @@ The cursor must have previously been initialized. .El .Pp -.Va Delete +.Va delete routines return -1 on error (setting .Va errno ) , 0 on success, and 1 if the specified @@ -230,7 +233,7 @@ .Fa key are returned in the structure referenced by .Fa data . -.Va Get +.Va get routines return -1 on error (setting .Va errno ) , 0 on success, and 1 if the @@ -239,8 +242,9 @@ .It Va put A pointer to a routine to store key/data pairs in the database. .Pp -The parameter +The .Fa flags +argument may be set to one of the following values: .Bl -tag -width indent .It Dv R_CURSOR @@ -302,7 +306,7 @@ routines is to enter the new key/data pair, replacing any previously existing key. .Pp -.Va Put +.Va put routines return -1 on error (setting .Va errno ) , 0 on success, and 1 if the @@ -336,7 +340,7 @@ .Pp The .Fa flags -value +argument .Em must be set to one of the following values: .Bl -tag -width indent @@ -390,7 +394,7 @@ access methods because they each imply that the keys have an inherent order which does not change. .Pp -.Va Seq +.Va seq routines return -1 on error (setting .Va errno ) , 0 on success and 1 if there are no key/data pairs less than or greater @@ -410,7 +414,7 @@ .Pp The .Fa flags -value may be set to the following value: +argument may be set to the following value: .Bl -tag -width indent .It Dv R_RECNOSYNC If the @@ -427,7 +431,7 @@ manual page for more information.) .El .Pp -.Va Sync +.Va sync routines return -1 on error (setting .Va errno ) and 0 on success. @@ -471,7 +475,7 @@ .It Bq Er EFTYPE A file is incorrectly formatted. .It Bq Er EINVAL -A parameter has been specified (hash function, pad byte etc.) that is +An argument has been specified (hash function, pad byte etc.) that is incompatible with the current file specification or which is not meaningful for the function (for example, use of the cursor without prior initialization) or there is a mismatch between the version ==== //depot/projects/ia64/lib/libc/db/man/hash.3#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)hash.3 8.6 (Berkeley) 8/18/94 -.\" $FreeBSD: src/lib/libc/db/man/hash.3,v 1.6 2001/10/01 16:08:50 ru Exp $ +.\" $FreeBSD: src/lib/libc/db/man/hash.3,v 1.7 2002/12/19 09:40:21 ru Exp $ .\" .Dd August 18, 1994 .Dt HASH 3 @@ -77,14 +77,18 @@ The elements of this structure are as follows: .Bl -tag -width indent .It Va bsize -.Va Bsize +The +.Va bsize +element defines the .Nm table bucket size, and is, by default, 256 bytes. It may be preferable to increase the page size for disk-resident tables and tables with large data items. .It Va ffactor -.Va Ffactor +The +.Va ffactor +element indicates a desired density within the .Nm table. @@ -94,7 +98,9 @@ table grows or shrinks. The default value is 8. .It Va nelem -.Va Nelem +The +.Va nelem +element is an estimate of the final size of the .Nm table. @@ -110,7 +116,9 @@ advisory, and the access method will allocate more memory rather than fail. .It Va hash -.Va Hash +The +.Va hash +element is a user defined .Nm function. @@ -141,10 +149,11 @@ If the file already exists (and the .Dv O_TRUNC flag is not specified), the -values specified for the parameters +values specified for the .Va bsize , ffactor , lorder and .Va nelem +arguments are ignored and the values specified when the tree was created are used. .Pp ==== //depot/projects/ia64/lib/libc/db/man/mpool.3#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)mpool.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/db/man/mpool.3,v 1.10 2002/12/18 12:45:08 ru Exp $ +.\" $FreeBSD: src/lib/libc/db/man/mpool.3,v 1.11 2002/12/19 09:40:21 ru Exp $ .\" .Dd June 4, 1993 .Dt MPOOL 3 @@ -146,20 +146,22 @@ is set. The .Fa flags -parameter is not currently used. +argument is not currently used. .Pp The function .Fn mpool_put unpins the page referenced by .Fa pgaddr . -.Fa Pgaddr +The +.Fa pgaddr +argument must be an address previously returned by .Fn mpool_get or .Fn mpool_new . The .Fa flags -value is specified by +argument is specified by .Em or Ns 'ing any of the following values: .Bl -tag -width indent ==== //depot/projects/ia64/lib/libc/gen/dllockinit.3#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/dllockinit.3,v 1.12 2002/12/18 10:13:53 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/dllockinit.3,v 1.13 2002/12/19 09:40:21 ru Exp $ .\" .Dd July 5, 2000 .Os @@ -52,7 +52,7 @@ .Pp The .Fa context -parameter specifies an opaque context for creating locks. The +argument specifies an opaque context for creating locks. The dynamic linker will pass it to the .Fa lock_create function when creating the locks it needs. When the dynamic linker @@ -65,26 +65,26 @@ .Pp The .Fa lock_create -parameter specifies a function for creating a read/write lock. It +argument specifies a function for creating a read/write lock. It must return a pointer to the new lock. .Pp The .Fa rlock_acquire and .Fa wlock_acquire -parameters specify functions which lock a lock for reading or +arguments specify functions which lock a lock for reading or writing, respectively. The .Fa lock_release -parameter specifies a function which unlocks a lock. Each of these +argument specifies a function which unlocks a lock. Each of these functions is passed a pointer to the lock. .Pp The .Fa lock_destroy -parameter specifies a function to destroy a lock. It may be +argument specifies a function to destroy a lock. It may be .Dv NULL if locks do not need to be destroyed. The .Fa context_destroy -parameter specifies a function to destroy the context. It may be +argument specifies a function to destroy the context. It may be .Dv NULL if the context does not need to be destroyed. .Pp ==== //depot/projects/ia64/lib/libc/gen/dlopen.3#7 (text+ko) ==== @@ -30,7 +30,7 @@ .\" Copyright (c) 1991 Sun Microsystems, Inc. .\" .\" @(#) dlopen.3 1.6 90/01/31 SMI -.\" $FreeBSD: src/lib/libc/gen/dlopen.3,v 1.24 2002/12/18 10:13:53 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/dlopen.3,v 1.25 2002/12/19 09:40:21 ru Exp $ .\" .Dd September 10, 2002 .Os @@ -92,7 +92,9 @@ .Fa path is interpreted as a reference to the main executable of the process. +The .Fa mode +argument controls the way in which external function references from the loaded object are bound to their referents. It must contain one of the following values, possibly ORed with ==== //depot/projects/ia64/lib/libc/gen/exec.3#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)exec.3 8.3 (Berkeley) 1/24/94 -.\" $FreeBSD: src/lib/libc/gen/exec.3,v 1.17 2002/12/18 10:13:53 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/exec.3,v 1.18 2002/12/19 09:40:21 ru Exp $ .\" .Dd January 24, 1994 .Dt EXEC 3 @@ -118,9 +118,9 @@ functions also specify the environment of the executed process by following the .Dv NULL -pointer that terminates the list of arguments in the parameter list -or the pointer to the argv array with an additional parameter. -This additional parameter is an array of pointers to null-terminated strings +pointer that terminates the list of arguments in the argument list +or the pointer to the argv array with an additional argument. +This additional argument is an array of pointers to null-terminated strings and .Em must be terminated by a ==== //depot/projects/ia64/lib/libc/gen/fmtcheck.3#5 (text+ko) ==== @@ -31,7 +31,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/fmtcheck.3,v 1.7 2002/10/16 04:03:02 tjr Exp $ +.\" $FreeBSD: src/lib/libc/gen/fmtcheck.3,v 1.8 2002/12/19 09:40:21 ru Exp $ .Dd October 16, 2002 .Os .Dt FMTCHECK 3 @@ -67,7 +67,7 @@ passed at run-time. In some cases, like .Xr catgets 3 , it is useful or necessary to use a user-supplied format string with no -guarantee that the format string matches the specified parameters. +guarantee that the format string matches the specified arguments. .Pp >>> 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?200212192353.gBJNr05I032379>