Date: Fri, 25 Jun 2004 20:20:54 GMT From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 55802 for review Message-ID: <200406252020.i5PKKsKQ033266@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=55802 Change 55802 by marcel@marcel_nfs on 2004/06/25 20:19:59 IFC @55800 Affected files ... .. //depot/projects/gdb/bin/pax/ar_io.c#3 integrate .. //depot/projects/gdb/bin/ps/extern.h#5 integrate .. //depot/projects/gdb/bin/ps/keyword.c#6 integrate .. //depot/projects/gdb/bin/ps/print.c#6 integrate .. //depot/projects/gdb/bin/ps/ps.c#14 integrate .. //depot/projects/gdb/bin/ps/ps.h#4 integrate .. //depot/projects/gdb/contrib/gdb/FREEBSD-upgrade#5 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/ia64/fbsd.mh#4 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/ia64/fbsd.mt#4 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/ia64/nm-fbsd.h#4 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/ia64/tm-fbsd.h#4 integrate .. //depot/projects/gdb/contrib/gdb/gdb/ia64-fbsd-nat.c#4 integrate .. //depot/projects/gdb/contrib/gdb/gdb/ia64-fbsd-tdep.c#4 integrate .. //depot/projects/gdb/contrib/gdb/gdb/ia64-tdep.c#8 integrate .. //depot/projects/gdb/contrib/gdb/gdb/ia64-tdep.h#5 integrate .. //depot/projects/gdb/contrib/gdb/gdb/inftarg.c#8 integrate .. //depot/projects/gdb/contrib/gdb/gdb/remote.c#8 integrate .. //depot/projects/gdb/contrib/gdb/gdb/target.h#9 integrate .. //depot/projects/gdb/etc/rc.subr#6 integrate .. //depot/projects/gdb/games/fortune/datfiles/fortunes#9 integrate .. //depot/projects/gdb/gnu/usr.bin/Makefile#5 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/Makefile#5 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/doc/Makefile#4 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/Makefile#7 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/Makefile.inc#4 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/alpha/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/alpha/config.h#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/alpha/init.c#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/amd64/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/amd64/config.h#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/amd64/init.c#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/i386/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/i386/config.h#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/i386/init.c#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/ia64/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/ia64/config.h#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/ia64/init.c#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/sparc64/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/sparc64/config.h#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/sparc64/init.c#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/doc/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/gdb/Makefile#17 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/gdb/gdb.1#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/gdbtui/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/libgdb/Makefile#2 integrate .. //depot/projects/gdb/lib/libc/sys/send.2#4 integrate .. //depot/projects/gdb/lib/libdevstat/devstat.c#2 integrate .. //depot/projects/gdb/lib/libkvm/kvm_proc.c#7 integrate .. //depot/projects/gdb/lib/libpam/modules/pam_radius/pam_radius.c#2 integrate .. //depot/projects/gdb/lib/msun/Makefile#6 integrate .. //depot/projects/gdb/libexec/getty/subr.c#2 integrate .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/Makefile#3 integrate .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/installation/Makefile#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/installation/Makefile.inc#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/installation/alpha/Makefile#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/installation/alpha/article.sgml#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/installation/amd64/Makefile#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/installation/amd64/article.sgml#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/installation/common/abstract.sgml#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/installation/common/artheader.sgml#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/installation/common/install.ent#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/installation/common/install.sgml#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/installation/common/layout.sgml#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/installation/common/trouble.sgml#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/installation/common/upgrade.sgml#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/installation/i386/Makefile#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/installation/i386/article.sgml#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/installation/ia64/Makefile#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/installation/ia64/article.sgml#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/installation/pc98/Makefile#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/installation/pc98/article.sgml#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/installation/sparc64/Makefile#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/installation/sparc64/article.sgml#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/readme/Makefile#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/readme/article.sgml#1 branch .. //depot/projects/gdb/sbin/gbde/gbde.c#3 integrate .. //depot/projects/gdb/share/man/man4/Makefile#13 integrate .. //depot/projects/gdb/share/man/man4/ng_ksocket.4#2 integrate .. //depot/projects/gdb/share/man/man4/pcm.4#3 integrate .. //depot/projects/gdb/share/man/man4/scsi.4#2 integrate .. //depot/projects/gdb/share/man/man4/sd.4#2 delete .. //depot/projects/gdb/share/man/man4/st.4#2 delete .. //depot/projects/gdb/share/man/man4/ubtbcmfw.4#3 integrate .. //depot/projects/gdb/share/man/man4/ucom.4#2 integrate .. //depot/projects/gdb/share/man/man4/uftdi.4#3 integrate .. //depot/projects/gdb/share/man/man4/uhid.4#2 integrate .. //depot/projects/gdb/share/man/man4/uhidev.4#2 integrate .. //depot/projects/gdb/share/man/man4/ulpt.4#2 integrate .. //depot/projects/gdb/share/man/man4/umodem.4#2 integrate .. //depot/projects/gdb/share/man/man4/uplcom.4#3 integrate .. //depot/projects/gdb/share/man/man4/usb.4#2 integrate .. //depot/projects/gdb/share/man/man4/uvisor.4#2 integrate .. //depot/projects/gdb/share/man/man4/uvscom.4#2 integrate .. //depot/projects/gdb/share/man/man4/vinum.4#2 integrate .. //depot/projects/gdb/sys/boot/forth/loader.conf#7 integrate .. //depot/projects/gdb/sys/compat/svr4/imgact_svr4.c#3 integrate .. //depot/projects/gdb/sys/conf/files#31 integrate .. //depot/projects/gdb/sys/conf/kmod.mk#9 integrate .. //depot/projects/gdb/sys/conf/options#23 integrate .. //depot/projects/gdb/sys/conf/options.powerpc#3 integrate .. //depot/projects/gdb/sys/conf/options.sparc64#4 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi.c#23 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_cpu.c#11 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_pci.c#12 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_quirks#1 branch .. //depot/projects/gdb/sys/dev/ar/if_ar.c#5 integrate .. //depot/projects/gdb/sys/dev/cp/if_cp.c#7 integrate .. //depot/projects/gdb/sys/dev/ctau/if_ct.c#7 integrate .. //depot/projects/gdb/sys/dev/cx/if_cx.c#11 integrate .. //depot/projects/gdb/sys/dev/digi/digi.c#10 integrate .. //depot/projects/gdb/sys/dev/ichsmb/ichsmb_pci.c#4 integrate .. //depot/projects/gdb/sys/dev/ofw/ofw_console.c#8 integrate .. //depot/projects/gdb/sys/dev/ofw/ofw_disk.c#3 integrate .. //depot/projects/gdb/sys/dev/rc/rc.c#8 integrate .. //depot/projects/gdb/sys/dev/sio/sio.c#16 integrate .. //depot/projects/gdb/sys/dev/sound/pcm/mixer.c#7 integrate .. //depot/projects/gdb/sys/dev/sr/if_sr.c#5 integrate .. //depot/projects/gdb/sys/dev/twa/twa_freebsd.c#6 integrate .. //depot/projects/gdb/sys/dev/uart/uart_bus.h#3 integrate .. //depot/projects/gdb/sys/dev/uart/uart_dev_i8251.c#2 integrate .. //depot/projects/gdb/sys/dev/uart/uart_dev_ns8250.c#4 integrate .. //depot/projects/gdb/sys/dev/uart/uart_dev_sab82532.c#3 integrate .. //depot/projects/gdb/sys/dev/uart/uart_dev_z8530.c#3 integrate .. //depot/projects/gdb/sys/dev/uart/uart_tty.c#7 integrate .. //depot/projects/gdb/sys/dev/usb/udbp.c#3 integrate .. //depot/projects/gdb/sys/dev/usb/usbdevs#14 integrate .. //depot/projects/gdb/sys/dev/usb/usbdevs.h#14 integrate .. //depot/projects/gdb/sys/dev/usb/usbdevs_data.h#14 integrate .. //depot/projects/gdb/sys/dev/zs/zs_macio.c#3 integrate .. //depot/projects/gdb/sys/fs/portalfs/portal_vnops.c#7 integrate .. //depot/projects/gdb/sys/fs/udf/udf_vnops.c#5 integrate .. //depot/projects/gdb/sys/geom/geom_slice.c#3 integrate .. //depot/projects/gdb/sys/geom/vinum/geom_vinum.c#3 integrate .. //depot/projects/gdb/sys/geom/vinum/geom_vinum_plex.c#4 integrate .. //depot/projects/gdb/sys/geom/vinum/geom_vinum_raid5.c#3 integrate .. //depot/projects/gdb/sys/geom/vinum/geom_vinum_raid5.h#2 integrate .. //depot/projects/gdb/sys/geom/vinum/geom_vinum_share.c#2 integrate .. //depot/projects/gdb/sys/geom/vinum/geom_vinum_subr.c#3 integrate .. //depot/projects/gdb/sys/i386/linux/imgact_linux.c#3 integrate .. //depot/projects/gdb/sys/kern/tty.c#11 integrate .. //depot/projects/gdb/sys/kern/uipc_socket.c#16 integrate .. //depot/projects/gdb/sys/kern/uipc_socket2.c#13 integrate .. //depot/projects/gdb/sys/kern/uipc_syscalls.c#17 integrate .. //depot/projects/gdb/sys/kern/vfs_syscalls.c#15 integrate .. //depot/projects/gdb/sys/modules/ar/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/sr/Makefile#2 integrate .. //depot/projects/gdb/sys/net/if_ethersubr.c#14 integrate .. //depot/projects/gdb/sys/net/if_spppsubr.c#6 integrate .. //depot/projects/gdb/sys/net/if_vlan.c#8 integrate .. //depot/projects/gdb/sys/netgraph/atm/uni/ng_uni_cust.h#2 integrate .. //depot/projects/gdb/sys/netgraph/netgraph.h#4 integrate .. //depot/projects/gdb/sys/netgraph/ng_base.c#5 integrate .. //depot/projects/gdb/sys/netgraph/ng_ksocket.c#7 integrate .. //depot/projects/gdb/sys/netgraph/ng_ksocket.h#2 integrate .. //depot/projects/gdb/sys/netgraph/ng_lmi.c#3 integrate .. //depot/projects/gdb/sys/netgraph/ng_parse.c#4 integrate .. //depot/projects/gdb/sys/netinet/in_pcb.h#4 integrate .. //depot/projects/gdb/sys/netinet/ip_dummynet.c#4 integrate .. //depot/projects/gdb/sys/netinet/ip_fw2.c#9 integrate .. //depot/projects/gdb/sys/netinet/ip_mroute.c#5 integrate .. //depot/projects/gdb/sys/netinet/ip_output.c#10 integrate .. //depot/projects/gdb/sys/netinet/tcp.h#4 integrate .. //depot/projects/gdb/sys/netinet/tcp_input.c#11 integrate .. //depot/projects/gdb/sys/netinet/tcp_output.c#6 integrate .. //depot/projects/gdb/sys/netinet/tcp_sack.c#1 branch .. //depot/projects/gdb/sys/netinet/tcp_seq.h#3 integrate .. //depot/projects/gdb/sys/netinet/tcp_subr.c#10 integrate .. //depot/projects/gdb/sys/netinet/tcp_syncache.c#6 integrate .. //depot/projects/gdb/sys/netinet/tcp_timer.c#3 integrate .. //depot/projects/gdb/sys/netinet/tcp_var.h#7 integrate .. //depot/projects/gdb/sys/netipx/spx_usrreq.c#5 integrate .. //depot/projects/gdb/sys/netnatm/natm.c#4 integrate .. //depot/projects/gdb/sys/nfsclient/nfs_socket.c#8 integrate .. //depot/projects/gdb/sys/powerpc/ofw/ofw_pcib_pci.c#2 integrate .. //depot/projects/gdb/sys/powerpc/ofw/ofw_syscons.c#2 integrate .. //depot/projects/gdb/sys/powerpc/powermac/grackle.c#4 integrate .. //depot/projects/gdb/sys/powerpc/powermac/hrowpic.c#3 integrate .. //depot/projects/gdb/sys/powerpc/powermac/macio.c#2 integrate .. //depot/projects/gdb/sys/powerpc/powermac/openpic_macio.c#4 integrate .. //depot/projects/gdb/sys/powerpc/powermac/uninorth.c#2 integrate .. //depot/projects/gdb/sys/powerpc/powerpc/nexus.c#3 integrate .. //depot/projects/gdb/sys/powerpc/psim/iobus.c#2 integrate .. //depot/projects/gdb/sys/powerpc/psim/openpic_iobus.c#3 integrate .. //depot/projects/gdb/sys/security/mac/mac_net.c#4 integrate .. //depot/projects/gdb/sys/security/mac_biba/mac_biba.c#5 integrate .. //depot/projects/gdb/sys/security/mac_lomac/mac_lomac.c#5 integrate .. //depot/projects/gdb/sys/security/mac_mls/mac_mls.c#5 integrate .. //depot/projects/gdb/sys/security/mac_stub/mac_stub.c#5 integrate .. //depot/projects/gdb/sys/security/mac_test/mac_test.c#7 integrate .. //depot/projects/gdb/sys/sparc64/conf/NOTES#4 integrate .. //depot/projects/gdb/sys/sys/mac_policy.h#6 integrate .. //depot/projects/gdb/sys/sys/serial.h#1 branch .. //depot/projects/gdb/sys/sys/socketvar.h#8 integrate .. //depot/projects/gdb/sys/sys/tty.h#9 integrate .. //depot/projects/gdb/sys/sys/ttycom.h#6 integrate .. //depot/projects/gdb/sys/tools/acpi_quirks2h.awk#1 branch .. //depot/projects/gdb/sys/ufs/ufs/ufs_extattr.c#3 integrate .. //depot/projects/gdb/sys/vm/uma_core.c#8 integrate .. //depot/projects/gdb/sys/vm/vm_map.c#10 integrate .. //depot/projects/gdb/sys/vm/vm_pageout.c#6 integrate .. //depot/projects/gdb/tools/regression/lib/libc/stdlib/Makefile#1 branch .. //depot/projects/gdb/tools/regression/lib/libc/stdlib/test-heapsort.c#1 branch .. //depot/projects/gdb/tools/regression/lib/libc/stdlib/test-mergesort.c#1 branch .. //depot/projects/gdb/tools/regression/lib/libc/stdlib/test-qsort.c#1 branch .. //depot/projects/gdb/tools/regression/lib/libc/stdlib/test-sort.h#1 branch .. //depot/projects/gdb/usr.bin/comm/comm.1#2 integrate .. //depot/projects/gdb/usr.bin/expand/expand.c#2 integrate .. //depot/projects/gdb/usr.bin/fetch/fetch.c#5 integrate .. //depot/projects/gdb/usr.bin/fold/fold.c#2 integrate .. //depot/projects/gdb/usr.bin/join/join.1#2 integrate .. //depot/projects/gdb/usr.bin/paste/paste.1#2 integrate .. //depot/projects/gdb/usr.bin/paste/paste.c#2 integrate .. //depot/projects/gdb/usr.bin/unexpand/unexpand.c#2 integrate .. //depot/projects/gdb/usr.bin/uniq/uniq.1#2 integrate .. //depot/projects/gdb/usr.bin/vis/vis.1#2 integrate Differences ... ==== //depot/projects/gdb/bin/pax/ar_io.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/pax/ar_io.c,v 1.24 2004/04/06 20:06:48 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/ar_io.c,v 1.25 2004/06/25 05:27:59 obrien Exp $"); #include <sys/types.h> #include <sys/ioctl.h> @@ -154,8 +154,10 @@ return(-1); if (chdname != NULL) - if (chdir(chdname) != 0) + if (chdir(chdname) != 0) { syswarn(1, errno, "Failed chdir to %s", chdname); + return(-1); + } /* * set up is based on device type */ ==== //depot/projects/gdb/bin/ps/extern.h#5 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)extern.h 8.3 (Berkeley) 4/2/94 - * $FreeBSD: src/bin/ps/extern.h,v 1.36 2004/06/23 11:56:57 gad Exp $ + * $FreeBSD: src/bin/ps/extern.h,v 1.37 2004/06/23 23:48:09 gad Exp $ */ struct kinfo; @@ -40,7 +40,7 @@ extern unsigned long mempages; extern time_t now; extern int sumrusage, termwidth, totwidth; -extern VARENT *vhead; +extern STAILQ_HEAD(velisthead, varent) varlist; __BEGIN_DECLS void arguments(KINFO *, VARENT *); ==== //depot/projects/gdb/bin/ps/keyword.c#6 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.69 2004/06/23 11:56:57 gad Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.70 2004/06/23 23:48:09 gad Exp $"); #include <sys/param.h> #include <sys/time.h> @@ -235,7 +235,6 @@ void parsefmt(const char *p, int user) { - static struct varent *vtail; char *tempstr, *tempstr1; #define FMTSEP " \t,\n" @@ -282,16 +281,10 @@ if (vent->var == NULL) errx(1, "malloc failed"); memcpy(vent->var, v, sizeof(*vent->var)); - vent->next = NULL; - if (vhead == NULL) - vhead = vtail = vent; - else { - vtail->next = vent; - vtail = vent; - } + STAILQ_INSERT_TAIL(&varlist, vent, next_ve); } free(tempstr1); - if (!vhead) { + if (STAILQ_EMPTY(&varlist)) { warnx("no valid keywords; valid keywords:"); showkey(); exit(1); ==== //depot/projects/gdb/bin/ps/print.c#6 (text+ko) ==== @@ -34,7 +34,7 @@ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.90 2004/06/23 12:18:36 gad Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.91 2004/06/23 23:48:09 gad Exp $"); #include <sys/param.h> #include <sys/time.h> @@ -69,26 +69,23 @@ { VAR *v; struct varent *vent; - int allempty; - allempty = 1; - for (vent = vhead; vent; vent = vent->next) - if (*vent->header != '\0') { - allempty = 0; + STAILQ_FOREACH(vent, &varlist, next_ve) + if (*vent->header != '\0') break; - } - if (allempty) + if (!vent) return; - for (vent = vhead; vent; vent = vent->next) { + + STAILQ_FOREACH(vent, &varlist, next_ve) { v = vent->var; if (v->flag & LJUST) { - if (vent->next == NULL) /* last one */ + if (STAILQ_NEXT(vent, next_ve) == NULL) /* last one */ (void)printf("%s", vent->header); else (void)printf("%-*s", v->width, vent->header); } else (void)printf("%*s", v->width, vent->header); - if (vent->next != NULL) + if (STAILQ_NEXT(vent, next_ve) != NULL) (void)putchar(' '); } (void)putchar('\n'); @@ -105,7 +102,7 @@ if ((vis_args = malloc(strlen(k->ki_args) * 4 + 1)) == NULL) errx(1, "malloc failed"); strvis(vis_args, k->ki_args, VIS_TAB | VIS_NL | VIS_NOSLASH); - if (ve->next == NULL) { + if (STAILQ_NEXT(ve, next_ve) == NULL) { /* last field */ if (termwidth == UNLIMITED) { (void)printf("%s", vis_args); @@ -131,7 +128,8 @@ v = ve->var; if (cflag) { - if (ve->next == NULL) /* last field, don't pad */ + /* If it is the last field, then don't pad */ + if (STAILQ_NEXT(ve, next_ve) == NULL) (void)printf("%s", k->ki_p->ki_comm); else (void)printf("%-*s", v->width, k->ki_p->ki_comm); @@ -147,7 +145,7 @@ } else vis_env = NULL; - if (ve->next == NULL) { + if (STAILQ_NEXT(ve, next_ve) == NULL) { /* last field */ if (termwidth == UNLIMITED) { if (vis_env) @@ -180,7 +178,7 @@ VAR *v; v = ve->var; - if (ve->next == NULL) /* last field, don't pad */ + if (STAILQ_NEXT(ve, next_ve) == NULL) /* last field, don't pad */ (void)printf("%s", k->ki_p->ki_comm); else (void)printf("%-*s", v->width, k->ki_p->ki_comm); ==== //depot/projects/gdb/bin/ps/ps.c#14 (text+ko) ==== @@ -47,7 +47,7 @@ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.101 2004/06/23 11:40:56 gad Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.105 2004/06/24 03:15:18 gad Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -98,7 +98,7 @@ int termwidth; /* Width of the screen (0 == infinity). */ int totwidth; /* Calculated-width of requested variables. */ -struct varent *vhead; +struct velisthead varlist = STAILQ_HEAD_INITIALIZER(varlist); static int forceuread = DEF_UREAD; /* Do extra work to get u-area. */ static kvm_t *kd; @@ -600,9 +600,9 @@ * For each process, call each variable output function. */ for (i = lineno = 0; i < nkept; i++) { - for (vent = vhead; vent; vent = vent->next) { + STAILQ_FOREACH(vent, &varlist, next_ve) { (vent->var->oproc)(&kinfo[i], vent); - if (vent->next != NULL) + if (STAILQ_NEXT(vent, next_ve) != NULL) (void)putchar(' '); } (void)putchar('\n'); @@ -703,6 +703,13 @@ } #undef BSD_PID_MAX +/*- + * The user can specify a device via one of three formats: + * 1) fully qualified, e.g.: /dev/ttyp0 /dev/console + * 2) missing "/dev", e.g.: ttyp0 console + * 3) two-letters, e.g.: p0 co + * (matching letters that would be seen in the "TT" column) + */ static int addelem_tty(struct listinfo *inf, const char *elem) { @@ -710,25 +717,46 @@ struct stat sb; char pathbuf[PATH_MAX]; - if (strcmp(elem, "co") == 0) - ttypath = strdup(_PATH_CONSOLE); - else if (*elem == '/') + ttypath = NULL; + switch (*elem) { + case '/': ttypath = elem; - else { + break; + case 'c': + if (strcmp(elem, "co") == 0) { + ttypath = _PATH_CONSOLE; + break; + } + /* FALLTHROUGH */ + default: + strlcpy(pathbuf, _PATH_DEV, sizeof(pathbuf)); + strlcat(pathbuf, elem, sizeof(pathbuf)); + ttypath = pathbuf; + if (strncmp(pathbuf, _PATH_TTY, sizeof(_PATH_TTY)) == 0) + break; + if (strcmp(pathbuf, _PATH_CONSOLE) == 0) + break; + if (stat(pathbuf, &sb) == 0 && S_ISCHR(sb.st_mode)) { + /* No need to repeat stat() && S_ISCHR() checks */ + ttypath = NULL; + break; + } + /* /dev/${elem} does not exist, so try /dev/tty${elem} */ strlcpy(pathbuf, _PATH_TTY, sizeof(pathbuf)); strlcat(pathbuf, elem, sizeof(pathbuf)); - ttypath = pathbuf; + break; } - - if (stat(ttypath, &sb) == -1) { - warn("%s", ttypath); - optfatal = 1; - return (0); - } - if (!S_ISCHR(sb.st_mode)) { - warn("%s: Not a terminal", ttypath); - optfatal = 1; - return (0); + if (ttypath) { + if (stat(ttypath, &sb) == -1) { + warn("%s", ttypath); + optfatal = 1; + return (0); + } + if (!S_ISCHR(sb.st_mode)) { + warn("%s: Not a terminal", ttypath); + optfatal = 1; + return (0); + } } if (inf->count >= inf->maxcount) expand_list(inf); @@ -886,7 +914,7 @@ { struct varent *vent; - for (vent = vhead; vent; vent = vent->next) { + STAILQ_FOREACH(vent, &varlist, next_ve) { if (strcmp(vent->var->name, v->name) == 0) return vent; } @@ -899,7 +927,7 @@ struct varent *vent; VAR *v; - for (vent = vhead; vent; vent = vent->next) { + STAILQ_FOREACH(vent, &varlist, next_ve) { v = vent->var; if (v->flag & DSIZ) { v->dwidth = v->width; @@ -919,7 +947,7 @@ VAR *v; int i; - for (vent = vhead; vent; vent = vent->next) { + STAILQ_FOREACH(vent, &varlist, next_ve) { v = vent->var; if (!(v->flag & DSIZ)) continue; @@ -938,7 +966,7 @@ VAR *v; int i; - for (vent = vhead; vent; vent = vent->next) { + STAILQ_FOREACH(vent, &varlist, next_ve) { v = vent->var; i = strlen(vent->header); if (v->width < i) @@ -977,19 +1005,27 @@ /* * save arguments if needed */ - if (needcomm && (UREADOK(ki) || (ki->ki_p->ki_args != NULL))) { - ki->ki_args = strdup(fmt(kvm_getargv, ki, ki->ki_p->ki_comm, - MAXCOMLEN)); - } else if (needcomm) { - asprintf(&ki->ki_args, "(%s)", ki->ki_p->ki_comm); + if (needcomm) { + if (ki->ki_p->ki_stat == SZOMB) + ki->ki_args = strdup("<defunct>"); + else if (UREADOK(ki) || (ki->ki_p->ki_args != NULL)) + ki->ki_args = strdup(fmt(kvm_getargv, ki, + ki->ki_p->ki_comm, MAXCOMLEN)); + else + asprintf(&ki->ki_args, "(%s)", ki->ki_p->ki_comm); + if (ki->ki_args == NULL) + errx(1, "malloc failed"); } else { ki->ki_args = NULL; } - if (needenv && UREADOK(ki)) { - ki->ki_env = strdup(fmt(kvm_getenvv, ki, (char *)NULL, 0)); - } else if (needenv) { - ki->ki_env = malloc(3); - strcpy(ki->ki_env, "()"); + if (needenv) { + if (UREADOK(ki)) + ki->ki_env = strdup(fmt(kvm_getenvv, ki, + (char *)NULL, 0)); + else + ki->ki_env = strdup("()"); + if (ki->ki_env == NULL) + errx(1, "malloc failed"); } else { ki->ki_env = NULL; } ==== //depot/projects/gdb/bin/ps/ps.h#4 (text+ko) ==== @@ -27,9 +27,11 @@ * SUCH DAMAGE. * * @(#)ps.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD: src/bin/ps/ps.h,v 1.18 2004/06/20 21:25:10 gad Exp $ + * $FreeBSD: src/bin/ps/ps.h,v 1.19 2004/06/23 23:48:09 gad Exp $ */ +#include <sys/queue.h> + #define UNLIMITED 0 /* unlimited terminal width */ enum type { CHAR, UCHAR, SHORT, USHORT, INT, UINT, LONG, ULONG, KPTR, PGTOK }; @@ -44,8 +46,8 @@ /* Variables. */ typedef struct varent { + STAILQ_ENTRY(varent) next_ve; const char *header; - struct varent *next; struct var *var; } VARENT; ==== //depot/projects/gdb/contrib/gdb/gdb/config/ia64/fbsd.mh#4 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/config/ia64/fbsd.mt#4 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/config/ia64/nm-fbsd.h#4 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/config/ia64/tm-fbsd.h#4 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/ia64-fbsd-nat.c#4 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/ia64-fbsd-tdep.c#4 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/ia64-tdep.c#8 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/ia64-tdep.h#5 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/inftarg.c#8 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/remote.c#8 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/target.h#9 (text+ko) ==== ==== //depot/projects/gdb/etc/rc.subr#6 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: rc.subr,v 1.60 2003/07/26 05:13:47 lukem Exp $ -# $FreeBSD: src/etc/rc.subr,v 1.27 2004/06/06 18:06:09 mtm Exp $ +# $FreeBSD: src/etc/rc.subr,v 1.28 2004/06/24 16:57:49 mtm Exp $ # # Copyright (c) 1997-2002 The NetBSD Foundation, Inc. # All rights reserved. @@ -194,7 +194,7 @@ err 3 'USAGE: check_pidfile pidfile procname [interpreter]' fi if [ ! -f $_pidfile ]; then - debug "pid file {$_pidfile): not readable." + debug "pid file ($_pidfile): not readable." return fi read _pid _junk < $_pidfile ==== //depot/projects/gdb/games/fortune/datfiles/fortunes#9 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.137 2004/06/01 09:45:16 des Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.138 2004/06/24 03:08:44 wollman Exp $ % -- Gifts for Children -- @@ -16100,6 +16100,9 @@ % Yes, but which self do you want to be? % +Yes, I was surprised how easy it was to cut the door off my cat. + -- James D. Nicoll +% Yesterday I was a dog. Today I'm a dog. Tomorrow I'll probably still be a dog. Sigh! There's so little hope for advancement. -- Snoopy ==== //depot/projects/gdb/gnu/usr.bin/Makefile#5 (text+ko) ==== @@ -1,8 +1,12 @@ -# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.80 2004/06/10 19:17:20 peter Exp $ +# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.81 2004/06/25 07:15:13 marcel Exp $ SUBDIR= bc ${_binutils} ${_cc} cpio dc dialog diff diff3 ${_gdb} \ ${_gperf} grep gzip man patch rcs sdiff send-pr sort tar texinfo +.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "powerpc" +NO_GDB= not yet +.endif + .if !defined(NO_TOOLCHAIN) _cc=cc _binutils=binutils ==== //depot/projects/gdb/gnu/usr.bin/binutils/Makefile#5 (text+ko) ==== @@ -1,15 +1,7 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/Makefile,v 1.28 2004/06/21 18:09:20 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/Makefile,v 1.29 2004/06/25 07:34:56 obrien Exp $ SUBDIR= libiberty libbfd libopcodes libbinutils \ addr2line ar as ld nm objcopy objdump ranlib readelf \ size strings strip doc -NO_GDB= yes -TARGET_ARCH?= ${MACHINE_ARCH} -.if (${TARGET_ARCH} == "alpha" \ - || ${TARGET_ARCH} == "i386" ) \ - && !defined(NO_GDB) -SUBDIR+= gdb gdbreplay -.endif - .include <bsd.subdir.mk> ==== //depot/projects/gdb/gnu/usr.bin/binutils/doc/Makefile#4 (text+ko) ==== @@ -1,10 +1,7 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/doc/Makefile,v 1.20 2004/06/23 04:36:04 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/doc/Makefile,v 1.21 2004/06/25 06:55:49 marcel Exp $ .include "../Makefile.inc0" -GDBDIR= ${.CURDIR}/../../../../contrib/gdb -CONTRIBDIR= ${.CURDIR}/../../../../contrib - .PATH: ${SRCDIR}/gas/doc ${SRCDIR}/ld ${SRCDIR}/bfd/doc INFO= as ld gasp binutils ==== //depot/projects/gdb/gnu/usr.bin/gdb/Makefile#7 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/Makefile.inc#4 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/arch/alpha/Makefile#2 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/arch/alpha/config.h#2 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/arch/alpha/init.c#2 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/arch/amd64/Makefile#2 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/arch/amd64/config.h#2 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/arch/amd64/init.c#2 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/arch/i386/Makefile#2 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/arch/i386/config.h#2 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/arch/i386/init.c#2 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/arch/ia64/Makefile#2 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/arch/ia64/config.h#2 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/arch/ia64/init.c#2 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/arch/sparc64/Makefile#2 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/arch/sparc64/config.h#2 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/arch/sparc64/init.c#2 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/doc/Makefile#2 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/gdb/Makefile#17 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/gdb/gdb.1#2 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/gdbtui/Makefile#2 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/libgdb/Makefile#2 (text+ko) ==== ==== //depot/projects/gdb/lib/libc/sys/send.2#4 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)send.2 8.2 (Berkeley) 2/21/94 -.\" $FreeBSD: src/lib/libc/sys/send.2,v 1.24 2004/06/21 18:57:32 mpp Exp $ +.\" $FreeBSD: src/lib/libc/sys/send.2,v 1.25 2004/06/24 10:53:44 rik Exp $ .\" .Dd February 15, 1995 .Dt SEND 2 @@ -194,7 +194,7 @@ address specified in the IP header did not match the IP address bound to the prison. .It Bq Er EPIPE -The socket is unable to send anymore data (SS_CANTSENDMORE has +The socket is unable to send anymore data (SBS_CANTSENDMORE has been set on the socket). This typically means that the socket is not connected. .El ==== //depot/projects/gdb/lib/libdevstat/devstat.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libdevstat/devstat.c,v 1.25 2003/10/13 05:30:20 bde Exp $"); +__FBSDID("$FreeBSD: src/lib/libdevstat/devstat.c,v 1.26 2004/06/25 01:16:02 kan Exp $"); #include <sys/types.h> #include <sys/sysctl.h> @@ -1572,7 +1572,7 @@ const char *func_name = "readkmem_nl"; struct nlist nl[2]; - (const char *)nl[0].n_name = name; + nl[0].n_name = (char *)name; nl[1].n_name = NULL; if (kvm_nlist(kd, nl) == -1) { ==== //depot/projects/gdb/lib/libkvm/kvm_proc.c#7 (text+ko) ==== @@ -42,7 +42,7 @@ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.76 2004/06/19 14:08:10 gad Exp $"); +__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.78 2004/06/23 21:59:56 gad Exp $"); /* * Proc traversal interface for kvm. ps and w are (probably) the exclusive @@ -128,7 +128,7 @@ TAILQ_FIRST(&proc.p_threads)); return (-1); } - if (proc.p_flag & P_SA == 0) { + if ((proc.p_flag & P_SA) == 0) { if (KREAD(kd, (u_long)TAILQ_FIRST(&proc.p_ksegrps), &mkg)) { @@ -328,10 +328,8 @@ continue; break; } - if (proc.p_comm[0] != 0) { - strncpy(kp->ki_comm, proc.p_comm, MAXCOMLEN); - kp->ki_comm[MAXCOMLEN] = 0; - } + if (proc.p_comm[0] != 0) + strlcpy(kp->ki_comm, proc.p_comm, MAXCOMLEN); (void)kvm_read(kd, (u_long)proc.p_sysent, (char *)&sysent, sizeof(sysent)); (void)kvm_read(kd, (u_long)sysent.sv_name, (char *)&svname, ==== //depot/projects/gdb/lib/libpam/modules/pam_radius/pam_radius.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_radius/pam_radius.c,v 1.20 2003/12/11 13:55:16 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_radius/pam_radius.c,v 1.22 2004/06/25 12:32:45 kan Exp $"); #include <sys/param.h> #include <sys/types.h> ==== //depot/projects/gdb/lib/msun/Makefile#6 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 5.1beta 93/09/24 -# $FreeBSD: src/lib/msun/Makefile,v 1.44 2004/06/20 10:42:23 stefanf Exp $ +# $FreeBSD: src/lib/msun/Makefile,v 1.45 2004/06/24 00:02:32 marcel Exp $ # # ==================================================== # Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. @@ -49,7 +49,7 @@ # Stock gcc 2.7.2.1 doesn't understand these options. #CFLAGS += -mtrap-precision=i -mfp-trap-mode=su .elif ${MACHINE_ARCH} == "i386" -ARCH= i387 +ARCH_SUBDIR= i387 ARCH_SRCS = e_acos.S e_asin.S e_atan2.S e_exp.S e_fmod.S e_log.S e_log10.S \ e_remainder.S e_scalb.S e_sqrt.S s_atan.S s_ceil.S s_copysign.S \ s_cos.S s_finite.S s_floor.S s_logb.S \ @@ -58,7 +58,7 @@ # ARCH_SRCS+= s_log1p.S .endif -ARCH?= ${MACHINE_ARCH} +ARCH_SUBDIR?= ${MACHINE_ARCH} .PATH: ${.CURDIR}/bsdsrc .PATH: ${.CURDIR}/man @@ -114,7 +114,7 @@ #COMMON_SRCS+= s_fabs.c s_frexp.c s_isnan.c s_ldexp.c s_modf.c # Exclude the generic versions of what we provide in the MD area. -.PATH: ${.CURDIR}/${ARCH} +.PATH: ${.CURDIR}/${ARCH_SUBDIR} .if defined(ARCH_SRCS) .for i in ${ARCH_SRCS} COMMON_SRCS:= ${COMMON_SRCS:N${i:R}.c} ==== //depot/projects/gdb/libexec/getty/subr.c#2 (text+ko) ==== @@ -36,13 +36,12 @@ static char sccsid[] = "@(#)from: subr.c 8.1 (Berkeley) 6/4/93"; #endif static const char rcsid[] = - "$FreeBSD: src/libexec/getty/subr.c,v 1.18 2002/02/06 16:38:40 imp Exp $"; + "$FreeBSD: src/libexec/getty/subr.c,v 1.19 2004/06/25 10:11:28 phk Exp $"; #endif /* not lint */ /* * Melbourne getty. */ -#define COMPAT_43 #ifdef DEBUG #include <stdio.h> #endif @@ -60,9 +59,6 @@ #include "extern.h" -#ifdef COMPAT_43 -static void compatflags(long); -#endif /* * Get a table entry. @@ -260,28 +256,6 @@ { tcflag_t iflag, oflag, cflag, lflag; -#ifdef COMPAT_43 - switch (n) { - case 0: - if (F0set) { - compatflags(F0); - return; - } - break; - case 1: - if (F1set) { - compatflags(F1); - return; - } - break; - default: - if (F2set) { - compatflags(F2); - return; - } - break; - } -#endif switch (n) { case 0: @@ -437,130 +411,6 @@ tmode.c_lflag = lflag; } -#ifdef COMPAT_43 -/* - * Old TTY => termios, snatched from <sys/kern/tty_compat.c> - */ -void -compatflags(long flags) -{ - tcflag_t iflag, oflag, cflag, lflag; - - iflag = BRKINT|ICRNL|IMAXBEL|IXON|IXANY; - oflag = OPOST|ONLCR|OXTABS; - cflag = CREAD; - lflag = ICANON|ISIG|IEXTEN; - - if (ISSET(flags, TANDEM)) - SET(iflag, IXOFF); - else - CLR(iflag, IXOFF); - if (ISSET(flags, ECHO)) - SET(lflag, ECHO); - else - CLR(lflag, ECHO); - if (ISSET(flags, CRMOD)) { - SET(iflag, ICRNL); - SET(oflag, ONLCR); >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200406252020.i5PKKsKQ033266>