Date: Sat, 18 Jan 2003 23:07:27 -0800 (PST) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 23915 for review Message-ID: <200301190707.h0J77RC2012560@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=23915 Change 23915 by marcel@marcel_nfs on 2003/01/18 23:07:06 IFC @23913 Affected files ... .. //depot/projects/ia64/UPDATING#29 integrate .. //depot/projects/ia64/bin/ps/extern.h#9 integrate .. //depot/projects/ia64/bin/ps/keyword.c#10 integrate .. //depot/projects/ia64/bin/ps/print.c#10 integrate .. //depot/projects/ia64/bin/ps/ps.c#10 integrate .. //depot/projects/ia64/bin/ps/ps.h#5 integrate .. //depot/projects/ia64/crypto/telnet/arpa/telnet.h#3 integrate .. //depot/projects/ia64/etc/defaults/pccard.conf#16 integrate .. //depot/projects/ia64/etc/locale.alias#3 integrate .. //depot/projects/ia64/etc/rc.subr#8 integrate .. //depot/projects/ia64/include/arpa/telnet.h#3 integrate .. //depot/projects/ia64/include/ieeefp.h#3 integrate .. //depot/projects/ia64/include/stringlist.h#3 integrate .. //depot/projects/ia64/lib/libc/alpha/gen/_ctx_start.S#2 integrate .. //depot/projects/ia64/lib/libc/alpha/gen/_setjmp.S#3 integrate .. //depot/projects/ia64/lib/libc/alpha/gen/fabs.S#2 integrate .. //depot/projects/ia64/lib/libc/alpha/gen/getcontext.S#2 integrate .. //depot/projects/ia64/lib/libc/alpha/gen/rfork_thread.S#2 integrate .. //depot/projects/ia64/lib/libc/alpha/gen/setjmp.S#3 integrate .. //depot/projects/ia64/lib/libc/alpha/gen/sigsetjmp.S#2 integrate .. //depot/projects/ia64/lib/libc/alpha/net/byte_swap_2.S#3 integrate .. //depot/projects/ia64/lib/libc/alpha/net/byte_swap_4.S#3 integrate .. //depot/projects/ia64/lib/libc/alpha/net/htonl.S#3 integrate .. //depot/projects/ia64/lib/libc/alpha/net/htons.S#3 integrate .. //depot/projects/ia64/lib/libc/alpha/net/ntohl.S#3 integrate .. //depot/projects/ia64/lib/libc/alpha/net/ntohs.S#3 integrate .. //depot/projects/ia64/lib/libc/alpha/string/bcopy.S#2 integrate .. //depot/projects/ia64/lib/libc/alpha/string/bzero.S#2 integrate .. //depot/projects/ia64/lib/libc/alpha/string/ffs.S#2 integrate .. //depot/projects/ia64/lib/libc/alpha/string/memcpy.S#2 integrate .. //depot/projects/ia64/lib/libc/alpha/string/memmove.S#2 integrate .. //depot/projects/ia64/lib/libc/alpha/sys/Ovfork.S#2 integrate .. //depot/projects/ia64/lib/libc/alpha/sys/brk.S#2 integrate .. //depot/projects/ia64/lib/libc/alpha/sys/cerror.S#2 integrate .. //depot/projects/ia64/lib/libc/alpha/sys/exect.S#2 integrate .. //depot/projects/ia64/lib/libc/alpha/sys/fork.S#2 integrate .. //depot/projects/ia64/lib/libc/alpha/sys/pipe.S#2 integrate .. //depot/projects/ia64/lib/libc/alpha/sys/ptrace.S#2 integrate .. //depot/projects/ia64/lib/libc/alpha/sys/sbrk.S#2 integrate .. //depot/projects/ia64/lib/libc/alpha/sys/setlogin.S#2 integrate .. //depot/projects/ia64/lib/libc/alpha/sys/sigreturn.S#2 integrate .. //depot/projects/ia64/lib/libc/gen/stringlist.3#3 integrate .. //depot/projects/ia64/lib/libc/gen/stringlist.c#5 integrate .. //depot/projects/ia64/lib/libc/powerpc/SYS.h#3 integrate .. //depot/projects/ia64/lib/libc/sys/listen.2#6 integrate .. //depot/projects/ia64/lib/libc/sys/mincore.2#6 integrate .. //depot/projects/ia64/lib/libufs/Makefile#3 integrate .. //depot/projects/ia64/lib/libufs/block.c#3 integrate .. //depot/projects/ia64/lib/libufs/cgroup.c#1 branch .. //depot/projects/ia64/lib/libufs/error.c#2 delete .. //depot/projects/ia64/lib/libufs/inode.c#2 integrate .. //depot/projects/ia64/lib/libufs/libufs.h#4 integrate .. //depot/projects/ia64/lib/libufs/sblock.c#4 integrate .. //depot/projects/ia64/lib/libufs/type.c#4 integrate .. //depot/projects/ia64/lib/libutil/property.c#3 integrate .. //depot/projects/ia64/release/Makefile#36 integrate .. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/early-adopter/article.sgml#7 integrate .. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/errata/article.sgml#7 integrate .. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/hardware/common/dev.sgml#14 integrate .. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/installation/common/trouble.sgml#8 integrate .. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml#20 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/errata/article.sgml#6 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#36 integrate .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/early-adopter/Makefile#2 integrate .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/hardware/Makefile.inc#2 integrate .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/relnotes/Makefile.inc#2 integrate .. //depot/projects/ia64/sbin/ccdconfig/Makefile#3 integrate .. //depot/projects/ia64/sbin/ccdconfig/ccdconfig.c#4 integrate .. //depot/projects/ia64/sbin/ccdconfig/pathnames.h#2 integrate .. //depot/projects/ia64/sbin/dumpfs/dumpfs.c#11 integrate .. //depot/projects/ia64/sbin/tunefs/tunefs.c#9 integrate .. //depot/projects/ia64/sbin/vinum/commands.c#3 integrate .. //depot/projects/ia64/sbin/vinum/v.c#4 integrate .. //depot/projects/ia64/share/man/man4/inet.4#2 integrate .. //depot/projects/ia64/share/man/man4/wi.4#11 integrate .. //depot/projects/ia64/share/man/man5/rc.conf.5#24 integrate .. //depot/projects/ia64/share/man/man9/malloc.9#5 integrate .. //depot/projects/ia64/share/man/man9/mbuf.9#5 integrate .. //depot/projects/ia64/share/man/man9/vnode.9#6 integrate .. //depot/projects/ia64/sys/alpha/include/asm.h#5 integrate .. //depot/projects/ia64/sys/boot/i386/loader/Makefile#9 integrate .. //depot/projects/ia64/sys/conf/files#57 integrate .. //depot/projects/ia64/sys/conf/files.alpha#15 integrate .. //depot/projects/ia64/sys/conf/files.i386#26 integrate .. //depot/projects/ia64/sys/conf/files.ia64#29 integrate .. //depot/projects/ia64/sys/conf/files.pc98#19 integrate .. //depot/projects/ia64/sys/conf/files.powerpc#11 integrate .. //depot/projects/ia64/sys/conf/files.sparc64#23 integrate .. //depot/projects/ia64/sys/conf/files.x86_64#5 integrate .. //depot/projects/ia64/sys/conf/kern.post.mk#22 integrate .. //depot/projects/ia64/sys/conf/kmod.mk#18 integrate .. //depot/projects/ia64/sys/conf/majors#18 integrate .. //depot/projects/ia64/sys/conf/options#39 integrate .. //depot/projects/ia64/sys/conf/options.pc98#13 integrate .. //depot/projects/ia64/sys/dev/bge/if_bge.c#19 integrate .. //depot/projects/ia64/sys/dev/ccd/ccd.c#13 integrate .. //depot/projects/ia64/sys/dev/dpt/dpt_scsi.c#3 integrate .. //depot/projects/ia64/sys/dev/ed/if_ed_pccard.c#10 integrate .. //depot/projects/ia64/sys/dev/firewire/firewire.c#12 integrate .. //depot/projects/ia64/sys/dev/firewire/fwdev.c#5 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohci.c#10 integrate .. //depot/projects/ia64/sys/dev/firewire/sbp.c#10 integrate .. //depot/projects/ia64/sys/dev/mii/Makefile.miidevs#2 delete .. //depot/projects/ia64/sys/dev/mii/acphy.c#8 integrate .. //depot/projects/ia64/sys/dev/mii/amphy.c#6 integrate .. //depot/projects/ia64/sys/dev/mii/bmtphy.c#3 integrate .. //depot/projects/ia64/sys/dev/mii/brgphy.c#9 integrate .. //depot/projects/ia64/sys/dev/mii/dcphy.c#7 integrate .. //depot/projects/ia64/sys/dev/mii/devlist2h.awk#2 delete .. //depot/projects/ia64/sys/dev/mii/e1000phy.c#5 integrate .. //depot/projects/ia64/sys/dev/mii/exphy.c#6 integrate .. //depot/projects/ia64/sys/dev/mii/inphy.c#4 integrate .. //depot/projects/ia64/sys/dev/mii/lxtphy.c#6 integrate .. //depot/projects/ia64/sys/dev/mii/miidevs.h#7 delete .. //depot/projects/ia64/sys/dev/mii/nsgphy.c#7 integrate .. //depot/projects/ia64/sys/dev/mii/nsphy.c#6 integrate .. //depot/projects/ia64/sys/dev/mii/pnaphy.c#7 integrate .. //depot/projects/ia64/sys/dev/mii/pnphy.c#5 integrate .. //depot/projects/ia64/sys/dev/mii/qsphy.c#7 integrate .. //depot/projects/ia64/sys/dev/mii/rlphy.c#9 integrate .. //depot/projects/ia64/sys/dev/mii/tdkphy.c#7 integrate .. //depot/projects/ia64/sys/dev/mii/tlphy.c#6 integrate .. //depot/projects/ia64/sys/dev/mii/xmphy.c#7 integrate .. //depot/projects/ia64/sys/dev/pccard/pccarddevs#18 integrate .. //depot/projects/ia64/sys/dev/pccard/pccarddevs.h#18 integrate .. //depot/projects/ia64/sys/dev/puc/puc.c#13 integrate .. //depot/projects/ia64/sys/dev/puc/pucvar.h#9 integrate .. //depot/projects/ia64/sys/dev/tx/if_tx.c#6 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumconfig.c#8 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi.c#28 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi_pccard.c#12 integrate .. //depot/projects/ia64/sys/dev/xe/if_xe_pccard.c#5 integrate .. //depot/projects/ia64/sys/fs/unionfs/union_vfsops.c#8 integrate .. //depot/projects/ia64/sys/i386/include/floatingpoint.h#3 integrate .. //depot/projects/ia64/sys/i386/include/ieeefp.h#2 integrate .. //depot/projects/ia64/sys/i386/include/smapi.h#1 branch .. //depot/projects/ia64/sys/i386/smapi/smapi.c#1 branch .. //depot/projects/ia64/sys/i386/smapi/smapi_bios.S#1 branch .. //depot/projects/ia64/sys/i386/smapi/smapi_isa.c#1 branch .. //depot/projects/ia64/sys/i386/smapi/smapi_var.h#1 branch .. //depot/projects/ia64/sys/ia64/ia64/busdma_machdep.c#4 integrate .. //depot/projects/ia64/sys/kern/subr_bus.c#16 integrate .. //depot/projects/ia64/sys/kern/subr_disklabel.c#11 integrate .. //depot/projects/ia64/sys/kern/subr_diskmbr.c#8 integrate .. //depot/projects/ia64/sys/kern/subr_diskslice.c#15 integrate .. //depot/projects/ia64/sys/kern/uipc_socket.c#25 integrate .. //depot/projects/ia64/sys/modules/Makefile#35 integrate .. //depot/projects/ia64/sys/modules/bge/Makefile#2 integrate .. //depot/projects/ia64/sys/modules/mii/Makefile#4 integrate .. //depot/projects/ia64/sys/modules/smapi/Makefile#1 branch .. //depot/projects/ia64/sys/modules/tx/Makefile#3 integrate .. //depot/projects/ia64/sys/netinet/if_ether.c#13 integrate .. //depot/projects/ia64/sys/netinet/raw_ip.c#19 integrate .. //depot/projects/ia64/sys/netinet/tcp_output.c#14 integrate .. //depot/projects/ia64/sys/pci/if_xl.c#20 integrate .. //depot/projects/ia64/sys/pci/if_xlreg.h#7 integrate .. //depot/projects/ia64/sys/powerpc/include/_types.h#2 integrate .. //depot/projects/ia64/sys/powerpc/include/atomic.h#4 integrate .. //depot/projects/ia64/sys/powerpc/include/cpu.h#8 integrate .. //depot/projects/ia64/sys/powerpc/include/ieee.h#1 branch .. //depot/projects/ia64/sys/powerpc/include/limits.h#6 integrate .. //depot/projects/ia64/sys/powerpc/include/profile.h#1 branch .. //depot/projects/ia64/sys/powerpc/include/signal.h#3 integrate .. //depot/projects/ia64/sys/powerpc/psim/ata_iobus.c#2 integrate .. //depot/projects/ia64/sys/sys/diskslice.h#4 integrate .. //depot/projects/ia64/sys/sys/libkern.h#9 integrate .. //depot/projects/ia64/sys/sys/param.h#22 integrate .. //depot/projects/ia64/sys/tools/devlist2h.awk#2 integrate .. //depot/projects/ia64/sys/vm/vm_param.h#3 integrate .. //depot/projects/ia64/tools/regression/ccd/layout/Makefile#1 branch .. //depot/projects/ia64/tools/regression/ccd/layout/a.c#1 branch .. //depot/projects/ia64/tools/regression/ccd/layout/b.c#1 branch .. //depot/projects/ia64/tools/regression/ccd/layout/ccd.sh#1 branch .. //depot/projects/ia64/tools/regression/ccd/layout/ccd0.sh#1 branch .. //depot/projects/ia64/tools/regression/ccd/layout/ref.128k_128k_128k_128k_0_0#1 branch .. //depot/projects/ia64/tools/regression/ccd/layout/ref.128k_128k_128k_128k_0_4#1 branch .. //depot/projects/ia64/tools/regression/ccd/layout/ref.128k_128k_128k_128k_4_0#1 branch .. //depot/projects/ia64/tools/regression/ccd/layout/ref.128k_128k_128k_128k_4_2#1 branch .. //depot/projects/ia64/tools/regression/ccd/layout/ref.128k_128k_128k_128k_4_4#1 branch .. //depot/projects/ia64/tools/regression/ccd/layout/ref.256k_128k_128k_128k_0_0#1 branch .. //depot/projects/ia64/tools/regression/ccd/layout/ref.256k_128k_128k_128k_0_4#1 branch .. //depot/projects/ia64/tools/regression/ccd/layout/ref.256k_128k_128k_128k_4_0#1 branch .. //depot/projects/ia64/tools/regression/ccd/layout/ref.256k_128k_128k_128k_4_2#1 branch .. //depot/projects/ia64/tools/regression/ccd/layout/ref.256k_128k_128k_128k_4_4#1 branch .. //depot/projects/ia64/tools/regression/ccd/layout/ref.256k_128k_384k_128k_0_0#1 branch .. //depot/projects/ia64/tools/regression/ccd/layout/ref.256k_128k_384k_128k_0_4#1 branch .. //depot/projects/ia64/tools/regression/ccd/layout/ref.256k_128k_384k_128k_16_0#1 branch .. //depot/projects/ia64/tools/regression/ccd/layout/ref.256k_128k_384k_128k_16_2#1 branch .. //depot/projects/ia64/tools/regression/ccd/layout/ref.256k_128k_384k_128k_16_4#1 branch .. //depot/projects/ia64/tools/regression/ccd/layout/ref.256k_128k_384k_128k_4_0#1 branch .. //depot/projects/ia64/tools/regression/ccd/layout/ref.256k_128k_384k_128k_4_2#1 branch .. //depot/projects/ia64/tools/regression/ccd/layout/ref.256k_128k_384k_128k_4_4#1 branch .. //depot/projects/ia64/tools/tools/whereintheworld/whereintheworld.pl#2 integrate .. //depot/projects/ia64/usr.bin/elfdump/elfdump.c#2 integrate .. //depot/projects/ia64/usr.bin/unifdef/unifdef.c#9 integrate .. //depot/projects/ia64/usr.sbin/arp/arp.c#10 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/devices.c#8 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/dispatch.c#5 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/dist.c#16 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/dist.h#6 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/install.c#15 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/menus.c#23 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/sysinstall.h#16 integrate Differences ... ==== //depot/projects/ia64/UPDATING#29 (text+ko) ==== @@ -22,6 +22,11 @@ One now must have device wlan in the config file for it to operate properly. + In addition, there have been some changes to how wi devices are + configured for point to point links to bring it more in line + with the former way of doing things, as well as compatibility + with NetBSD. + 20021222: For a period after the GCC 3.2.1 import (from 12/04 to 12/22), GCC used an incompatible form of ABI for returning structures and unions @@ -1176,4 +1181,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.234 2003/01/16 16:56:58 imp Exp $ +$FreeBSD: src/UPDATING,v 1.235 2003/01/17 07:54:27 imp Exp $ ==== //depot/projects/ia64/bin/ps/extern.h#9 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)extern.h 8.3 (Berkeley) 4/2/94 - * $FreeBSD: src/bin/ps/extern.h,v 1.29 2002/11/01 23:26:20 tmm Exp $ + * $FreeBSD: src/bin/ps/extern.h,v 1.30 2003/01/19 00:22:34 jmallett Exp $ */ struct kinfo; @@ -52,6 +52,7 @@ void cputime(KINFO *, VARENT *); int donlist(void); void elapsed(KINFO *, VARENT *); +VARENT *find_varentry(VAR *); const char *fmt_argv(char **, char *, size_t); double getpcpu(const KINFO *); void kvar(KINFO *, VARENT *); @@ -63,7 +64,7 @@ void lockname(KINFO *, VARENT *); void mwchan(KINFO *, VARENT *); void pagein(KINFO *, VARENT *); -void parsefmt(const char *); +void parsefmt(const char *, int); void pcpu(KINFO *, VARENT *); void pmem(KINFO *, VARENT *); void pri(KINFO *, VARENT *); ==== //depot/projects/ia64/bin/ps/keyword.c#10 (text+ko) ==== @@ -37,7 +37,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.58 2002/10/24 00:00:57 rwatson Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.60 2003/01/19 00:31:15 jmallett Exp $"); #include <sys/param.h> #include <sys/time.h> @@ -54,7 +54,7 @@ #include "ps.h" -static VAR *findvar(char *); +static VAR *findvar(char *, int, char **header); static int vcmp(const void *, const void *); /* Compute offset in common structures. */ @@ -223,7 +223,7 @@ } void -parsefmt(const char *p) +parsefmt(const char *p, int user) { static struct varent *vtail; char *tempstr, *tempstr1; @@ -231,7 +231,7 @@ #define FMTSEP " \t,\n" tempstr1 = tempstr = strdup(p); while (tempstr && *tempstr) { - char *cp; + char *cp, *hp; VAR *v; struct varent *vent; @@ -248,10 +248,26 @@ cp = tempstr; tempstr = NULL; } - if (cp == NULL || !(v = findvar(cp))) + if (cp == NULL || !(v = findvar(cp, user, &hp))) continue; + if (!user) { + /* + * If the user is NOT adding this field manually, + * get on with our lives if this VAR is already + * represented in the list. + */ + vent = find_varentry(v); + if (vent != NULL) + continue; + } if ((vent = malloc(sizeof(struct varent))) == NULL) errx(1, "malloc failed"); + vent->header = v->header; + if (hp) { + hp = strdup(hp); + if (hp) + vent->header = hp; + } vent->var = malloc(sizeof(*vent->var)); if (vent->var == NULL) errx(1, "malloc failed"); @@ -273,7 +289,7 @@ } static VAR * -findvar(char *p) +findvar(char *p, int user, char **header) { VAR *v, key; char *hp; @@ -290,14 +306,15 @@ warnx("%s: illegal keyword specification", p); eval = 1; } - parsefmt(v->alias); + parsefmt(v->alias, user); return ((VAR *)NULL); } if (!v) { warnx("%s: keyword not found", p); eval = 1; - } else if (hp) - v->header = strdup(hp); + } + if (header) + *header = hp; return (v); } ==== //depot/projects/ia64/bin/ps/print.c#10 (text+ko) ==== @@ -37,7 +37,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.76 2002/10/31 13:41:37 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.78 2003/01/19 00:31:16 jmallett Exp $"); #include <sys/param.h> #include <sys/time.h> @@ -76,7 +76,7 @@ allempty = 1; for (vent = vhead; vent; vent = vent->next) - if (*vent->var->header != '\0') { + if (*vent->header != '\0') { allempty = 0; break; } @@ -86,11 +86,11 @@ v = vent->var; if (v->flag & LJUST) { if (vent->next == NULL) /* last one */ - (void)printf("%s", v->header); + (void)printf("%s", vent->header); else - (void)printf("%-*s", v->width, v->header); + (void)printf("%-*s", v->width, vent->header); } else - (void)printf("%*s", v->width, v->header); + (void)printf("%*s", v->width, vent->header); if (vent->next != NULL) (void)putchar(' '); } @@ -738,24 +738,24 @@ label(KINFO *k, VARENT *ve) { char *string; - mac_t label; + mac_t proclabel; int error; VAR *v; v = ve->var; string = NULL; - if (mac_prepare_process_label(&label) == -1) { + if (mac_prepare_process_label(&proclabel) == -1) { perror("mac_prepare_process_label"); goto out; } - error = mac_get_pid(k->ki_p->ki_pid, label); + error = mac_get_pid(k->ki_p->ki_pid, proclabel); if (error == 0) { - if (mac_to_text(label, &string) == -1) + if (mac_to_text(proclabel, &string) == -1) string = NULL; } - mac_free(label); + mac_free(proclabel); out: if (string != NULL) { @@ -770,18 +770,18 @@ s_label(KINFO *k) { char *string = NULL; - mac_t label; + mac_t proclabel; int error, size = 0; - if (mac_prepare_process_label(&label) == -1) { + if (mac_prepare_process_label(&proclabel) == -1) { perror("mac_prepare_process_label"); return (0); } - error = mac_get_pid(k->ki_p->ki_pid, label); - if (error == 0 && mac_to_text(label, &string) == 0) { + error = mac_get_pid(k->ki_p->ki_pid, proclabel); + if (error == 0 && mac_to_text(proclabel, &string) == 0) { size = strlen(string); free(string); } - mac_free(label); + mac_free(proclabel); return (size); } ==== //depot/projects/ia64/bin/ps/ps.c#10 (text+ko) ==== @@ -43,7 +43,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.59 2002/10/24 00:00:57 rwatson Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.61 2003/01/19 00:31:16 jmallett Exp $"); #include <sys/param.h> #include <sys/user.h> @@ -193,7 +193,7 @@ prtheader = ws.ws_row > 5 ? ws.ws_row : 22; break; case 'j': - parsefmt(jfmt); + parsefmt(jfmt, 0); _fmt = 1; jfmt[0] = '\0'; break; @@ -201,7 +201,7 @@ showkey(); exit(0); case 'l': - parsefmt(lfmt); + parsefmt(lfmt, 0); _fmt = 1; lfmt[0] = '\0'; break; @@ -217,14 +217,14 @@ dropgid = 1; break; case 'O': - parsefmt(o1); - parsefmt(optarg); - parsefmt(o2); + parsefmt(o1, 1); + parsefmt(optarg, 1); + parsefmt(o2, 1); o1[0] = o2[0] = '\0'; _fmt = 1; break; case 'o': - parsefmt(optarg); + parsefmt(optarg, 1); _fmt = 1; break; #if defined(LAZY_PS) @@ -270,13 +270,13 @@ xflg++; /* XXX: intuitive? */ break; case 'u': - parsefmt(ufmt); + parsefmt(ufmt, 0); sortby = SORTCPU; _fmt = 1; ufmt[0] = '\0'; break; case 'v': - parsefmt(vfmt); + parsefmt(vfmt, 0); sortby = SORTMEM; _fmt = 1; vfmt[0] = '\0'; @@ -292,7 +292,7 @@ xflg = 1; break; case 'Z': - parsefmt(Zfmt); + parsefmt(Zfmt, 0); Zfmt[0] = '\0'; break; case '?': @@ -325,7 +325,7 @@ errx(1, "%s", errbuf); if (!_fmt) - parsefmt(dfmt); + parsefmt(dfmt, 0); /* XXX - should be cleaner */ if (!all && ttydev == NODEV && pid == -1 && !nuids) { @@ -456,6 +456,18 @@ return uids; } +VARENT * +find_varentry(VAR *v) +{ + struct varent *vent; + + for (vent = vhead; vent; vent = vent->next) { + if (strcmp(vent->var->name, v->name) == 0) + return vent; + } + return NULL; +} + static void scanvars(void) { @@ -503,7 +515,7 @@ for (vent = vhead; vent; vent = vent->next) { v = vent->var; - i = strlen(v->header); + i = strlen(vent->header); if (v->width < i) v->width = i; totwidth += v->width + 1; /* +1 for space */ ==== //depot/projects/ia64/bin/ps/ps.h#5 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ps.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD: src/bin/ps/ps.h,v 1.14 2002/10/03 17:19:36 bde Exp $ + * $FreeBSD: src/bin/ps/ps.h,v 1.15 2003/01/19 00:31:16 jmallett Exp $ */ #define UNLIMITED 0 /* unlimited terminal width */ @@ -46,6 +46,7 @@ /* Variables. */ typedef struct varent { + const char *header; struct varent *next; struct var *var; } VARENT; ==== //depot/projects/ia64/crypto/telnet/arpa/telnet.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)telnet.h 8.2 (Berkeley) 12/15/93 - * $FreeBSD: src/crypto/telnet/arpa/telnet.h,v 1.8 2001/11/30 21:06:34 markm Exp $ + * $FreeBSD: src/crypto/telnet/arpa/telnet.h,v 1.9 2003/01/18 06:10:21 billf Exp $ */ #ifndef _ARPA_TELNET_H_ @@ -121,10 +121,14 @@ #define TELOPT_AUTHENTICATION 37/* Authenticate */ #define TELOPT_ENCRYPT 38 /* Encryption option */ #define TELOPT_NEW_ENVIRON 39 /* New - Environment variables */ +#define TELOPT_TN3270E 40 /* RFC2355 - TN3270 Enhancements */ +#define TELOPT_CHARSET 42 /* RFC2066 - Charset */ +#define TELOPT_COMPORT 44 /* RFC2217 - Com Port Control */ +#define TELOPT_KERMIT 47 /* RFC2840 - Kermit */ #define TELOPT_EXOPL 255 /* extended-options-list */ -#define NTELOPTS (1+TELOPT_NEW_ENVIRON) +#define NTELOPTS (1+TELOPT_KERMIT) #ifdef TELOPTS const char *telopts[NTELOPTS+1] = { "BINARY", "ECHO", "RCP", "SUPPRESS GO AHEAD", "NAME", @@ -136,11 +140,12 @@ "TACACS UID", "OUTPUT MARKING", "TTYLOC", "3270 REGIME", "X.3 PAD", "NAWS", "TSPEED", "LFLOW", "LINEMODE", "XDISPLOC", "OLD-ENVIRON", "AUTHENTICATION", - "ENCRYPT", "NEW-ENVIRON", + "ENCRYPT", "NEW-ENVIRON", "TN3270E", "CHARSET", "COM-PORT", + "KERMIT", 0 }; #define TELOPT_FIRST TELOPT_BINARY -#define TELOPT_LAST TELOPT_NEW_ENVIRON +#define TELOPT_LAST TELOPT_KERMIT #define TELOPT_OK(x) ((unsigned int)(x) <= TELOPT_LAST) #define TELOPT(x) telopts[(x)-TELOPT_FIRST] #endif ==== //depot/projects/ia64/etc/defaults/pccard.conf#16 (text+ko) ==== @@ -1,7 +1,7 @@ # # Default PCCARD configuration file # -# $FreeBSD: src/etc/defaults/pccard.conf,v 1.254 2003/01/14 00:50:30 trhodes Exp $ +# $FreeBSD: src/etc/defaults/pccard.conf,v 1.256 2003/01/18 02:14:23 shiba Exp $ # # Please send new entries for this file to imp@freebsd.org. He likes to # review them before they are committed to make sure they are correct for @@ -448,6 +448,12 @@ insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop +# BUFFALO LPC-CF-CLT +card "BUFFALO" "LPC-CF-CLT" + config auto "ed" ? + insert /etc/pccard_ether $device start + remove /etc/pccard_ether $device stop + # BUFFALO LPC2-CLT card "BUFFALO" "LPC2-CLT" config auto "ed" ? @@ -1834,6 +1840,12 @@ insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop +# Allied Telesis WR211PCM +card "Allied Telesis K.K." "WR211PCM" + config auto "wi" ? + insert /etc/pccard_ether $device start + remove /etc/pccard_ether $device stop + # Avaya Wireless PC Card card "Avaya Communication" "Avaya Wireless PC Card" config auto "wi" ? ==== //depot/projects/ia64/etc/locale.alias#3 (text+ko) ==== @@ -1,9 +1,11 @@ -# $FreeBSD: src/etc/locale.alias,v 1.10 2002/01/08 15:30:56 phantom Exp $ +# $FreeBSD: src/etc/locale.alias,v 1.11 2003/01/17 00:56:34 ache Exp $ ASCII en_US.US-ASCII US-ASCII en_US.US-ASCII af_ZA.ISO_8859-1 af_ZA.ISO8859-1 af_ZA.ISO_8859-15 af_ZA.ISO8859-15 +ca_ES.ISO_8859-1 ca_ES.ISO8859-1 +ca_ES.ISO_8859-15 ca_ES.ISO8859-15 cs_CZ.ISO_8859-2 cs_CZ.ISO8859-2 da_DK.ISO_8859-1 da_DK.ISO8859-1 da_DK.ISO_8859-15 da_DK.ISO8859-15 @@ -54,6 +56,7 @@ la_LN.ISO_8859-2 la_LN.ISO8859-2 la_LN.ISO_8859-4 la_LN.ISO8859-4 lt_LT.ISO_8859-4 lt_LT.ISO8859-4 +lt_LT.ISO_8859-13 lt_LT.ISO8859-13 nl_BE.ISO_8859-1 nl_BE.ISO8859-1 nl_BE.ISO_8859-15 nl_BE.ISO8859-15 nl_NL.ISO_8859-1 nl_NL.ISO8859-1 @@ -70,6 +73,7 @@ ru_SU.KOI8-R ru_RU.KOI8-R sk_SK.ISO_8859-2 sk_SK.ISO8859-2 sl_SI.ISO_8859-2 sl_SI.ISO8859-2 +sr_YU.ISO_8859-5 sr_YU.ISO8859-5 sv_SE.ISO_8859-1 sv_SE.ISO8859-1 sv_SE.ISO_8859-15 sv_SE.ISO8859-15 tr_TR.ISO_8859-9 tr_TR.ISO8859-9 ==== //depot/projects/ia64/etc/rc.subr#8 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: rc.subr,v 1.49 2002/05/21 12:31:01 lukem Exp $ -# $FreeBSD: src/etc/rc.subr,v 1.8 2002/11/09 17:34:21 gordon Exp $ +# $FreeBSD: src/etc/rc.subr,v 1.9 2003/01/18 05:25:59 mtm Exp $ # # Copyright (c) 1997-2002 The NetBSD Foundation, Inc. # All rights reserved. @@ -532,17 +532,19 @@ eval _cmd=\$${rc_arg}_cmd _precmd=\$${rc_arg}_precmd \ _postcmd=\$${rc_arg}_postcmd if [ -n "$_cmd" ]; then - debug "run_rc_command: using XXX_cmd functions." # if the precmd failed and force # isn't set, exit # + debug "run_rc_command: evaluating ${_precmd}()." if ! eval $_precmd && [ -z "$rc_force" ]; then return 1 fi + debug "run_rc_command: evaluating ${_cmd}()." if ! eval $_cmd && [ -z "$rc_force" ]; then return 1 fi + debug "run_rc_command: evaluating ${_postcmd}()." eval $_postcmd return 0 fi @@ -600,6 +602,7 @@ # if the precmd failed and force # isn't set, exit # + debug "run_rc_command: evaluating ${_precmd}()." if ! eval $_precmd && [ -z "$rc_force" ]; then return 1 fi @@ -632,6 +635,7 @@ # finally, run postcmd # + debug "run_rc_command: evaluating ${_postcmd}()." eval $_postcmd ;; ==== //depot/projects/ia64/include/arpa/telnet.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)telnet.h 8.2 (Berkeley) 12/15/93 - * $FreeBSD: src/include/arpa/telnet.h,v 1.8 2001/12/03 12:41:18 markm Exp $ + * $FreeBSD: src/include/arpa/telnet.h,v 1.9 2003/01/18 06:13:57 billf Exp $ */ #ifndef _ARPA_TELNET_H_ @@ -121,10 +121,14 @@ #define TELOPT_AUTHENTICATION 37/* Authenticate */ #define TELOPT_ENCRYPT 38 /* Encryption option */ #define TELOPT_NEW_ENVIRON 39 /* New - Environment variables */ +#define TELOPT_TN3270E 40 /* RFC2355 - TN3270 Enhancements */ +#define TELOPT_CHARSET 42 /* RFC2066 - Charset */ +#define TELOPT_COMPORT 44 /* RFC2217 - Com Port Control */ +#define TELOPT_KERMIT 47 /* RFC2840 - Kermit */ #define TELOPT_EXOPL 255 /* extended-options-list */ -#define NTELOPTS (1+TELOPT_NEW_ENVIRON) +#define NTELOPTS (1+TELOPT_KERMIT) #ifdef TELOPTS const char *telopts[NTELOPTS+1] = { "BINARY", "ECHO", "RCP", "SUPPRESS GO AHEAD", "NAME", @@ -136,11 +140,12 @@ "TACACS UID", "OUTPUT MARKING", "TTYLOC", "3270 REGIME", "X.3 PAD", "NAWS", "TSPEED", "LFLOW", "LINEMODE", "XDISPLOC", "OLD-ENVIRON", "AUTHENTICATION", - "ENCRYPT", "NEW-ENVIRON", + "ENCRYPT", "NEW-ENVIRON", "TN3270E", "CHARSET", "COM-PORT", + "KERMIT", 0 }; #define TELOPT_FIRST TELOPT_BINARY -#define TELOPT_LAST TELOPT_NEW_ENVIRON +#define TELOPT_LAST TELOPT_KERMIT #define TELOPT_OK(x) ((unsigned int)(x) <= TELOPT_LAST) #define TELOPT(x) telopts[(x)-TELOPT_FIRST] #endif ==== //depot/projects/ia64/include/ieeefp.h#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: ieeefp.h,v 1.4 1998/01/09 08:03:43 perry Exp $ */ -/* $FreeBSD: src/include/ieeefp.h,v 1.6 2002/03/23 17:24:53 imp Exp $ */ +/* $FreeBSD: src/include/ieeefp.h,v 1.7 2003/01/19 06:01:32 marcel Exp $ */ /* * Written by J.T. Conklin, Apr 6, 1995 @@ -12,9 +12,7 @@ #include <sys/cdefs.h> #include <machine/ieeefp.h> -#ifdef __i386__ -#include <machine/floatingpoint.h> -#else /* !__i386__ */ +#if !defined(_IEEEFP_INLINED_) __BEGIN_DECLS extern fp_rnd_t fpgetround(void); extern fp_rnd_t fpsetround(fp_rnd_t); @@ -23,6 +21,6 @@ extern fp_except_t fpgetsticky(void); extern fp_except_t fpsetsticky(fp_except_t); __END_DECLS -#endif /* __i386__ */ +#endif /* !_IEEEFP_INLINED_ */ #endif /* _IEEEFP_H_ */ ==== //depot/projects/ia64/include/stringlist.h#3 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/stringlist.h,v 1.2 2002/03/23 17:24:53 imp Exp $ + * $FreeBSD: src/include/stringlist.h,v 1.3 2003/01/19 01:16:00 obrien Exp $ */ #ifndef _STRINGLIST_H @@ -49,7 +49,7 @@ __BEGIN_DECLS StringList *sl_init(void); -void sl_add(StringList *, char *); +int sl_add(StringList *, char *); void sl_free(StringList *, int); char *sl_find(StringList *, char *); __END_DECLS ==== //depot/projects/ia64/lib/libc/alpha/gen/_ctx_start.S#2 (text+ko) ==== @@ -24,12 +24,8 @@ * SUCH DAMAGE. */ -/* - * $FreeBSD: src/lib/libc/alpha/gen/_ctx_start.S,v 1.1 2002/01/10 02:40:53 deischen Exp $ - */ - #include <machine/asm.h> - +__FBSDID("$FreeBSD: src/lib/libc/alpha/gen/_ctx_start.S,v 1.2 2003/01/19 00:17:02 obrien Exp $"); /* * A0-A5 are the first 6 arguments to the start routine with the ==== //depot/projects/ia64/lib/libc/alpha/gen/_setjmp.S#3 (text+ko) ==== @@ -25,11 +25,10 @@ * * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. - * - * $FreeBSD: src/lib/libc/alpha/gen/_setjmp.S,v 1.8 2001/12/22 06:06:17 deischen Exp $ */ #include <machine/asm.h> +__FBSDID("$FreeBSD: src/lib/libc/alpha/gen/_setjmp.S,v 1.9 2003/01/19 00:17:02 obrien Exp $"); /* * C library -- _setjmp, _longjmp ==== //depot/projects/ia64/lib/libc/alpha/gen/fabs.S#2 (text+ko) ==== @@ -1,5 +1,4 @@ /* $NetBSD: fabs.S,v 1.2 1996/10/17 03:08:05 cgd Exp $ */ -/* $FreeBSD: src/lib/libc/alpha/gen/fabs.S,v 1.2 2000/05/10 19:04:57 obrien Exp $ */ /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. @@ -29,6 +28,7 @@ */ #include <machine/asm.h> +__FBSDID("$FreeBSD: src/lib/libc/alpha/gen/fabs.S,v 1.3 2003/01/19 00:17:02 obrien Exp $"); LEAF(fabs, 1) cpys fzero, fa0, fv0 ==== //depot/projects/ia64/lib/libc/alpha/gen/getcontext.S#2 (text+ko) ==== @@ -51,11 +51,8 @@ * */ -/* - * $FreeBSD: src/lib/libc/alpha/gen/getcontext.S,v 1.1 2002/01/10 02:40:53 deischen Exp $ - */ - #include <machine/asm.h> +__FBSDID("$FreeBSD: src/lib/libc/alpha/gen/getcontext.S,v 1.2 2003/01/19 00:17:02 obrien Exp $"); /* #include <machine/frame.h> */ #define FRAME_V0 0 ==== //depot/projects/ia64/lib/libc/alpha/gen/rfork_thread.S#2 (text+ko) ==== @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/lib/libc/alpha/gen/rfork_thread.S,v 1.1 2000/07/29 11:43:21 peter Exp $ */ +#include <machine/asm.h> +__FBSDID("$FreeBSD: src/lib/libc/alpha/gen/rfork_thread.S,v 1.2 2003/01/19 00:17:02 obrien Exp $"); + #include "SYS.h" #include <sys/syscall.h> /* #include <machine/pal.h> */ ==== //depot/projects/ia64/lib/libc/alpha/gen/setjmp.S#3 (text+ko) ==== @@ -25,10 +25,11 @@ * * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. - * - * $FreeBSD: src/lib/libc/alpha/gen/setjmp.S,v 1.15 2001/12/22 06:06:17 deischen Exp $ */ +#include <machine/asm.h> +__FBSDID("$FreeBSD: src/lib/libc/alpha/gen/setjmp.S,v 1.16 2003/01/19 00:17:02 obrien Exp $"); + #include "SYS.h" /* ==== //depot/projects/ia64/lib/libc/alpha/gen/sigsetjmp.S#2 (text+ko) ==== @@ -25,11 +25,10 @@ * * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. - * - * $FreeBSD: src/lib/libc/alpha/gen/sigsetjmp.S,v 1.7 2001/01/24 12:58:52 deischen Exp $ */ #include <machine/asm.h> +__FBSDID("$FreeBSD: src/lib/libc/alpha/gen/sigsetjmp.S,v 1.8 2003/01/19 00:17:02 obrien Exp $"); /* * C library -- sigsetjmp, siglongjmp ==== //depot/projects/ia64/lib/libc/alpha/net/byte_swap_2.S#3 (text+ko) ==== @@ -25,11 +25,10 @@ * * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. - * - * $FreeBSD: src/lib/libc/alpha/net/byte_swap_2.S,v 1.2 2002/02/18 20:35:16 mike Exp $ */ #include <machine/asm.h> +__FBSDID("$FreeBSD: src/lib/libc/alpha/net/byte_swap_2.S,v 1.3 2003/01/19 00:17:02 obrien Exp $"); #if !defined(ALIAS) || !defined(NAME) #error ALIAS or NAME not defined ==== //depot/projects/ia64/lib/libc/alpha/net/byte_swap_4.S#3 (text+ko) ==== @@ -25,11 +25,10 @@ * * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. - * - * $FreeBSD: src/lib/libc/alpha/net/byte_swap_4.S,v 1.2 2002/02/18 20:35:16 mike Exp $ */ #include <machine/asm.h> +__FBSDID("$FreeBSD: src/lib/libc/alpha/net/byte_swap_4.S,v 1.3 2003/01/19 00:17:02 obrien Exp $"); #if !defined(ALIAS) || !defined(NAME) #error ALIAS or NAME not defined ==== //depot/projects/ia64/lib/libc/alpha/net/htonl.S#3 (text+ko) ==== @@ -25,10 +25,11 @@ * * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. - * - * $FreeBSD: src/lib/libc/alpha/net/htonl.S,v 1.2 2002/02/18 20:35:16 mike Exp $ */ +#include <machine/asm.h> +__FBSDID("$FreeBSD: src/lib/libc/alpha/net/htonl.S,v 1.3 2003/01/19 00:17:02 obrien Exp $"); + #define ALIAS htonl #define NAME __htonl ==== //depot/projects/ia64/lib/libc/alpha/net/htons.S#3 (text+ko) ==== @@ -25,10 +25,11 @@ * >>> 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?200301190707.h0J77RC2012560>