From owner-p4-projects Mon Mar 17 10:54:10 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF5AE37B404; Mon, 17 Mar 2003 10:54:08 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8684837B401 for ; Mon, 17 Mar 2003 10:54:08 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 34AF843F75 for ; Mon, 17 Mar 2003 10:54:08 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h2HIs80U086301 for ; Mon, 17 Mar 2003 10:54:08 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2HIs7mX086298 for perforce@freebsd.org; Mon, 17 Mar 2003 10:54:07 -0800 (PST) Date: Mon, 17 Mar 2003 10:54:07 -0800 (PST) Message-Id: <200303171854.h2HIs7mX086298@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 27009 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=27009 Change 27009 by jhb@jhb_laptop on 2003/03/17 10:54:06 Treat all 8 upper bits of the ICR high register as the destination ID instead of just the lower nibble of the upper byte. This fixes SMP on the SW7500CW2. Submitted by: Brian Buchanan Affected files ... .. //depot/projects/smpng/sys/i386/include/apic.h#6 edit Differences ... ==== //depot/projects/smpng/sys/i386/include/apic.h#6 (text+ko) ==== @@ -291,7 +291,7 @@ #define APIC_ICRLO_RESV_MASK (APIC_RESV1_MASK | APIC_RESV2_MASK) /* fields in ICR_HIGH */ -#define APIC_ID_MASK 0x0f000000 +#define APIC_ID_MASK 0xff000000 /* fields in LVT1/2 */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Mar 17 12:53:41 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EBC9E37B404; Mon, 17 Mar 2003 12:53:39 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8282137B401 for ; Mon, 17 Mar 2003 12:53:39 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1905B43F3F for ; Mon, 17 Mar 2003 12:53:39 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h2HKrc0U001676 for ; Mon, 17 Mar 2003 12:53:38 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2HKrco6001673 for perforce@freebsd.org; Mon, 17 Mar 2003 12:53:38 -0800 (PST) Date: Mon, 17 Mar 2003 12:53:38 -0800 (PST) Message-Id: <200303172053.h2HKrco6001673@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 27017 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=27017 Change 27017 by jhb@jhb_laptop on 2003/03/17 12:52:41 Revert back to this thread's credentials during an execve from a multithreaded process. Affected files ... .. //depot/projects/smpng/sys/kern/kern_exec.c#54 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_exec.c#54 (text+ko) ==== @@ -213,6 +213,10 @@ p->p_flag &= ~P_THREADED; td->td_mailbox = NULL; thread_single_end(); + if (td->td_ucred != p->p_ucred) { + crfree(p->p_ucred); + p->p_ucred = crhold(td->td_ucred); + } } p->p_flag |= P_INEXEC; PROC_UNLOCK(p); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Mar 17 13:33:35 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CE70937B405; Mon, 17 Mar 2003 13:33:33 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2D34337B404 for ; Mon, 17 Mar 2003 13:33:33 -0800 (PST) Received: from mail.speakeasy.net (mail16.speakeasy.net [216.254.0.216]) by mx1.FreeBSD.org (Postfix) with ESMTP id D657C43FA3 for ; Mon, 17 Mar 2003 13:33:31 -0800 (PST) (envelope-from jhb@FreeBSD.org) Received: (qmail 11225 invoked from network); 17 Mar 2003 21:33:40 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail16.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 17 Mar 2003 21:33:40 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.12.8/8.12.8) with ESMTP id h2HLXSOv069299; Mon, 17 Mar 2003 16:33:29 -0500 (EST) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <200303172053.h2HKrco6001673@repoman.freebsd.org> Date: Mon, 17 Mar 2003 16:33:47 -0500 (EST) From: John Baldwin To: John Baldwin Subject: RE: PERFORCE change 27017 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 17-Mar-2003 John Baldwin wrote: > http://perforce.freebsd.org/chv.cgi?CH=27017 > > Change 27017 by jhb@jhb_laptop on 2003/03/17 12:52:41 > > Revert back to this thread's credentials during an execve from a > multithreaded process. *sigh*, wrong branch but I guess that really isn't a big deal. > Affected files ... > > .. //depot/projects/smpng/sys/kern/kern_exec.c#54 edit > > Differences ... > > ==== //depot/projects/smpng/sys/kern/kern_exec.c#54 (text+ko) ==== > > @@ -213,6 +213,10 @@ > p->p_flag &= ~P_THREADED; > td->td_mailbox = NULL; > thread_single_end(); > + if (td->td_ucred != p->p_ucred) { > + crfree(p->p_ucred); > + p->p_ucred = crhold(td->td_ucred); > + } > } > p->p_flag |= P_INEXEC; > PROC_UNLOCK(p); -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Mar 17 14:46:33 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 19D6237B404; Mon, 17 Mar 2003 14:46:08 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9DCB937B401 for ; Mon, 17 Mar 2003 14:46:07 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9677543F75 for ; Mon, 17 Mar 2003 14:46:06 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h2HMk60U011767 for ; Mon, 17 Mar 2003 14:46:06 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2HMk5TJ011764 for perforce@freebsd.org; Mon, 17 Mar 2003 14:46:05 -0800 (PST) Date: Mon, 17 Mar 2003 14:46:05 -0800 (PST) Message-Id: <200303172246.h2HMk5TJ011764@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 27034 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=27034 Change 27034 by jhb@jhb_laptop on 2003/03/17 14:45:41 IFC @27026. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/busdma_machdep.c#11 integrate .. //depot/projects/smpng/sys/alpha/include/pmap.h#13 integrate .. //depot/projects/smpng/sys/cam/cam_periph.c#8 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_cd.c#15 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#34 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_pt.c#6 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_sa.c#12 integrate .. //depot/projects/smpng/sys/compat/linux/linux_getcwd.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/oltr/if_oltr.c#4 integrate .. //depot/projects/smpng/sys/dev/aac/aac.c#23 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#5 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-cd.c#33 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-tape.c#16 integrate .. //depot/projects/smpng/sys/dev/pdq/pdq_freebsd.h#4 integrate .. //depot/projects/smpng/sys/dev/pdq/pdq_ifsubr.c#8 integrate .. //depot/projects/smpng/sys/dev/puc/puc.c#11 integrate .. //depot/projects/smpng/sys/dev/puc/pucdata.c#10 integrate .. //depot/projects/smpng/sys/dev/puc/pucvar.h#8 integrate .. //depot/projects/smpng/sys/dev/sio/sio.c#26 integrate .. //depot/projects/smpng/sys/dev/twe/twe_compat.h#5 integrate .. //depot/projects/smpng/sys/dev/twe/twe_freebsd.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/udbp.c#7 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi.c#45 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vnops.c#10 integrate .. //depot/projects/smpng/sys/geom/geom_disk.c#18 integrate .. //depot/projects/smpng/sys/geom/geom_event.c#12 integrate .. //depot/projects/smpng/sys/i386/i386/busdma_machdep.c#11 integrate .. //depot/projects/smpng/sys/i386/include/apic.h#7 integrate .. //depot/projects/smpng/sys/i386/include/pmap.h#12 integrate .. //depot/projects/smpng/sys/ia64/ia64/busdma_machdep.c#11 integrate .. //depot/projects/smpng/sys/ia64/include/pmap.h#11 integrate .. //depot/projects/smpng/sys/isa/fd.c#19 integrate .. //depot/projects/smpng/sys/kern/kern_acct.c#25 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#19 integrate .. //depot/projects/smpng/sys/kern/subr_devstat.c#6 integrate .. //depot/projects/smpng/sys/kern/uipc_cow.c#7 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#31 integrate .. //depot/projects/smpng/sys/kern/vfs_cache.c#17 integrate .. //depot/projects/smpng/sys/kern/vfs_cluster.c#20 integrate .. //depot/projects/smpng/sys/modules/oltr/Makefile#4 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#28 integrate .. //depot/projects/smpng/sys/net/if_fddisubr.c#13 integrate .. //depot/projects/smpng/sys/net/if_iso88025subr.c#12 integrate .. //depot/projects/smpng/sys/net/iso88025.h#4 integrate .. //depot/projects/smpng/sys/netinet/ip_fw.h#12 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#11 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#24 integrate .. //depot/projects/smpng/sys/pc98/pc98/fd.c#21 integrate .. //depot/projects/smpng/sys/powerpc/include/pmap.h#9 integrate .. //depot/projects/smpng/sys/sparc64/include/pmap.h#20 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/bus_machdep.c#12 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/mem.c#5 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#34 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/vm_machdep.c#28 integrate .. //depot/projects/smpng/sys/sys/devicestat.h#5 integrate .. //depot/projects/smpng/sys/sys/param.h#35 integrate .. //depot/projects/smpng/sys/sys/stat.h#11 integrate .. //depot/projects/smpng/sys/vm/pmap.h#14 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#30 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/busdma_machdep.c#11 (text+ko) ==== @@ -23,13 +23,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.31 2003/03/13 17:17:30 mux Exp $ + * $FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.32 2003/03/17 17:26:39 mux Exp $ */ #include #include #include #include +#include #include #include #include @@ -99,6 +100,7 @@ static STAILQ_HEAD(, bus_dmamap) bounce_map_callbacklist; static struct bus_dmamap nobounce_dmamap; +static void init_bounce_pages(void *dummy); static int alloc_bounce_pages(bus_dma_tag_t dmat, u_int numpages); static int reserve_bounce_pages(bus_dma_tag_t dmat, bus_dmamap_t map); static vm_offset_t add_bounce_page(bus_dma_tag_t dmat, bus_dmamap_t map, @@ -489,9 +491,7 @@ /* Reserve Necessary Bounce Pages */ if (map->pagesneeded != 0) { - int s; - - s = splhigh(); + mtx_lock(&bounce_lock); if (reserve_bounce_pages(dmat, map) != 0) { /* Queue us for resources */ @@ -502,11 +502,10 @@ map->callback_arg = callback_arg; STAILQ_INSERT_TAIL(&bounce_map_waitinglist, map, links); - splx(s); - + mtx_unlock(&bounce_lock); return (EINPROGRESS); } - splx(s); + mtx_unlock(&bounce_lock); } vaddr = (vm_offset_t)buf; @@ -826,19 +825,27 @@ } } +static void +init_bounce_pages(void *dummy __unused) +{ + + free_bpages = 0; + reserved_bpages = 0; + active_bpages = 0; + total_bpages = 0; + STAILQ_INIT(&bounce_page_list); + STAILQ_INIT(&bounce_map_waitinglist); + STAILQ_INIT(&bounce_map_callbacklist); + mtx_init(&bounce_lock, "bounce pages lock", NULL, MTX_DEF); +} +SYSINIT(bpages, SI_SUB_LOCK, SI_ORDER_ANY, init_bounce_pages, NULL); + static int alloc_bounce_pages(bus_dma_tag_t dmat, u_int numpages) { int count; count = 0; - if (total_bpages == 0) { - mtx_init(&bounce_lock, "BouncePage", NULL, MTX_DEF); - STAILQ_INIT(&bounce_page_list); - STAILQ_INIT(&bounce_map_waitinglist); - STAILQ_INIT(&bounce_map_callbacklist); - } - while (numpages > 0) { struct bounce_page *bpage; @@ -875,6 +882,7 @@ { int pages; + mtx_assert(&bounce_lock, MA_OWNED); pages = MIN(free_bpages, map->pagesneeded - map->pagesreserved); free_bpages -= pages; reserved_bpages += pages; ==== //depot/projects/smpng/sys/alpha/include/pmap.h#13 (text+ko) ==== @@ -43,7 +43,7 @@ * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 * from: i386 pmap.h,v 1.54 1997/11/20 19:30:35 bde Exp - * $FreeBSD: src/sys/alpha/include/pmap.h,v 1.20 2003/03/01 10:02:10 alc Exp $ + * $FreeBSD: src/sys/alpha/include/pmap.h,v 1.21 2003/03/16 04:16:02 jake Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -223,6 +223,8 @@ vm_offset_t pmap_steal_memory(vm_size_t); void pmap_bootstrap(vm_offset_t, u_int); +void pmap_kenter(vm_offset_t va, vm_offset_t pa); +void pmap_kremove(vm_offset_t); void pmap_setdevram(unsigned long long basea, vm_offset_t sizea); int pmap_uses_prom_console(void); void *pmap_mapdev(vm_offset_t, vm_size_t); ==== //depot/projects/smpng/sys/cam/cam_periph.c#8 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_periph.c,v 1.46 2003/02/19 05:46:56 imp Exp $ + * $FreeBSD: src/sys/cam/cam_periph.c,v 1.47 2003/03/15 21:59:05 phk Exp $ */ #include @@ -866,7 +866,7 @@ * this particular type of ccb, record the transaction start. */ if ((ds != NULL) && (ccb->ccb_h.func_code == XPT_SCSI_IO)) - devstat_start_transaction(ds); + devstat_start_transaction(ds, NULL); xpt_action(ccb); @@ -896,7 +896,7 @@ CAM_DIR_NONE) ? DEVSTAT_NO_DATA : (ccb->ccb_h.flags & CAM_DIR_OUT) ? DEVSTAT_WRITE : - DEVSTAT_READ); + DEVSTAT_READ, NULL, NULL); return(error); } ==== //depot/projects/smpng/sys/cam/scsi/scsi_cd.c#15 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.74 2003/03/08 21:40:13 phk Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.76 2003/03/15 11:00:56 phk Exp $ */ /* * Portions of this driver taken from the original FreeBSD cd driver. @@ -151,6 +151,7 @@ dev_t dev; eventhandler_tag clonetag; int minimum_command_size; + int outstanding_cmds; struct sysctl_ctx_list sysctl_ctx; struct sysctl_oid *sysctl_tree; STAILQ_HEAD(, cd_mode_params) mode_queue; @@ -1088,7 +1089,7 @@ * this device. If not, move it out of the active slot. */ if ((bioq_first(&changer->cur_device->bio_queue) == NULL) - && (changer->cur_device->device_stats->busy_count == 0)) { + && (changer->cur_device->outstanding_cmds == 0)) { changer->flags |= CHANGER_MANUAL_CALL; cdrunchangerqueue(changer); } @@ -1187,10 +1188,10 @@ */ if (changer->devq.qfrozen_cnt > 0) { - if (changer->cur_device->device_stats->busy_count > 0) { + if (changer->cur_device->outstanding_cmds > 0) { changer->cur_device->flags |= CD_FLAG_SCHED_ON_COMP; changer->cur_device->bufs_left = - changer->cur_device->device_stats->busy_count; + changer->cur_device->outstanding_cmds; if (called_from_timeout) { changer->long_handle = timeout(cdrunchangerqueue, changer, @@ -1297,7 +1298,7 @@ cdrunchangerqueue(softc->changer); } } else if ((bioq_first(&softc->bio_queue) == NULL) - && (softc->device_stats->busy_count == 0)) { + && (softc->outstanding_cmds == 0)) { softc->changer->flags |= CHANGER_MANUAL_CALL; cdrunchangerqueue(softc->changer); } @@ -1507,7 +1508,7 @@ } else { bioq_remove(&softc->bio_queue, bp); - devstat_start_transaction(softc->device_stats); + devstat_start_transaction_bio(softc->device_stats, bp); scsi_read_write(&start_ccb->csio, /*retries*/4, @@ -1533,6 +1534,7 @@ oldspl = splcam(); LIST_INSERT_HEAD(&softc->pending_ccbs, &start_ccb->ccb_h, periph_links.le); + softc->outstanding_cmds++; splx(oldspl); /* We expect a unit attention from this device */ @@ -1661,6 +1663,7 @@ */ oldspl = splcam(); LIST_REMOVE(&done_ccb->ccb_h, periph_links.le); + softc->outstanding_cmds--; splx(oldspl); if (softc->flags & CD_FLAG_CHANGER) ==== //depot/projects/smpng/sys/cam/scsi/scsi_da.c#34 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.133 2003/03/11 02:07:17 njl Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.134 2003/03/15 11:00:56 phk Exp $ */ #ifdef _KERNEL @@ -123,6 +123,7 @@ da_quirks quirks; int minimum_cmd_size; int ordered_tag_count; + int outstanding_cmds; struct disk_params params; struct disk disk; union ccb saved_ccb; @@ -1298,6 +1299,7 @@ oldspl = splcam(); LIST_INSERT_HEAD(&softc->pending_ccbs, &start_ccb->ccb_h, periph_links.le); + softc->outstanding_cmds++; splx(oldspl); /* We expect a unit attention from this device */ @@ -1499,11 +1501,11 @@ */ oldspl = splcam(); LIST_REMOVE(&done_ccb->ccb_h, periph_links.le); + softc->outstanding_cmds--; + if (softc->outstanding_cmds == 0) + softc->flags |= DA_FLAG_WENT_IDLE; splx(oldspl); - if (softc->disk.d_devstat->busy_count == 0) - softc->flags |= DA_FLAG_WENT_IDLE; - biodone(bp); break; } @@ -1781,7 +1783,7 @@ && ((softc->flags & DA_FLAG_WENT_IDLE) == 0)) { softc->flags |= DA_FLAG_NEED_OTAG; } - if (softc->disk.d_devstat->busy_count > 0) + if (softc->outstanding_cmds > 0) softc->flags &= ~DA_FLAG_WENT_IDLE; softc->ordered_tag_count = 0; ==== //depot/projects/smpng/sys/cam/scsi/scsi_pt.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/scsi/scsi_pt.c,v 1.35 2003/03/08 21:44:31 phk Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_pt.c,v 1.36 2003/03/15 10:50:42 phk Exp $ */ #include @@ -502,7 +502,7 @@ bioq_remove(&softc->bio_queue, bp); - devstat_start_transaction(softc->device_stats); + devstat_start_transaction_bio(softc->device_stats, bp); scsi_send_receive(&start_ccb->csio, /*retries*/4, ==== //depot/projects/smpng/sys/cam/scsi/scsi_sa.c#12 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.90 2003/03/08 21:44:46 phk Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.91 2003/03/15 10:50:42 phk Exp $ * * Implementation of SCSI Sequential Access Peripheral driver for CAM. * @@ -1620,7 +1620,7 @@ CAM_DEBUG(start_ccb->ccb_h.path, CAM_DEBUG_INFO, ("Variable Record Count is %d\n", length)); } - devstat_start_transaction(softc->device_stats); + devstat_start_transaction_bio(softc->device_stats, bp); /* * Some people have theorized that we should * suppress illegal length indication if we are ==== //depot/projects/smpng/sys/compat/linux/linux_getcwd.c#10 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/compat/linux/linux_getcwd.c,v 1.10 2003/02/19 05:46:58 imp Exp $ */ +/* $FreeBSD: src/sys/compat/linux/linux_getcwd.c,v 1.11 2003/03/17 12:21:08 phk Exp $ */ /* $OpenBSD: linux_getcwd.c,v 1.2 2001/05/16 12:50:21 ho Exp $ */ /* $NetBSD: vfs_getcwd.c,v 1.3.2.3 1999/07/11 10:24:09 sommerfeld Exp $ */ @@ -37,432 +37,25 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "opt_compat.h" -#include "opt_mac.h" #include #include -#include -#include -#include -#include -#include #include -#include -#include #include -#include -#include -#include -#include -#include /* XXX only for DIRBLKSIZ */ #include #include -#include - -static int -linux_getcwd_scandir(struct vnode **, struct vnode **, - char **, char *, struct thread *); -static int -linux_getcwd_common(struct vnode *, struct vnode *, - char **, char *, int, int, struct thread *); - -#define DIRENT_MINSIZE (sizeof(struct dirent) - (MAXNAMLEN+1) + 4) /* - * Vnode variable naming conventions in this file: - * - * rvp: the current root we're aiming towards. - * lvp, *lvpp: the "lower" vnode - * uvp, *uvpp: the "upper" vnode. - * - * Since all the vnodes we're dealing with are directories, and the - * lookups are going *up* in the filesystem rather than *down*, the - * usual "pvp" (parent) or "dvp" (directory) naming conventions are - * too confusing. - */ - -/* - * XXX Will infinite loop in certain cases if a directory read reliably - * returns EINVAL on last block. - * XXX is EINVAL the right thing to return if a directory is malformed? - */ - -/* - * XXX Untested vs. mount -o union; probably does the wrong thing. - */ - -/* - * Find parent vnode of *lvpp, return in *uvpp - * - * If we care about the name, scan it looking for name of directory - * entry pointing at lvp. - * - * Place the name in the buffer which starts at bufp, immediately - * before *bpp, and move bpp backwards to point at the start of it. - * - * On entry, *lvpp is a locked vnode reference; on exit, it is vput and NULL'ed - * On exit, *uvpp is either NULL or is a locked vnode reference. - */ -static int -linux_getcwd_scandir(lvpp, uvpp, bpp, bufp, td) - struct vnode **lvpp; - struct vnode **uvpp; - char **bpp; - char *bufp; - struct thread *td; -{ - int error = 0; - int eofflag; - off_t off; - int tries; - struct uio uio; - struct iovec iov; - char *dirbuf = NULL; - int dirbuflen; - ino_t fileno; - struct vattr va; - struct vnode *uvp = NULL; - struct vnode *lvp = *lvpp; - struct componentname cn; - int len, reclen; - tries = 0; - - /* - * If we want the filename, get some info we need while the - * current directory is still locked. - */ - if (bufp != NULL) { - error = VOP_GETATTR(lvp, &va, td->td_ucred, td); - if (error) { - vput(lvp); - *lvpp = NULL; - *uvpp = NULL; - return error; - } - } - - /* - * Ok, we have to do it the hard way.. - * Next, get parent vnode using lookup of .. - */ - cn.cn_nameiop = LOOKUP; - cn.cn_flags = ISLASTCN | ISDOTDOT | RDONLY; - cn.cn_thread = td; - cn.cn_cred = td->td_ucred; - cn.cn_pnbuf = NULL; - cn.cn_nameptr = ".."; - cn.cn_namelen = 2; - cn.cn_consume = 0; - - /* - * At this point, lvp is locked and will be unlocked by the lookup. - * On successful return, *uvpp will be locked - */ - error = VOP_LOOKUP(lvp, uvpp, &cn); - if (error) { - vput(lvp); - *lvpp = NULL; - *uvpp = NULL; - return error; - } - uvp = *uvpp; - - /* If we don't care about the pathname, we're done */ - if (bufp == NULL) { - vrele(lvp); - *lvpp = NULL; - return 0; - } - - fileno = va.va_fileid; - - dirbuflen = DIRBLKSIZ; - if (dirbuflen < va.va_blocksize) - dirbuflen = va.va_blocksize; - dirbuf = (char *)malloc(dirbuflen, M_TEMP, M_WAITOK); - -#if 0 -unionread: -#endif - off = 0; - do { - /* call VOP_READDIR of parent */ - iov.iov_base = dirbuf; - iov.iov_len = dirbuflen; - - uio.uio_iov = &iov; - uio.uio_iovcnt = 1; - uio.uio_offset = off; - uio.uio_resid = dirbuflen; - uio.uio_segflg = UIO_SYSSPACE; - uio.uio_rw = UIO_READ; - uio.uio_td = td; - - eofflag = 0; - -#ifdef MAC - error = mac_check_vnode_readdir(td->td_ucred, uvp); - if (error == 0) -#endif /* MAC */ - error = VOP_READDIR(uvp, &uio, td->td_ucred, &eofflag, - 0, 0); - - off = uio.uio_offset; - - /* - * Try again if NFS tosses its cookies. - * XXX this can still loop forever if the directory is busted - * such that the second or subsequent page of it always - * returns EINVAL - */ - if ((error == EINVAL) && (tries < 3)) { - off = 0; - tries++; - continue; /* once more, with feeling */ - } - - if (!error) { - char *cpos; - struct dirent *dp; - - cpos = dirbuf; - tries = 0; - - /* scan directory page looking for matching vnode */ - for (len = (dirbuflen - uio.uio_resid); len > 0; len -= reclen) { - dp = (struct dirent *) cpos; - reclen = dp->d_reclen; - - /* check for malformed directory.. */ - if (reclen < DIRENT_MINSIZE) { - error = EINVAL; - goto out; - } - /* - * XXX should perhaps do VOP_LOOKUP to - * check that we got back to the right place, - * but getting the locking games for that - * right would be heinous. - */ - if ((dp->d_type != DT_WHT) && - (dp->d_fileno == fileno)) { - char *bp = *bpp; - bp -= dp->d_namlen; - - if (bp <= bufp) { - error = ERANGE; - goto out; - } - bcopy(dp->d_name, bp, dp->d_namlen); - error = 0; - *bpp = bp; - goto out; - } - cpos += reclen; - } - } - } while (!eofflag); - error = ENOENT; - -out: - vrele(lvp); - *lvpp = NULL; - free(dirbuf, M_TEMP); - return error; -} - - -/* - * common routine shared by sys___getcwd() and linux_vn_isunder() - */ - -#define GETCWD_CHECK_ACCESS 0x0001 - -static int -linux_getcwd_common (lvp, rvp, bpp, bufp, limit, flags, td) - struct vnode *lvp; - struct vnode *rvp; - char **bpp; - char *bufp; - int limit; - int flags; - struct thread *td; -{ - struct filedesc *fdp = td->td_proc->p_fd; - struct vnode *uvp = NULL; - char *bp = NULL; - int error; - int perms = VEXEC; - - if (rvp == NULL) { - rvp = fdp->fd_rdir; - if (rvp == NULL) - rvp = rootvnode; - } - - VREF(rvp); - VREF(lvp); - - /* - * Error handling invariant: - * Before a `goto out': - * lvp is either NULL, or locked and held. - * uvp is either NULL, or locked and held. - */ - - error = vn_lock(lvp, LK_EXCLUSIVE | LK_RETRY, td); - if (error) { - vrele(lvp); - lvp = NULL; - goto out; - } - if (bufp) - bp = *bpp; - /* - * this loop will terminate when one of the following happens: - * - we hit the root - * - getdirentries or lookup fails - * - we run out of space in the buffer. - */ - if (lvp == rvp) { - if (bp) - *(--bp) = '/'; - goto out; - } - do { - if (lvp->v_type != VDIR) { - error = ENOTDIR; - goto out; - } - - /* - * access check here is optional, depending on - * whether or not caller cares. - */ - if (flags & GETCWD_CHECK_ACCESS) { - error = VOP_ACCESS(lvp, perms, td->td_ucred, td); - if (error) - goto out; - perms = VEXEC|VREAD; - } - - /* - * step up if we're a covered vnode.. - */ - while (lvp->v_vflag & VV_ROOT) { - struct vnode *tvp; - - if (lvp == rvp) - goto out; - - tvp = lvp; - lvp = lvp->v_mount->mnt_vnodecovered; - vput(tvp); - /* - * hodie natus est radici frater - */ - if (lvp == NULL) { - error = ENOENT; - goto out; - } - VREF(lvp); - error = vn_lock(lvp, LK_EXCLUSIVE | LK_RETRY, td); - if (error != 0) { - vrele(lvp); - lvp = NULL; - goto out; - } - } - error = linux_getcwd_scandir(&lvp, &uvp, &bp, bufp, td); - if (error) - goto out; -#if DIAGNOSTIC - if (lvp != NULL) - panic("getcwd: oops, forgot to null lvp"); - if (bufp && (bp <= bufp)) { - panic("getcwd: oops, went back too far"); - } -#endif - if (bp) - *(--bp) = '/'; - lvp = uvp; - uvp = NULL; - limit--; - } while ((lvp != rvp) && (limit > 0)); - -out: - if (bpp) - *bpp = bp; - if (uvp) - vput(uvp); - if (lvp) - vput(lvp); - vrele(rvp); - return error; -} - - -/* * Find pathname of process's current directory. * * Use vfs vnode-to-name reverse cache; if that fails, fall back - * to reading directory contents. + * to reading directory contents. Use the common routines in vfs_cache.c. */ int linux_getcwd(struct thread *td, struct linux_getcwd_args *args) { - caddr_t bp, bend, path; - int error, len, lenused; - -#ifdef DEBUG - printf("Linux-emul(%ld): getcwd(%p, %ld)\n", (long)td->td_proc->p_pid, - args->buf, (long)args->bufsize); -#endif - - len = args->bufsize; - - if (len > MAXPATHLEN*4) - len = MAXPATHLEN*4; - else if (len < 2) - return ERANGE; - - path = (char *)malloc(len, M_TEMP, M_WAITOK); - - error = kern___getcwd(td, path, UIO_SYSSPACE, len); - if (!error) { - lenused = strlen(path) + 1; - if (lenused <= args->bufsize) { - td->td_retval[0] = lenused; - error = copyout(path, args->buf, lenused); - } - else - error = ERANGE; - } else { - bp = &path[len]; - bend = bp; - *(--bp) = '\0'; - - /* - * 5th argument here is "max number of vnodes to traverse". - * Since each entry takes up at least 2 bytes in the output buffer, - * limit it to N/2 vnodes for an N byte buffer. - */ - - error = linux_getcwd_common (td->td_proc->p_fd->fd_cdir, NULL, - &bp, path, len/2, GETCWD_CHECK_ACCESS, td); - - if (error) - goto out; - lenused = bend - bp; - td->td_retval[0] = lenused; - /* put the result into user buffer */ - error = copyout(bp, args->buf, lenused); - } -out: - free(path, M_TEMP); - return (error); + return (kern___getcwd (td, args->buf, UIO_USERSPACE, args->bufsize)); } ==== //depot/projects/smpng/sys/contrib/dev/oltr/if_oltr.c#4 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/contrib/dev/oltr/if_oltr.c,v 1.24 2003/02/19 05:46:59 imp Exp $ + * $FreeBSD: src/sys/contrib/dev/oltr/if_oltr.c,v 1.28 2003/03/16 00:24:18 mdodd Exp $ */ #include @@ -257,6 +257,8 @@ static devclass_t oltr_devclass; DRIVER_MODULE(oltr, pci, oltr_driver, oltr_devclass, 0, 0); +MODULE_DEPEND(oltr, pci, 1, 1, 1); +MODULE_DEPEND(oltr, iso88025, 1, 1, 1); static int oltr_pci_probe(device_t dev) @@ -389,11 +391,11 @@ ifp->if_softc = sc; ifp->if_unit = device_get_unit(dev); ifp->if_name = "oltr"; - ifp->if_output = iso88025_output; ifp->if_init = oltr_init; ifp->if_start = oltr_start; ifp->if_ioctl = oltr_ioctl; ifp->if_flags = IFF_BROADCAST; + ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; bcopy(sc->config.macaddress, sc->arpcom.ac_enaddr, sizeof(sc->config.macaddress)); /* @@ -423,14 +425,8 @@ /* * Attach the interface */ - if_attach(ifp); - ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; - iso88025_ifattach(ifp); + iso88025_ifattach(ifp, ISO88025_BPF_SUPPORTED); -#if (NBPFILTER > 0) || (__FreeBSD_version > 400000) - bpfattach(ifp, DLT_IEEE802, sizeof(struct iso88025_header)); -#endif - splx(s); return(0); @@ -451,7 +447,7 @@ s = splimp(); - if_detach(ifp); + iso88025_ifdetach(ifp, ISO88025_BPF_SUPPORTED); if (sc->state > OL_CLOSED) oltr_stop(sc); @@ -670,10 +666,6 @@ ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; iso88025_ifattach(ifp); -#if (NBPFILTER > 0) || (__FreeBSD_version > 400000) - bpfattach(ifp, DLT_IEEE802, sizeof(struct iso88025_header)); -#endif - splx(s); return; @@ -1397,8 +1389,7 @@ struct oltr_softc *sc = (struct oltr_softc *)DriverHandle; struct ifnet *ifp = (struct ifnet *)&sc->arpcom.ac_if; struct mbuf *m0, *m1, *m; - struct iso88025_header *th; - int frame_len = ByteCount, hdr_len, i = (int)FragmentHandle, rc, s; + int frame_len = ByteCount, i = (int)FragmentHandle, rc, s; int mbuf_offset, mbuf_size, frag_offset, copy_length; char *fragment = sc->rx_ring[RING_BUFFER(i)].data; @@ -1423,8 +1414,6 @@ m0->m_pkthdr.len = ByteCount; m0->m_len = 0; m0->m_data += 2; - th = mtod(m0, struct iso88025_header *); - m0->m_pkthdr.header = (void *)th; m = m0; mbuf_offset = 0; @@ -1469,32 +1458,9 @@ m->m_len = 0; } } -#if (NBPFILTER > 0) || (__FreeBSD_version > 400000) - BPF_MTAP(ifp, m0); -#endif - - /*if (ifp->if_flags & IFF_PROMISC) {*/ - if (bcmp(th->iso88025_dhost, etherbroadcastaddr - , sizeof(th->iso88025_dhost))) { - if ((bcmp(th->iso88025_dhost + 1, sc->arpcom.ac_enaddr + 1, ISO88025_ADDR_LEN - 1)) || - ((th->iso88025_dhost[0] & 0x7f) != sc->arpcom.ac_enaddr[0])) { - m_freem(m0); - goto dropped; - } - } - /*}*/ ifp->if_ipackets++; - hdr_len = ISO88025_HDR_LEN; - if (th->iso88025_shost[0] & 0x80) - hdr_len += (ntohs(th->rcf) & 0x1f00) >> 8; - - m0->m_pkthdr.len -= hdr_len; - m0->m_len -= hdr_len; - m0->m_data += hdr_len; - - iso88025_input(ifp, th, m0); - + iso88025_input(ifp, m0); } else { /* Receiver error */ if (ReceiveStatus != TRLLD_RCV_NO_DATA) { printf("oltr%d: receive error %d\n", sc->unit, ==== //depot/projects/smpng/sys/dev/aac/aac.c#23 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/aac/aac.c,v 1.63 2003/03/08 08:01:27 phk Exp $ + * $FreeBSD: src/sys/dev/aac/aac.c,v 1.64 2003/03/13 22:56:11 scottl Exp $ */ /* @@ -751,12 +751,10 @@ /* See if any FIBs need to be allocated */ if ((sc->aifflags & AAC_AIFFLAGS_ALLOCFIBS) != 0) { - mtx_lock(&Giant); AAC_LOCK_ACQUIRE(&sc->aac_io_lock); aac_alloc_commands(sc); sc->aifflags &= ~AAC_AIFFLAGS_ALLOCFIBS; AAC_LOCK_RELEASE(&sc->aac_io_lock); - mtx_unlock(&Giant); } /* While we're here, check to see if any commands are stuck */ ==== //depot/projects/smpng/sys/dev/ata/ata-chipset.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ * (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/sys/dev/ata/ata-chipset.c,v 1.14 2003/03/12 15:45:52 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.15 2003/03/16 16:26:51 sos Exp $ */ #include "opt_ata.h" #include @@ -95,8 +95,8 @@ static void ata_sis_setmode(struct ata_device *, int); static int ata_mode2idx(int); static int ata_check_80pin(struct ata_device *, int); -static int ata_find_dev(device_t, u_int32_t, u_int32_t); -static struct ata_chip_id *ata_match_chip(device_t, struct ata_chip_id *); +static int ata_find_dev(device_t, u_int32_t, u_int32_t, int); +static struct ata_chip_id *ata_match_chip(device_t, struct ata_chip_id *, int); static int ata_default_interrupt(device_t); static void ata_pci_serialize(struct ata_channel *, int); @@ -171,7 +171,7 @@ { 0, 0, 0, 0, 0, 0}}; char buffer[64]; >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Mar 19 5: 4:53 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE3AE37B404; Wed, 19 Mar 2003 05:04:51 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4186337B401 for ; Wed, 19 Mar 2003 05:04:51 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CE45743F93 for ; Wed, 19 Mar 2003 05:04:50 -0800 (PST) (envelope-from alex@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h2JD4o0U057012 for ; Wed, 19 Mar 2003 05:04:50 -0800 (PST) (envelope-from alex@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2JD4oRp057009 for perforce@freebsd.org; Wed, 19 Mar 2003 05:04:50 -0800 (PST) Date: Wed, 19 Mar 2003 05:04:50 -0800 (PST) Message-Id: <200303191304.h2JD4oRp057009@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alex@freebsd.org using -f From: Alexander Langer Subject: PERFORCE change 27109 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=27109 Change 27109 by alex@alex_fump on 2003/03/19 05:03:56 temporarily fix type of savectx to make that compile Affected files ... .. //depot/projects/mips/sys/mips/mips/machdep.c#6 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/machdep.c#6 (text+ko) ==== @@ -134,7 +134,7 @@ { } -void +int savectx(struct pcb *pcb) { } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Mar 19 5: 8:59 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4963737B404; Wed, 19 Mar 2003 05:08:57 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D204C37B401 for ; Wed, 19 Mar 2003 05:08:56 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 687F543F75 for ; Wed, 19 Mar 2003 05:08:56 -0800 (PST) (envelope-from alex@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h2JD8u0U057218 for ; Wed, 19 Mar 2003 05:08:56 -0800 (PST) (envelope-from alex@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2JD8tcN057215 for perforce@freebsd.org; Wed, 19 Mar 2003 05:08:55 -0800 (PST) Date: Wed, 19 Mar 2003 05:08:55 -0800 (PST) Message-Id: <200303191308.h2JD8tcN057215@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alex@freebsd.org using -f From: Alexander Langer Subject: PERFORCE change 27110 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=27110 Change 27110 by alex@alex_fump on 2003/03/19 05:08:16 Don't set COPTFLAGS on TARGET=mips for now, as this breaks the build. We might want to remove this later. Affected files ... .. //depot/projects/mips/sys/conf/kern.pre.mk#5 edit Differences ... ==== //depot/projects/mips/sys/conf/kern.pre.mk#5 (text+ko) ==== @@ -18,7 +18,9 @@ OBJCOPY?= objcopy SIZE?= size +.if defined(ARCH) && ${ARCH} != "mips" COPTFLAGS?=-O -pipe +.endif .if !defined(NO_CPU_COPTFLAGS) COPTFLAGS+= ${_CPUCFLAGS} .endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Mar 19 6:17:22 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2D98137B404; Wed, 19 Mar 2003 06:17:20 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C77D137B401 for ; Wed, 19 Mar 2003 06:17:19 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1F7F543F75 for ; Wed, 19 Mar 2003 06:17:19 -0800 (PST) (envelope-from alex@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h2JEHI0U062820 for ; Wed, 19 Mar 2003 06:17:18 -0800 (PST) (envelope-from alex@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2JEHILL062817 for perforce@freebsd.org; Wed, 19 Mar 2003 06:17:18 -0800 (PST) Date: Wed, 19 Mar 2003 06:17:18 -0800 (PST) Message-Id: <200303191417.h2JEHILL062817@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alex@freebsd.org using -f From: Alexander Langer Subject: PERFORCE change 27111 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=27111 Change 27111 by alex@alex_fump on 2003/03/19 06:16:28 sync the struct cdevsw initialization with the way it's done in -CURRENT nowadays. Affected files ... .. //depot/projects/mips/sys/dev/arcbios/arcbios_tty.c#4 edit Differences ... ==== //depot/projects/mips/sys/dev/arcbios/arcbios_tty.c#4 (text+ko) ==== @@ -46,7 +46,7 @@ #include #include -#define CDEV_MAJOR 97 +#define CDEV_MAJOR 97 /* XXX use MAJOR_AUTO? */ struct callout arcbios_tty_ch = { { { NULL } }, 0, @@ -71,20 +71,16 @@ /* This structure is defined in sys/conf.h */ struct cdevsw arcbios_cdevsw = { - arcbios_ttyopen, - arcbios_ttyclose, - arcbios_ttyread, - arcbios_ttywrite, - arcbios_ttyioctl, - ttypoll, - nommap, - nostrategy /* Strategy */, - "console" /* Name */, - CDEV_MAJOR /* Major Number */, - nodump /* Dump */, - nopsize /* PSize */, - D_TTY /* Flags */, - ttykqfilter /* kqueue filter */ + .d_maj = CDEV_MAJOR, + .d_flags = D_TTY, + .d_name = "console", + .d_open = arcbios_ttyopen, + .d_close = arcbios_ttyclose, + .d_read = arcbios_ttyread, + .d_write = arcbios_ttywrite, + .d_ioctl = arcbios_ttyioctl, + .d_poll = ttypoll, + .d_kqfilter = ttykqfilter }; int arcbios_ttyopen( dev_t dev, int flag, int mode, struct thread *p ) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Mar 20 14: 3:24 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C74D237B401; Thu, 20 Mar 2003 14:03:01 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 615DB37B404 for ; Thu, 20 Mar 2003 14:03:01 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7D3AD43F75 for ; Thu, 20 Mar 2003 14:02:58 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h2KM2w0U064115 for ; Thu, 20 Mar 2003 14:02:58 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2KM2vJs064112 for perforce@freebsd.org; Thu, 20 Mar 2003 14:02:57 -0800 (PST) Date: Thu, 20 Mar 2003 14:02:57 -0800 (PST) Message-Id: <200303202202.h2KM2vJs064112@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 27145 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=27145 Change 27145 by jhb@jhb_laptop on 2003/03/20 14:02:11 IFC @27144. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/busdma_machdep.c#12 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_mount.c#8 integrate .. //depot/projects/smpng/sys/compat/linux/linux_file.c#17 integrate .. //depot/projects/smpng/sys/compat/linux/linux_getcwd.c#11 integrate .. //depot/projects/smpng/sys/compat/linux/linux_stats.c#12 integrate .. //depot/projects/smpng/sys/conf/files#67 integrate .. //depot/projects/smpng/sys/conf/files.sparc64#25 integrate .. //depot/projects/smpng/sys/contrib/dev/fla/fla.c#7 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.c#32 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-tape.c#17 integrate .. //depot/projects/smpng/sys/dev/ccd/ccd.c#22 integrate .. //depot/projects/smpng/sys/dev/ciss/ciss.c#12 integrate .. //depot/projects/smpng/sys/dev/drm/drm_fops.h#4 integrate .. //depot/projects/smpng/sys/dev/fb/vga.c#11 integrate .. //depot/projects/smpng/sys/dev/firewire/if_fwe.c#8 integrate .. //depot/projects/smpng/sys/dev/ida/ida.c#7 integrate .. //depot/projects/smpng/sys/dev/iir/iir_pci.c#5 integrate .. //depot/projects/smpng/sys/dev/md/md.c#30 integrate .. //depot/projects/smpng/sys/dev/musycc/musycc.c#4 integrate .. //depot/projects/smpng/sys/dev/pccard/pccard.c#17 integrate .. //depot/projects/smpng/sys/dev/pccard/pccard_cis.c#11 integrate .. //depot/projects/smpng/sys/dev/pccard/pccarddevs#21 integrate .. //depot/projects/smpng/sys/dev/pccard/pccarddevs.h#21 integrate .. //depot/projects/smpng/sys/dev/raidframe/rf_threadstuff.h#2 integrate .. //depot/projects/smpng/sys/dev/sio/sio.c#27 integrate .. //depot/projects/smpng/sys/dev/sio/sioreg.h#5 integrate .. //depot/projects/smpng/sys/dev/sound/pci/via8233.c#3 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/ac97.c#14 integrate .. //depot/projects/smpng/sys/dev/ubsec/ubsec.c#10 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi.c#46 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi_pccard.c#11 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi_pci.c#10 integrate .. //depot/projects/smpng/sys/dev/wi/if_wivar.h#13 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde.c#5 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde_crypt.c#8 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde_lock.c#6 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde_work.c#6 integrate .. //depot/projects/smpng/sys/geom/geom.h#20 integrate .. //depot/projects/smpng/sys/geom/geom_bsd.c#22 integrate .. //depot/projects/smpng/sys/geom/geom_ctl.c#4 integrate .. //depot/projects/smpng/sys/geom/geom_dev.c#19 integrate .. //depot/projects/smpng/sys/geom/geom_disk.c#19 integrate .. //depot/projects/smpng/sys/geom/geom_dump.c#15 integrate .. //depot/projects/smpng/sys/geom/geom_int.h#7 integrate .. //depot/projects/smpng/sys/geom/geom_io.c#15 integrate .. //depot/projects/smpng/sys/geom/geom_kern.c#11 integrate .. //depot/projects/smpng/sys/geom/geom_slice.c#15 integrate .. //depot/projects/smpng/sys/geom/geom_stats.c#3 delete .. //depot/projects/smpng/sys/geom/geom_stats.h#2 delete .. //depot/projects/smpng/sys/geom/geom_subr.c#19 integrate .. //depot/projects/smpng/sys/i386/i386/busdma_machdep.c#12 integrate .. //depot/projects/smpng/sys/i386/i386/identcpu.c#17 integrate .. //depot/projects/smpng/sys/i386/i386/initcpu.c#16 integrate .. //depot/projects/smpng/sys/i386/i386/tsc.c#2 integrate .. //depot/projects/smpng/sys/i386/isa/clock.c#22 integrate .. //depot/projects/smpng/sys/i386/linux/linux_machdep.c#20 integrate .. //depot/projects/smpng/sys/ia64/ia64/busdma_machdep.c#12 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#57 integrate .. //depot/projects/smpng/sys/kern/kern_lockf.c#13 integrate .. //depot/projects/smpng/sys/kern/kern_mutex.c#65 integrate .. //depot/projects/smpng/sys/kern/kern_switch.c#28 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#43 integrate .. //depot/projects/smpng/sys/kern/kern_tc.c#20 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#20 integrate .. //depot/projects/smpng/sys/kern/subr_devstat.c#7 integrate .. //depot/projects/smpng/sys/kern/subr_disk.c#16 integrate .. //depot/projects/smpng/sys/kern/subr_prf.c#26 integrate .. //depot/projects/smpng/sys/kern/sys_process.c#25 integrate .. //depot/projects/smpng/sys/kern/uipc_cow.c#8 integrate .. //depot/projects/smpng/sys/kern/uipc_sem.c#5 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#38 integrate .. //depot/projects/smpng/sys/kern/vfs_cache.c#18 integrate .. //depot/projects/smpng/sys/kern/vfs_cluster.c#21 integrate .. //depot/projects/smpng/sys/net/if.c#33 integrate .. //depot/projects/smpng/sys/netncp/ncp_conn.c#8 integrate .. //depot/projects/smpng/sys/pc98/pc98/clock.c#14 integrate .. //depot/projects/smpng/sys/pci/if_rl.c#22 integrate .. //depot/projects/smpng/sys/pci/if_rlreg.h#9 integrate .. //depot/projects/smpng/sys/pci/if_xl.c#20 integrate .. //depot/projects/smpng/sys/pci/if_xlreg.h#8 integrate .. //depot/projects/smpng/sys/powerpc/powermac/macio.c#4 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/busdma_machdep.c#6 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/fpu.c#2 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/genassym.c#18 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#33 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/swtch.S#2 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/trap.c#30 integrate .. //depot/projects/smpng/sys/security/mac_portacl/mac_portacl.c#3 integrate .. //depot/projects/smpng/sys/sparc64/include/cache.h#6 integrate .. //depot/projects/smpng/sys/sparc64/include/pcpu.h#7 integrate .. //depot/projects/smpng/sys/sparc64/include/pmap.h#21 integrate .. //depot/projects/smpng/sys/sparc64/include/smp.h#12 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/bus_machdep.c#13 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/cache.c#10 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/cheetah.c#1 branch .. //depot/projects/smpng/sys/sparc64/sparc64/db_trace.c#12 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/identcpu.c#10 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/locore.S#3 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#43 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/mem.c#6 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/mp_exception.S#3 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/mp_machdep.c#15 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/spitfire.c#1 branch .. //depot/projects/smpng/sys/sparc64/sparc64/tick.c#10 integrate .. //depot/projects/smpng/sys/sys/devicestat.h#6 integrate .. //depot/projects/smpng/sys/sys/kse.h#7 integrate .. //depot/projects/smpng/sys/sys/proc.h#74 integrate .. //depot/projects/smpng/sys/sys/stat.h#12 integrate .. //depot/projects/smpng/sys/sys/systm.h#38 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_alloc.c#21 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_snapshot.c#25 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#25 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_subr.c#7 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#39 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_extattr.c#22 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#31 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#27 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#31 integrate .. //depot/projects/smpng/sys/vm/vnode_pager.c#27 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/busdma_machdep.c#12 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.32 2003/03/17 17:26:39 mux Exp $ + * $FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.33 2003/03/20 19:45:26 mux Exp $ */ #include @@ -42,6 +42,7 @@ #include #include +#include #include #include #include @@ -179,9 +180,8 @@ newtag->filterarg = parent->filterarg; newtag->parent = parent->parent; } - if (newtag->parent != NULL) { - parent->ref_count++; - } + if (newtag->parent != NULL) + atomic_add_int(&parent->ref_count, 1); } if (newtag->lowaddr < ptoa(Maxmem) && (flags & BUS_DMA_ALLOCNOW) != 0) { @@ -228,7 +228,7 @@ bus_dma_tag_t parent; parent = dmat->parent; - dmat->ref_count--; + atomic_subtract_int(&dmat->ref_count, 1); if (dmat->ref_count == 0) { free(dmat, M_DEVBUF); } ==== //depot/projects/smpng/sys/alpha/osf1/osf1_mount.c#8 (text+ko) ==== @@ -29,7 +29,7 @@ /* * Additional Copyright (c) 1999 by Andrew Gallatin - * $FreeBSD: src/sys/alpha/osf1/osf1_mount.c,v 1.13 2003/01/13 00:28:56 dillon Exp $ + * $FreeBSD: src/sys/alpha/osf1/osf1_mount.c,v 1.14 2003/03/20 21:17:38 jhb Exp $ */ #include "opt_mac.h" @@ -134,7 +134,7 @@ sp = &mp->mnt_stat; vrele(nd.ni_vp); #ifdef MAC - error = mac_check_mount_stat(td->td_proc->p_ucred, mp); + error = mac_check_mount_stat(td->td_ucred, mp); if (error) return (error); #endif @@ -161,7 +161,7 @@ return (error); mp = ((struct vnode *)fp->f_data)->v_mount; #ifdef MAC - error = mac_check_mount_stat(td->td_proc->p_ucred, mp); + error = mac_check_mount_stat(td->td_ucred, mp); if (error) { fdrop(fp, td); return (error); @@ -198,7 +198,7 @@ nmp = TAILQ_NEXT(mp, mnt_list); if (osf_sfsp && count < maxcount) { #ifdef MAC - error = mac_check_mount_stat(td->td_proc->p_ucred, mp); + error = mac_check_mount_stat(td->td_ucred, mp); if (error) continue; #endif ==== //depot/projects/smpng/sys/compat/linux/linux_file.c#17 (text+ko) ==== @@ -25,7 +25,7 @@ * (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/sys/compat/linux/linux_file.c,v 1.78 2003/03/03 09:17:12 des Exp $ + * $FreeBSD: src/sys/compat/linux/linux_file.c,v 1.79 2003/03/20 21:17:38 jhb Exp $ */ #include "opt_compat.h" @@ -320,7 +320,7 @@ /* * Do directory search MAC check using non-cached credentials. */ - if ((error = mac_check_vnode_readdir(td->td_proc->p_ucred, vp))) + if ((error = mac_check_vnode_readdir(td->td_ucred, vp))) goto out; #endif /* MAC */ if ((error = VOP_READDIR(vp, &auio, fp->f_cred, &eofflag, &ncookies, ==== //depot/projects/smpng/sys/compat/linux/linux_getcwd.c#11 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/compat/linux/linux_getcwd.c,v 1.11 2003/03/17 12:21:08 phk Exp $ */ +/* $FreeBSD: src/sys/compat/linux/linux_getcwd.c,v 1.12 2003/03/20 10:40:45 phk Exp $ */ /* $OpenBSD: linux_getcwd.c,v 1.2 2001/05/16 12:50:21 ho Exp $ */ /* $NetBSD: vfs_getcwd.c,v 1.3.2.3 1999/07/11 10:24:09 sommerfeld Exp $ */ @@ -37,25 +37,432 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ +#include "opt_compat.h" +#include "opt_mac.h" #include #include +#include +#include +#include +#include +#include #include +#include +#include #include +#include +#include +#include +#include +#include /* XXX only for DIRBLKSIZ */ #include #include +#include + +static int +linux_getcwd_scandir(struct vnode **, struct vnode **, + char **, char *, struct thread *); +static int +linux_getcwd_common(struct vnode *, struct vnode *, + char **, char *, int, int, struct thread *); + +#define DIRENT_MINSIZE (sizeof(struct dirent) - (MAXNAMLEN+1) + 4) /* + * Vnode variable naming conventions in this file: + * + * rvp: the current root we're aiming towards. + * lvp, *lvpp: the "lower" vnode + * uvp, *uvpp: the "upper" vnode. + * + * Since all the vnodes we're dealing with are directories, and the + * lookups are going *up* in the filesystem rather than *down*, the + * usual "pvp" (parent) or "dvp" (directory) naming conventions are + * too confusing. + */ + +/* + * XXX Will infinite loop in certain cases if a directory read reliably + * returns EINVAL on last block. + * XXX is EINVAL the right thing to return if a directory is malformed? + */ + +/* + * XXX Untested vs. mount -o union; probably does the wrong thing. + */ + +/* + * Find parent vnode of *lvpp, return in *uvpp + * + * If we care about the name, scan it looking for name of directory + * entry pointing at lvp. + * + * Place the name in the buffer which starts at bufp, immediately + * before *bpp, and move bpp backwards to point at the start of it. + * + * On entry, *lvpp is a locked vnode reference; on exit, it is vput and NULL'ed + * On exit, *uvpp is either NULL or is a locked vnode reference. + */ +static int +linux_getcwd_scandir(lvpp, uvpp, bpp, bufp, td) + struct vnode **lvpp; + struct vnode **uvpp; + char **bpp; + char *bufp; + struct thread *td; +{ + int error = 0; + int eofflag; + off_t off; + int tries; + struct uio uio; + struct iovec iov; + char *dirbuf = NULL; + int dirbuflen; + ino_t fileno; + struct vattr va; + struct vnode *uvp = NULL; + struct vnode *lvp = *lvpp; + struct componentname cn; + int len, reclen; + tries = 0; + + /* + * If we want the filename, get some info we need while the + * current directory is still locked. + */ + if (bufp != NULL) { + error = VOP_GETATTR(lvp, &va, td->td_ucred, td); + if (error) { + vput(lvp); + *lvpp = NULL; + *uvpp = NULL; + return error; + } + } + + /* + * Ok, we have to do it the hard way.. + * Next, get parent vnode using lookup of .. + */ + cn.cn_nameiop = LOOKUP; + cn.cn_flags = ISLASTCN | ISDOTDOT | RDONLY; + cn.cn_thread = td; + cn.cn_cred = td->td_ucred; + cn.cn_pnbuf = NULL; + cn.cn_nameptr = ".."; + cn.cn_namelen = 2; + cn.cn_consume = 0; + + /* + * At this point, lvp is locked and will be unlocked by the lookup. + * On successful return, *uvpp will be locked + */ + error = VOP_LOOKUP(lvp, uvpp, &cn); + if (error) { + vput(lvp); + *lvpp = NULL; + *uvpp = NULL; + return error; + } + uvp = *uvpp; + + /* If we don't care about the pathname, we're done */ + if (bufp == NULL) { + vrele(lvp); + *lvpp = NULL; + return 0; + } + + fileno = va.va_fileid; + + dirbuflen = DIRBLKSIZ; + if (dirbuflen < va.va_blocksize) + dirbuflen = va.va_blocksize; + dirbuf = (char *)malloc(dirbuflen, M_TEMP, M_WAITOK); + +#if 0 +unionread: +#endif + off = 0; + do { + /* call VOP_READDIR of parent */ + iov.iov_base = dirbuf; + iov.iov_len = dirbuflen; + + uio.uio_iov = &iov; + uio.uio_iovcnt = 1; + uio.uio_offset = off; + uio.uio_resid = dirbuflen; + uio.uio_segflg = UIO_SYSSPACE; + uio.uio_rw = UIO_READ; + uio.uio_td = td; + + eofflag = 0; + +#ifdef MAC + error = mac_check_vnode_readdir(td->td_ucred, uvp); + if (error == 0) +#endif /* MAC */ + error = VOP_READDIR(uvp, &uio, td->td_ucred, &eofflag, + 0, 0); + + off = uio.uio_offset; + + /* + * Try again if NFS tosses its cookies. + * XXX this can still loop forever if the directory is busted + * such that the second or subsequent page of it always + * returns EINVAL + */ + if ((error == EINVAL) && (tries < 3)) { + off = 0; + tries++; + continue; /* once more, with feeling */ + } + + if (!error) { + char *cpos; + struct dirent *dp; + + cpos = dirbuf; + tries = 0; + + /* scan directory page looking for matching vnode */ + for (len = (dirbuflen - uio.uio_resid); len > 0; len -= reclen) { + dp = (struct dirent *) cpos; + reclen = dp->d_reclen; + + /* check for malformed directory.. */ + if (reclen < DIRENT_MINSIZE) { + error = EINVAL; + goto out; + } + /* + * XXX should perhaps do VOP_LOOKUP to + * check that we got back to the right place, + * but getting the locking games for that + * right would be heinous. + */ + if ((dp->d_type != DT_WHT) && + (dp->d_fileno == fileno)) { + char *bp = *bpp; + bp -= dp->d_namlen; + + if (bp <= bufp) { + error = ERANGE; + goto out; + } + bcopy(dp->d_name, bp, dp->d_namlen); + error = 0; + *bpp = bp; + goto out; + } + cpos += reclen; + } + } + } while (!eofflag); + error = ENOENT; + +out: + vrele(lvp); + *lvpp = NULL; + free(dirbuf, M_TEMP); + return error; +} + + +/* + * common routine shared by sys___getcwd() and linux_vn_isunder() + */ + +#define GETCWD_CHECK_ACCESS 0x0001 + +static int +linux_getcwd_common (lvp, rvp, bpp, bufp, limit, flags, td) + struct vnode *lvp; + struct vnode *rvp; + char **bpp; + char *bufp; + int limit; + int flags; + struct thread *td; +{ + struct filedesc *fdp = td->td_proc->p_fd; + struct vnode *uvp = NULL; + char *bp = NULL; + int error; + int perms = VEXEC; + + if (rvp == NULL) { + rvp = fdp->fd_rdir; + if (rvp == NULL) + rvp = rootvnode; + } + + VREF(rvp); + VREF(lvp); + + /* + * Error handling invariant: + * Before a `goto out': + * lvp is either NULL, or locked and held. + * uvp is either NULL, or locked and held. + */ + + error = vn_lock(lvp, LK_EXCLUSIVE | LK_RETRY, td); + if (error) { + vrele(lvp); + lvp = NULL; + goto out; + } + if (bufp) + bp = *bpp; + /* + * this loop will terminate when one of the following happens: + * - we hit the root + * - getdirentries or lookup fails + * - we run out of space in the buffer. + */ + if (lvp == rvp) { + if (bp) + *(--bp) = '/'; + goto out; + } + do { + if (lvp->v_type != VDIR) { + error = ENOTDIR; + goto out; + } + + /* + * access check here is optional, depending on + * whether or not caller cares. + */ + if (flags & GETCWD_CHECK_ACCESS) { + error = VOP_ACCESS(lvp, perms, td->td_ucred, td); + if (error) + goto out; + perms = VEXEC|VREAD; + } + + /* + * step up if we're a covered vnode.. + */ + while (lvp->v_vflag & VV_ROOT) { + struct vnode *tvp; + + if (lvp == rvp) + goto out; + + tvp = lvp; + lvp = lvp->v_mount->mnt_vnodecovered; + vput(tvp); + /* + * hodie natus est radici frater + */ + if (lvp == NULL) { + error = ENOENT; + goto out; + } + VREF(lvp); + error = vn_lock(lvp, LK_EXCLUSIVE | LK_RETRY, td); + if (error != 0) { + vrele(lvp); + lvp = NULL; + goto out; + } + } + error = linux_getcwd_scandir(&lvp, &uvp, &bp, bufp, td); + if (error) + goto out; +#if DIAGNOSTIC + if (lvp != NULL) + panic("getcwd: oops, forgot to null lvp"); + if (bufp && (bp <= bufp)) { + panic("getcwd: oops, went back too far"); + } +#endif + if (bp) + *(--bp) = '/'; + lvp = uvp; + uvp = NULL; + limit--; + } while ((lvp != rvp) && (limit > 0)); + +out: + if (bpp) + *bpp = bp; + if (uvp) + vput(uvp); + if (lvp) + vput(lvp); + vrele(rvp); + return error; +} + + +/* * Find pathname of process's current directory. * * Use vfs vnode-to-name reverse cache; if that fails, fall back - * to reading directory contents. Use the common routines in vfs_cache.c. + * to reading directory contents. */ int linux_getcwd(struct thread *td, struct linux_getcwd_args *args) { - return (kern___getcwd (td, args->buf, UIO_USERSPACE, args->bufsize)); + caddr_t bp, bend, path; + int error, len, lenused; + +#ifdef DEBUG + printf("Linux-emul(%ld): getcwd(%p, %ld)\n", (long)td->td_proc->p_pid, + args->buf, (long)args->bufsize); +#endif + + len = args->bufsize; + + if (len > MAXPATHLEN*4) + len = MAXPATHLEN*4; + else if (len < 2) + return ERANGE; + + path = (char *)malloc(len, M_TEMP, M_WAITOK); + + error = kern___getcwd(td, path, UIO_SYSSPACE, len); + if (!error) { + lenused = strlen(path) + 1; + if (lenused <= args->bufsize) { + td->td_retval[0] = lenused; + error = copyout(path, args->buf, lenused); + } + else + error = ERANGE; + } else { + bp = &path[len]; + bend = bp; + *(--bp) = '\0'; + + /* + * 5th argument here is "max number of vnodes to traverse". + * Since each entry takes up at least 2 bytes in the output buffer, + * limit it to N/2 vnodes for an N byte buffer. + */ + + error = linux_getcwd_common (td->td_proc->p_fd->fd_cdir, NULL, + &bp, path, len/2, GETCWD_CHECK_ACCESS, td); + + if (error) + goto out; + lenused = bend - bp; + td->td_retval[0] = lenused; + /* put the result into user buffer */ + error = copyout(bp, args->buf, lenused); + } +out: + free(path, M_TEMP); + return (error); } ==== //depot/projects/smpng/sys/compat/linux/linux_stats.c#12 (text+ko) ==== @@ -25,7 +25,7 @@ * (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/sys/compat/linux/linux_stats.c,v 1.50 2003/03/03 09:17:12 des Exp $ + * $FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.51 2003/03/20 21:17:39 jhb Exp $ */ #include "opt_mac.h" @@ -251,7 +251,7 @@ bsd_statfs = &mp->mnt_stat; vrele(ndp->ni_vp); #ifdef MAC - error = mac_check_mount_stat(td->td_proc->p_ucred, mp); + error = mac_check_mount_stat(td->td_ucred, mp); if (error) return (error); #endif @@ -290,7 +290,7 @@ return error; mp = ((struct vnode *)fp->f_data)->v_mount; #ifdef MAC - error = mac_check_mount_stat(td->td_proc->p_ucred, mp); + error = mac_check_mount_stat(td->td_ucred, mp); if (error) { fdrop(fp, td); return (error); @@ -358,8 +358,7 @@ if (vp->v_mount == NULL) return (EINVAL); #ifdef MAC - error = mac_check_mount_stat(td->td_proc->p_ucred, - vp->v_mount); + error = mac_check_mount_stat(td->td_ucred, vp->v_mount); if (error) return (error); #endif ==== //depot/projects/smpng/sys/conf/files#67 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.770 2003/03/11 19:26:15 sam Exp $ +# $FreeBSD: src/sys/conf/files,v 1.771 2003/03/18 09:53:03 phk Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -897,7 +897,6 @@ geom/geom_mirror.c optional geom_mirror geom/geom_pc98.c optional geom_pc98 geom/geom_slice.c standard -geom/geom_stats.c standard geom/geom_subr.c standard geom/geom_sunlabel.c optional geom_sunlabel geom/geom_vol_ffs.c optional geom_vol ==== //depot/projects/smpng/sys/conf/files.sparc64#25 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.sparc64,v 1.39 2003/02/28 21:59:13 ru Exp $ +# $FreeBSD: src/sys/conf/files.sparc64,v 1.40 2003/03/19 06:55:36 jake Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -36,6 +36,7 @@ sparc64/sparc64/autoconf.c standard sparc64/sparc64/bus_machdep.c standard sparc64/sparc64/cache.c standard +sparc64/sparc64/cheetah.c standard sparc64/sparc64/clock.c standard sparc64/sparc64/counter.c standard sparc64/sparc64/critical.c standard @@ -68,6 +69,7 @@ sparc64/sparc64/prof_machdep.c optional profiling-routine sparc64/sparc64/rwindow.c standard sparc64/sparc64/sparcbus_if.m standard +sparc64/sparc64/spitfire.c standard sparc64/sparc64/support.S standard sparc64/sparc64/sys_machdep.c standard sparc64/sparc64/swtch.S standard ==== //depot/projects/smpng/sys/contrib/dev/fla/fla.c#7 (text+ko) ==== @@ -6,12 +6,11 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/contrib/dev/fla/fla.c,v 1.37 2003/03/08 08:01:27 phk Exp $ + * $FreeBSD: src/sys/contrib/dev/fla/fla.c,v 1.38 2003/03/18 08:45:20 phk Exp $ * */ #include -#include #include #include #include ==== //depot/projects/smpng/sys/dev/ata/ata-all.c#32 (text+ko) ==== @@ -25,7 +25,7 @@ * (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/sys/dev/ata/ata-all.c,v 1.171 2003/03/12 10:59:35 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-all.c,v 1.172 2003/03/18 08:45:20 phk Exp $ */ #include "opt_ata.h" @@ -39,7 +39,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/smpng/sys/dev/ata/atapi-tape.c#17 (text+ko) ==== @@ -25,7 +25,7 @@ * (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/sys/dev/ata/atapi-tape.c,v 1.76 2003/03/15 10:50:43 phk Exp $ + * $FreeBSD: src/sys/dev/ata/atapi-tape.c,v 1.77 2003/03/18 08:45:20 phk Exp $ */ #include "opt_ata.h" @@ -40,7 +40,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/smpng/sys/dev/ccd/ccd.c#22 (text+ko) ==== @@ -50,7 +50,7 @@ * * $NetBSD: ccd.c,v 1.22 1995/12/08 19:13:26 thorpej Exp $ * - * $FreeBSD: src/sys/dev/ccd/ccd.c,v 1.130 2003/03/08 08:01:28 phk Exp $ + * $FreeBSD: src/sys/dev/ccd/ccd.c,v 1.131 2003/03/18 08:45:21 phk Exp $ */ #include @@ -63,7 +63,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/smpng/sys/dev/ciss/ciss.c#12 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ciss/ciss.c,v 1.18 2003/03/08 08:01:28 phk Exp $ + * $FreeBSD: src/sys/dev/ciss/ciss.c,v 1.19 2003/03/18 08:45:21 phk Exp $ */ /* @@ -75,7 +75,6 @@ #include #include #include -#include #include #include ==== //depot/projects/smpng/sys/dev/drm/drm_fops.h#4 (text+ko) ==== @@ -29,7 +29,7 @@ * Daryll Strauss * Gareth Hughes * - * $FreeBSD: src/sys/dev/drm/drm_fops.h,v 1.5 2003/03/09 02:08:28 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/drm_fops.h,v 1.6 2003/03/20 21:17:39 jhb Exp $ */ #include "dev/drm/drmP.h" @@ -37,7 +37,7 @@ drm_file_t *DRM(find_file_by_proc)(drm_device_t *dev, DRM_STRUCTPROC *p) { #if __FreeBSD_version >= 500021 - uid_t uid = p->td_proc->p_ucred->cr_svuid; + uid_t uid = p->td_ucred->cr_svuid; pid_t pid = p->td_proc->p_pid; #else uid_t uid = p->p_cred->p_svuid; @@ -75,7 +75,7 @@ priv = (drm_file_t *) DRM(alloc)(sizeof(*priv), DRM_MEM_FILES); bzero(priv, sizeof(*priv)); #if __FreeBSD_version >= 500000 - priv->uid = p->td_proc->p_ucred->cr_svuid; + priv->uid = p->td_ucred->cr_svuid; priv->pid = p->td_proc->p_pid; #else priv->uid = p->p_cred->p_svuid; ==== //depot/projects/smpng/sys/dev/fb/vga.c#11 (text+ko) ==== @@ -26,7 +26,7 @@ * (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/sys/dev/fb/vga.c,v 1.22 2003/02/25 03:21:19 mux Exp $ + * $FreeBSD: src/sys/dev/fb/vga.c,v 1.23 2003/03/18 08:45:21 phk Exp $ */ #include "opt_vga.h" @@ -40,7 +40,6 @@ #include #include #include -#include #include #include ==== //depot/projects/smpng/sys/dev/firewire/if_fwe.c#8 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/if_fwe.c,v 1.11 2003/03/06 05:06:44 simokawa Exp $ + * $FreeBSD: src/sys/dev/firewire/if_fwe.c,v 1.12 2003/03/19 07:04:11 simokawa Exp $ */ #include "opt_inet.h" @@ -310,6 +310,7 @@ fwe->pkt_hdr.mode.stream.chtag = fwe->stream_ch; /* allocate DMA channel and init packet mode */ xferq->flag |= FWXFERQ_OPEN | FWXFERQ_EXTBUF; + xferq->flag &= ~0xff; xferq->flag |= fwe->stream_ch & 0xff; /* register fwe_input handler */ xferq->sc = (caddr_t) fwe; ==== //depot/projects/smpng/sys/dev/ida/ida.c#7 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ida/ida.c,v 1.23 2003/03/08 08:01:28 phk Exp $ + * $FreeBSD: src/sys/dev/ida/ida.c,v 1.24 2003/03/18 08:45:21 phk Exp $ */ /* @@ -40,7 +40,6 @@ #include #include -#include #include #include ==== //depot/projects/smpng/sys/dev/iir/iir_pci.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/iir/iir_pci.c,v 1.5 2002/11/07 22:23:46 jhb Exp $ */ +/* $FreeBSD: src/sys/dev/iir/iir_pci.c,v 1.6 2003/03/18 08:45:21 phk Exp $ */ /* * Copyright (c) 2000-01 Intel Corporation * All Rights Reserved @@ -48,7 +48,6 @@ #include #include #include -#include #include #include ==== //depot/projects/smpng/sys/dev/md/md.c#30 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/dev/md/md.c,v 1.89 2003/03/08 08:01:28 phk Exp $ + * $FreeBSD: src/sys/dev/md/md.c,v 1.90 2003/03/18 08:45:21 phk Exp $ * */ @@ -76,7 +76,6 @@ #include #include #include -#include #include #include ==== //depot/projects/smpng/sys/dev/musycc/musycc.c#4 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/dev/musycc/musycc.c,v 1.25 2003/02/19 05:47:08 imp Exp $ + * $FreeBSD: src/sys/dev/musycc/musycc.c,v 1.26 2003/03/18 08:45:21 phk Exp $ * * * @@ -47,7 +47,6 @@ #include #include #include -#include #include #include >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Mar 21 18: 7: 6 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2487D37B401; Fri, 21 Mar 2003 18:06:43 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C7FB437B404 for ; Fri, 21 Mar 2003 18:06:42 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3704843F75 for ; Fri, 21 Mar 2003 18:06:41 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h2M26f0U039737 for ; Fri, 21 Mar 2003 18:06:41 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2M26csQ039713 for perforce@freebsd.org; Fri, 21 Mar 2003 18:06:38 -0800 (PST) Date: Fri, 21 Mar 2003 18:06:38 -0800 (PST) Message-Id: <200303220206.h2M26csQ039713@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 27206 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=27206 Change 27206 by marcel@marcel_vaio on 2003/03/21 18:05:54 IFC @27188 Affected files ... .. //depot/projects/ia64/bin/dd/args.c#6 integrate .. //depot/projects/ia64/bin/sh/expand.c#9 integrate .. //depot/projects/ia64/bin/sh/jobs.c#17 integrate .. //depot/projects/ia64/contrib/cvs/src/parseinfo.c#4 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/sysv4.h#7 integrate .. //depot/projects/ia64/contrib/gdtoa/README#2 integrate .. //depot/projects/ia64/contrib/gdtoa/g__fmt.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/gdtoaimp.h#2 integrate .. //depot/projects/ia64/contrib/gdtoa/strtod.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/strtodg.c#2 integrate .. //depot/projects/ia64/contrib/gdtoa/xsum0.out#2 integrate .. //depot/projects/ia64/contrib/isc-dhcp/client/dhclient.8#4 integrate .. //depot/projects/ia64/contrib/isc-dhcp/client/dhclient.c#6 integrate .. //depot/projects/ia64/contrib/one-true-awk/FIXES#5 integrate .. //depot/projects/ia64/contrib/one-true-awk/README#5 integrate .. //depot/projects/ia64/contrib/one-true-awk/b.c#5 integrate .. //depot/projects/ia64/contrib/one-true-awk/lib.c#3 integrate .. //depot/projects/ia64/contrib/one-true-awk/main.c#6 integrate .. //depot/projects/ia64/contrib/one-true-awk/makefile#5 integrate .. //depot/projects/ia64/contrib/one-true-awk/run.c#5 integrate .. //depot/projects/ia64/crypto/openssl/crypto/rsa/rsa_eay.c#6 integrate .. //depot/projects/ia64/crypto/openssl/crypto/rsa/rsa_lib.c#4 integrate .. //depot/projects/ia64/crypto/openssl/ssl/s3_srvr.c#5 integrate .. //depot/projects/ia64/etc/defaults/rc.conf#27 integrate .. //depot/projects/ia64/etc/rc.d/Makefile#9 integrate .. //depot/projects/ia64/etc/rc.d/kldxref#1 branch .. //depot/projects/ia64/games/fortune/datfiles/fortunes#27 integrate .. //depot/projects/ia64/games/fortune/datfiles/fortunes-o.real#4 integrate .. //depot/projects/ia64/games/fortune/datfiles/fortunes2-o#6 integrate .. //depot/projects/ia64/games/fortune/datfiles/murphy#3 integrate .. //depot/projects/ia64/games/fortune/datfiles/murphy-o#2 integrate .. //depot/projects/ia64/gnu/lib/libobjc/Makefile#5 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb/Makefile#9 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb/fbsd-kgdb.h#3 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb/kvm-fbsd.c#7 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb/solib-fbsd-kld.c#1 branch .. //depot/projects/ia64/gnu/usr.bin/send-pr/send-pr.sh#4 integrate .. //depot/projects/ia64/lib/libc/gen/getgrent.c#4 integrate .. //depot/projects/ia64/lib/libc/gen/getusershell.c#3 integrate .. //depot/projects/ia64/lib/libc/locale/lnumeric.c#5 integrate .. //depot/projects/ia64/lib/libc/locale/setlocale.3#5 integrate .. //depot/projects/ia64/lib/libc/stdlib/strfmon.c#9 integrate .. //depot/projects/ia64/lib/libc/stdlib/strtod.c#14 delete .. //depot/projects/ia64/lib/libdevstat/Makefile#3 integrate .. //depot/projects/ia64/lib/libdevstat/devstat.3#3 integrate .. //depot/projects/ia64/lib/libdevstat/devstat.c#4 integrate .. //depot/projects/ia64/lib/libdevstat/devstat.h#2 integrate .. //depot/projects/ia64/lib/libdisk/disk.c#16 integrate .. //depot/projects/ia64/lib/libfetch/ftp.c#11 integrate .. //depot/projects/ia64/lib/libgeom/geom_stats.c#3 integrate .. //depot/projects/ia64/lib/libgeom/geom_xml2tree.c#2 integrate .. //depot/projects/ia64/lib/libgeom/libgeom.h#3 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_rwlock.c#3 integrate .. //depot/projects/ia64/lib/libutil/pw_util.c#5 integrate .. //depot/projects/ia64/libexec/rpc.rstatd/rstat_proc.c#7 integrate .. //depot/projects/ia64/libexec/rtld-elf/ia64/reloc.c#10 integrate .. //depot/projects/ia64/libexec/tftpd/tftpd.c#7 integrate .. //depot/projects/ia64/release/Makefile#42 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/errata/article.sgml#14 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#75 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/errata/article.sgml#9 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#9 integrate .. //depot/projects/ia64/release/i386/drivers.conf#15 integrate .. //depot/projects/ia64/release/ia64/doFS.sh#2 integrate .. //depot/projects/ia64/release/pc98/drivers.conf#8 integrate .. //depot/projects/ia64/release/scripts/doFS.sh#10 integrate .. //depot/projects/ia64/sbin/camcontrol/modeedit.c#5 integrate .. //depot/projects/ia64/sbin/disklabel/disklabel.8#14 integrate .. //depot/projects/ia64/sbin/disklabel/disklabel.c#24 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw.8#19 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw2.c#13 integrate .. //depot/projects/ia64/sbin/vinum/commands.c#5 integrate .. //depot/projects/ia64/sbin/vinum/list.c#5 integrate .. //depot/projects/ia64/share/man/man5/rc.conf.5#29 integrate .. //depot/projects/ia64/share/man/man7/release.7#17 integrate .. //depot/projects/ia64/share/man/man9/ifnet.9#6 integrate .. //depot/projects/ia64/share/mk/bsd.libnames.mk#14 integrate .. //depot/projects/ia64/sys/alpha/alpha/busdma_machdep.c#11 integrate .. //depot/projects/ia64/sys/alpha/include/pmap.h#7 integrate .. //depot/projects/ia64/sys/alpha/linux/linux_sysvec.c#8 integrate .. //depot/projects/ia64/sys/alpha/osf1/imgact_osf1.c#10 integrate .. //depot/projects/ia64/sys/alpha/osf1/osf1_mount.c#7 integrate .. //depot/projects/ia64/sys/cam/cam_periph.c#8 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_cd.c#15 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_da.c#37 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_pt.c#5 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_sa.c#11 integrate .. //depot/projects/ia64/sys/compat/linux/linux_file.c#13 integrate .. //depot/projects/ia64/sys/compat/linux/linux_getcwd.c#9 integrate .. //depot/projects/ia64/sys/compat/linux/linux_stats.c#10 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_sysvec.c#11 integrate .. //depot/projects/ia64/sys/conf/files#69 integrate .. //depot/projects/ia64/sys/conf/files.sparc64#27 integrate .. //depot/projects/ia64/sys/contrib/dev/fla/fla.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/oltr/if_oltr.c#6 integrate .. //depot/projects/ia64/sys/dev/ata/ata-all.c#32 integrate .. //depot/projects/ia64/sys/dev/ata/ata-chipset.c#6 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-cd.c#23 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-tape.c#12 integrate .. //depot/projects/ia64/sys/dev/awi/if_awi_pccard.c#5 integrate .. //depot/projects/ia64/sys/dev/ccd/ccd.c#20 integrate .. //depot/projects/ia64/sys/dev/ciss/ciss.c#16 integrate .. //depot/projects/ia64/sys/dev/drm/drm_fops.h#4 integrate .. //depot/projects/ia64/sys/dev/em/LICENSE#2 integrate .. //depot/projects/ia64/sys/dev/em/README#6 integrate .. //depot/projects/ia64/sys/dev/em/if_em.c#18 integrate .. //depot/projects/ia64/sys/dev/em/if_em.h#12 integrate .. //depot/projects/ia64/sys/dev/em/if_em_hw.c#7 integrate .. //depot/projects/ia64/sys/dev/em/if_em_hw.h#8 integrate .. //depot/projects/ia64/sys/dev/em/if_em_osdep.h#10 integrate .. //depot/projects/ia64/sys/dev/fb/vga.c#9 integrate .. //depot/projects/ia64/sys/dev/firewire/if_fwe.c#11 integrate .. //depot/projects/ia64/sys/dev/ida/ida.c#7 integrate .. //depot/projects/ia64/sys/dev/iir/iir_pci.c#5 integrate .. //depot/projects/ia64/sys/dev/md/md.c#24 integrate .. //depot/projects/ia64/sys/dev/musycc/musycc.c#5 integrate .. //depot/projects/ia64/sys/dev/pccard/pccard.c#16 integrate .. //depot/projects/ia64/sys/dev/pccard/pccard_cis.c#8 integrate .. //depot/projects/ia64/sys/dev/pccard/pccarddevs#21 integrate .. //depot/projects/ia64/sys/dev/pccard/pccarddevs.h#21 integrate .. //depot/projects/ia64/sys/dev/pdq/pdq_freebsd.h#5 integrate .. //depot/projects/ia64/sys/dev/pdq/pdq_ifsubr.c#8 integrate .. //depot/projects/ia64/sys/dev/puc/puc.c#16 integrate .. //depot/projects/ia64/sys/dev/puc/pucdata.c#11 integrate .. //depot/projects/ia64/sys/dev/puc/pucvar.h#10 integrate .. //depot/projects/ia64/sys/dev/raidframe/rf_threadstuff.h#2 integrate .. //depot/projects/ia64/sys/dev/sio/sio.c#39 integrate .. //depot/projects/ia64/sys/dev/sio/sioreg.h#7 integrate .. //depot/projects/ia64/sys/dev/sound/pci/via8233.c#4 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/ac97.c#15 integrate .. //depot/projects/ia64/sys/dev/twe/twe_compat.h#5 integrate .. //depot/projects/ia64/sys/dev/twe/twe_freebsd.c#14 integrate .. //depot/projects/ia64/sys/dev/ubsec/ubsec.c#14 integrate .. //depot/projects/ia64/sys/dev/usb/if_cue.c#10 integrate .. //depot/projects/ia64/sys/dev/usb/udbp.c#7 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi.c#34 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi_pccard.c#14 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi_pci.c#9 integrate .. //depot/projects/ia64/sys/dev/wi/if_wivar.h#13 integrate .. //depot/projects/ia64/sys/fs/udf/udf_vnops.c#17 integrate .. //depot/projects/ia64/sys/geom/bde/g_bde.c#7 integrate .. //depot/projects/ia64/sys/geom/bde/g_bde_crypt.c#9 integrate .. //depot/projects/ia64/sys/geom/bde/g_bde_lock.c#7 integrate .. //depot/projects/ia64/sys/geom/bde/g_bde_work.c#6 integrate .. //depot/projects/ia64/sys/geom/geom.h#23 integrate .. //depot/projects/ia64/sys/geom/geom_bsd.c#26 integrate .. //depot/projects/ia64/sys/geom/geom_ctl.c#5 integrate .. //depot/projects/ia64/sys/geom/geom_dev.c#31 integrate .. //depot/projects/ia64/sys/geom/geom_disk.c#27 integrate .. //depot/projects/ia64/sys/geom/geom_dump.c#16 integrate .. //depot/projects/ia64/sys/geom/geom_event.c#14 integrate .. //depot/projects/ia64/sys/geom/geom_int.h#9 integrate .. //depot/projects/ia64/sys/geom/geom_io.c#21 integrate .. //depot/projects/ia64/sys/geom/geom_kern.c#15 integrate .. //depot/projects/ia64/sys/geom/geom_slice.c#22 integrate .. //depot/projects/ia64/sys/geom/geom_stats.c#6 delete .. //depot/projects/ia64/sys/geom/geom_stats.h#3 delete .. //depot/projects/ia64/sys/geom/geom_subr.c#22 integrate .. //depot/projects/ia64/sys/i386/i386/busdma_machdep.c#12 integrate .. //depot/projects/ia64/sys/i386/i386/identcpu.c#16 integrate .. //depot/projects/ia64/sys/i386/i386/initcpu.c#10 integrate .. //depot/projects/ia64/sys/i386/i386/tsc.c#2 integrate .. //depot/projects/ia64/sys/i386/include/apic.h#4 integrate .. //depot/projects/ia64/sys/i386/include/pmap.h#10 integrate .. //depot/projects/ia64/sys/i386/isa/clock.c#14 integrate .. //depot/projects/ia64/sys/i386/isa/if_le.c#9 integrate .. //depot/projects/ia64/sys/i386/linux/linux_machdep.c#12 integrate .. //depot/projects/ia64/sys/i386/linux/linux_sysvec.c#20 integrate .. //depot/projects/ia64/sys/ia64/ia64/busdma_machdep.c#10 integrate .. //depot/projects/ia64/sys/ia64/include/pmap.h#11 integrate .. //depot/projects/ia64/sys/isa/fd.c#14 integrate .. //depot/projects/ia64/sys/kern/kern_exit.c#37 integrate .. //depot/projects/ia64/sys/kern/kern_lockf.c#10 integrate .. //depot/projects/ia64/sys/kern/kern_mutex.c#21 integrate .. //depot/projects/ia64/sys/kern/kern_switch.c#22 integrate .. //depot/projects/ia64/sys/kern/kern_synch.c#29 integrate .. //depot/projects/ia64/sys/kern/kern_tc.c#21 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#33 integrate .. //depot/projects/ia64/sys/kern/subr_devstat.c#5 integrate .. //depot/projects/ia64/sys/kern/subr_disk.c#14 integrate .. //depot/projects/ia64/sys/kern/subr_prf.c#22 integrate .. //depot/projects/ia64/sys/kern/sys_process.c#17 integrate .. //depot/projects/ia64/sys/kern/uipc_cow.c#7 integrate .. //depot/projects/ia64/sys/kern/uipc_sem.c#7 integrate .. //depot/projects/ia64/sys/kern/uipc_syscalls.c#29 integrate .. //depot/projects/ia64/sys/kern/vfs_bio.c#44 integrate .. //depot/projects/ia64/sys/kern/vfs_cache.c#13 integrate .. //depot/projects/ia64/sys/kern/vfs_cluster.c#18 integrate .. //depot/projects/ia64/sys/modules/oltr/Makefile#4 integrate .. //depot/projects/ia64/sys/net/bpf.c#20 integrate .. //depot/projects/ia64/sys/net/if.c#22 integrate .. //depot/projects/ia64/sys/net/if_arp.h#2 integrate .. //depot/projects/ia64/sys/net/if_ethersubr.c#26 integrate .. //depot/projects/ia64/sys/net/if_fddisubr.c#12 integrate .. //depot/projects/ia64/sys/net/if_iso88025subr.c#11 integrate .. //depot/projects/ia64/sys/net/iso88025.h#5 integrate .. //depot/projects/ia64/sys/netatalk/aarp.c#7 integrate .. //depot/projects/ia64/sys/netinet/ip.h#4 integrate .. //depot/projects/ia64/sys/netinet/ip_icmp.c#13 integrate .. //depot/projects/ia64/sys/netinet/ip_icmp.h#4 integrate .. //depot/projects/ia64/sys/netncp/ncp_conn.c#7 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_vnops.c#17 integrate .. //depot/projects/ia64/sys/pc98/pc98/clock.c#13 integrate .. //depot/projects/ia64/sys/pc98/pc98/fd.c#17 integrate .. //depot/projects/ia64/sys/pci/if_dc.c#28 integrate .. //depot/projects/ia64/sys/pci/if_de.c#9 integrate .. //depot/projects/ia64/sys/pci/if_rl.c#25 integrate .. //depot/projects/ia64/sys/pci/if_rlreg.h#9 integrate .. //depot/projects/ia64/sys/pci/if_xl.c#24 integrate .. //depot/projects/ia64/sys/pci/if_xlreg.h#10 integrate .. //depot/projects/ia64/sys/powerpc/include/pmap.h#6 integrate .. //depot/projects/ia64/sys/powerpc/powermac/macio.c#7 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/busdma_machdep.c#8 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/fpu.c#2 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/genassym.c#10 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/machdep.c#22 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/swtch.S#2 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/trap.c#23 integrate .. //depot/projects/ia64/sys/security/mac_portacl/mac_portacl.c#3 integrate .. //depot/projects/ia64/sys/sparc64/include/cache.h#5 integrate .. //depot/projects/ia64/sys/sparc64/include/pcpu.h#6 integrate .. //depot/projects/ia64/sys/sparc64/include/pmap.h#15 integrate .. //depot/projects/ia64/sys/sparc64/include/smp.h#9 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/bus_machdep.c#13 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/cache.c#10 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/cheetah.c#1 branch .. //depot/projects/ia64/sys/sparc64/sparc64/db_trace.c#7 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/identcpu.c#7 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/locore.S#4 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/machdep.c#30 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/mem.c#6 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/mp_exception.S#3 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/mp_machdep.c#14 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/pmap.c#32 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/spitfire.c#1 branch .. //depot/projects/ia64/sys/sparc64/sparc64/tick.c#9 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/vm_machdep.c#20 integrate .. //depot/projects/ia64/sys/sys/devicestat.h#4 integrate .. //depot/projects/ia64/sys/sys/kse.h#8 integrate .. //depot/projects/ia64/sys/sys/param.h#28 integrate .. //depot/projects/ia64/sys/sys/proc.h#52 integrate .. //depot/projects/ia64/sys/sys/stat.h#12 integrate .. //depot/projects/ia64/sys/sys/systm.h#25 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_alloc.c#20 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_snapshot.c#25 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_softdep.c#27 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_subr.c#7 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_vfsops.c#32 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_extattr.c#15 integrate .. //depot/projects/ia64/sys/vm/pmap.h#14 integrate .. //depot/projects/ia64/sys/vm/vm_map.c#46 integrate .. //depot/projects/ia64/sys/vm/vm_object.c#40 integrate .. //depot/projects/ia64/sys/vm/vm_page.c#40 integrate .. //depot/projects/ia64/sys/vm/vnode_pager.c#28 integrate .. //depot/projects/ia64/tools/KSE/rr/rr.c#2 integrate .. //depot/projects/ia64/tools/tools/crypto/Makefile#4 integrate .. //depot/projects/ia64/tools/tools/crypto/cryptostats.c#2 integrate .. //depot/projects/ia64/tools/tools/crypto/hifnstats.c#1 branch .. //depot/projects/ia64/tools/tools/crypto/ipsecstats.c#1 branch .. //depot/projects/ia64/usr.bin/awk/Makefile#7 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.birthday#7 integrate .. //depot/projects/ia64/usr.bin/systat/iostat.c#5 integrate .. //depot/projects/ia64/usr.bin/systat/vmstat.c#8 integrate .. //depot/projects/ia64/usr.bin/uudecode/uudecode.c#15 integrate .. //depot/projects/ia64/usr.bin/uuencode/uuencode.1#9 integrate .. //depot/projects/ia64/usr.bin/uuidgen/uuidgen.1#6 integrate .. //depot/projects/ia64/usr.bin/uuidgen/uuidgen.c#7 integrate .. //depot/projects/ia64/usr.bin/vmstat/vmstat.c#12 integrate .. //depot/projects/ia64/usr.sbin/Makefile#34 integrate .. //depot/projects/ia64/usr.sbin/adduser/adduser.8#10 integrate .. //depot/projects/ia64/usr.sbin/adduser/adduser.sh#6 integrate .. //depot/projects/ia64/usr.sbin/gstat/Makefile#1 branch .. //depot/projects/ia64/usr.sbin/gstat/gstat.c#1 branch .. //depot/projects/ia64/usr.sbin/iostat/iostat.c#4 integrate .. //depot/projects/ia64/usr.sbin/jail/jail.8#8 integrate .. //depot/projects/ia64/usr.sbin/mtree/mtree.c#4 integrate .. //depot/projects/ia64/usr.sbin/ypserv/Makefile.yp#3 integrate Differences ... ==== //depot/projects/ia64/bin/dd/args.c#6 (text+ko) ==== @@ -41,7 +41,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/dd/args.c,v 1.34 2003/02/27 18:04:54 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/dd/args.c,v 1.36 2003/03/15 13:34:48 ru Exp $"); #include @@ -189,7 +189,7 @@ res = get_num(arg); if (res < 1 || res > SSIZE_MAX) - errx(1, "bs must be between 1 and %d", SSIZE_MAX); + errx(1, "bs must be between 1 and %jd", (intmax_t)SSIZE_MAX); in.dbsz = out.dbsz = (size_t)res; } @@ -200,7 +200,7 @@ res = get_num(arg); if (res < 1 || res > SSIZE_MAX) - errx(1, "cbs must be between 1 and %d", SSIZE_MAX); + errx(1, "cbs must be between 1 and %jd", (intmax_t)SSIZE_MAX); cbsz = (size_t)res; } @@ -235,7 +235,8 @@ if (!(ddflags & C_BS)) { res = get_num(arg); if (res < 1 || res > SSIZE_MAX) - errx(1, "ibs must be between 1 and %zd", SSIZE_MAX); + errx(1, "ibs must be between 1 and %jd", + (intmax_t)SSIZE_MAX); in.dbsz = (size_t)res; } } @@ -255,7 +256,8 @@ if (!(ddflags & C_BS)) { res = get_num(arg); if (res < 1 || res > SSIZE_MAX) - errx(1, "obs must be between 1 and %zd", SSIZE_MAX); + errx(1, "obs must be between 1 and %jd", + (intmax_t)SSIZE_MAX); out.dbsz = (size_t)res; } } ==== //depot/projects/ia64/bin/sh/expand.c#9 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.41 2003/01/08 10:50:08 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.42 2003/03/15 07:56:59 ru Exp $"); #include #include @@ -531,7 +531,7 @@ outfmt(&errout, "%s\n", startp); error((char *)NULL); } - error("%.*s: parameter %snot set", p - str - 1, + error("%.*s: parameter %snot set", (int)(p - str - 1), str, (varflags & VSNUL) ? "null or " : nullstr); return 0; @@ -666,7 +666,8 @@ case VSTRIMRIGHT: case VSTRIMRIGHTMAX: case VSLENGTH: - error("%.*s: parameter not set", p - var - 1, var); + error("%.*s: parameter not set", (int)(p - var - 1), + var); } } if (set && subtype != VSPLUS) { ==== //depot/projects/ia64/bin/sh/jobs.c#17 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.62 2003/01/27 07:41:12 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.63 2003/03/17 11:28:56 tjr Exp $"); #include #include @@ -740,6 +740,7 @@ TRACE(("forkshell(%%%d, 0x%lx, %d) called\n", jp - jobtab, (long)n, mode)); INTOFF; + flushall(); pid = fork(); if (pid == -1) { TRACE(("Fork failed, errno=%d\n", errno)); ==== //depot/projects/ia64/contrib/cvs/src/parseinfo.c#4 (text+ko) ==== @@ -4,6 +4,8 @@ * * You may distribute under the terms of the GNU General Public License as * specified in the README file that comes with the CVS source distribution. + * + * $FreeBSD: src/contrib/cvs/src/parseinfo.c,v 1.2 2003/03/20 11:05:48 des Exp $ */ #include "cvs.h" @@ -340,6 +342,25 @@ goto error_return; } } + else if (strcmp (line, "tag") == 0) { + RCS_setlocalid(p); + } + else if (strcmp (line, "umask") == 0) { + cvsumask = (mode_t)(strtol(p, NULL, 8) & 0777); + } + else if (strcmp (line, "dlimit") == 0) { +#ifdef BSD +#include + struct rlimit rl; + + if (getrlimit(RLIMIT_DATA, &rl) != -1) { + rl.rlim_cur = atoi(p); + rl.rlim_cur *= 1024; + + (void) setrlimit(RLIMIT_DATA, &rl); + } +#endif /* BSD */ + } else if (strcmp (line, "PreservePermissions") == 0) { if (strcmp (p, "no") == 0) ==== //depot/projects/ia64/contrib/gcc/config/rs6000/sysv4.h#7 (text+ko) ==== @@ -20,8 +20,6 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/gcc/config/rs6000/sysv4.h,v 1.5 2003/02/10 06:05:38 kan Exp $ */ - /* Yes! We are ELF. */ #define TARGET_OBJECT_FORMAT OBJECT_ELF @@ -1209,7 +1207,7 @@ /* FreeBSD support. */ #define CPP_OS_FREEBSD_SPEC "\ - -D__PPC__ -D__ppc__ -D__PowerPC__ -D__powerpc__ -D__ELF__ \ + -D__PPC__ -D__ppc__ -D__PowerPC__ -D__powerpc__ \ -Acpu=powerpc -Amachine=powerpc" #define STARTFILE_FREEBSD_SPEC FBSD_STARTFILE_SPEC ==== //depot/projects/ia64/contrib/gdtoa/README#2 (text+ko) ==== @@ -313,6 +313,10 @@ exponent = fpi->emin. Strtodg provides distinct return values for normals and denormals; see gdtoa.h. +Compiling g__fmt.c, strtod.c, and strtodg.c with -DUSE_LOCALE causes +the decimal-point character to be taken from the current locale; otherwise +it is '.'. + Please send comments to David M. Gay ==== //depot/projects/ia64/contrib/gdtoa/g__fmt.c#2 (text+ko) ==== @@ -37,6 +37,10 @@ #include "gdtoaimp.h" +#ifdef USE_LOCALE +#include "locale.h" +#endif + char * #ifdef KR_headers g__fmt(b, s, se, decpt, sign) char *b; char *s; char *se; int decpt; ULong sign; @@ -46,13 +50,17 @@ { int i, j, k; char *s0 = s; - +#ifdef USE_LOCALE + char decimalpoint = *localeconv()->decimal_point; +#else +#define decimalpoint '.' +#endif if (sign) *b++ = '-'; if (decpt <= -4 || decpt > se - s + 5) { *b++ = *s++; if (*s) { - *b++ = '.'; + *b++ = decimalpoint; while((*b = *s++) !=0) b++; } @@ -76,7 +84,7 @@ *b = 0; } else if (decpt <= 0) { - *b++ = '.'; + *b++ = decimalpoint; for(; decpt < 0; decpt++) *b++ = '0'; while((*b = *s++) !=0) @@ -86,7 +94,7 @@ while((*b = *s++) !=0) { b++; if (--decpt == 0 && *s) - *b++ = '.'; + *b++ = decimalpoint; } for(; decpt > 0; decpt--) *b++ = '0'; ==== //depot/projects/ia64/contrib/gdtoa/gdtoaimp.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ ****************************************************************/ -/* $FreeBSD: src/contrib/gdtoa/gdtoaimp.h,v 1.2 2003/03/12 20:20:22 das Exp $ */ +/* $FreeBSD: src/contrib/gdtoa/gdtoaimp.h,v 1.3 2003/03/19 20:25:45 das Exp $ */ /* This is a variation on dtoa.c that converts arbitary binary floating-point formats to and from decimal notation. It uses @@ -203,6 +203,7 @@ #endif #define INFNAN_CHECK +#define USE_LOCALE #undef IEEE_Arith #undef Avoid_Underflow ==== //depot/projects/ia64/contrib/gdtoa/strtod.c#2 (text+ko) ==== @@ -85,9 +85,6 @@ #ifdef Honor_FLT_ROUNDS int rounding; #endif -#ifdef USE_LOCALE - CONST char *s2; -#endif sign = nz0 = nz = 0; dval(rv) = 0.; @@ -150,25 +147,11 @@ z = 10*z + c - '0'; nd0 = nd; #ifdef USE_LOCALE - s1 = localeconv()->decimal_point; - if (c == *s1) { - c = '.'; - if (*++s1) { - s2 = s; - for(;;) { - if (*++s2 != *s1) { - c = 0; - break; - } - if (!*++s1) { - s = s2; - break; - } - } - } - } + if (c == *localeconv()->decimal_point) +#else + if (c == '.') #endif - if (c == '.') { + { c = *++s; if (!nd) { for(; c == '0'; c = *++s) ==== //depot/projects/ia64/contrib/gdtoa/strtodg.c#2 (text+ko) ==== @@ -59,9 +59,6 @@ { ULong *x, *xe; Bigint *b1; -#ifdef USE_LOCALE - CONST char *s2; -#endif #ifdef Pack_16 ULong carry = 1, y; #endif @@ -399,25 +396,11 @@ z = 10*z + c - '0'; nd0 = nd; #ifdef USE_LOCALE - s1 = localeconv()->decimal_point; - if (c == *s1) { - c = '.'; - if (*++s1) { - s2 = s; - for(;;) { - if (*++s2 != *s1) { - c = 0; - break; - } - if (!*++s1) { - s = s2; - break; - } - } - } - } + if (c == *localeconv()->decimal_point) +#else + if (c == '.') #endif - if (c == '.') { + { c = *++s; if (!nd) { for(; c == '0'; c = *++s) ==== //depot/projects/ia64/contrib/gdtoa/xsum0.out#2 (text+ko) ==== @@ -1,9 +1,9 @@ -README 10a65619 13093 +README 7150e50 13249 arithchk.c e37b8a75 4070 dmisc.c e8d262b6 4712 dtoa.c f3c132b3 16905 g_Qfmt.c e5847e9 2870 -g__fmt.c f2d66617 2355 +g__fmt.c e29d67f1 2534 g_ddfmt.c fcf94527 3790 g_dfmt.c f30e55a9 2533 g_ffmt.c 7c4ea96 2459 @@ -12,7 +12,7 @@ gdtoa.c 364a0d2 17017 gdtoa.h 1eb440de 4810 gdtoaimp.h 6a955ba 19106 -gethex.c f56c1968 5041 +gethex.c ff3c434d 4981 gmisc.c e1a268ea 2114 hd_init.c cf9a94e 1827 hexnan.c f53be1da 2988 @@ -26,9 +26,9 @@ strtoIg.c ec59c2fa 3484 strtoIx.c 8f8c9d 1990 strtoIxL.c 1313ff7f 1961 -strtod.c 1390a957 20277 +strtod.c 1ad667 20076 strtodI.c e58338e0 4062 -strtodg.c 1cba0060 19769 +strtodg.c 1caf3fa4 19553 strtof.c 1e7a787a 2202 strtopQ.c e232c542 2685 strtopd.c e865dc64 1701 ==== //depot/projects/ia64/contrib/isc-dhcp/client/dhclient.8#4 (text+ko) ==== @@ -20,7 +20,7 @@ .\" .\" Portions copyright (c) 2000 David E. O'Brien. .\" All rights reserved. -.\" $FreeBSD: src/contrib/isc-dhcp/client/dhclient.8,v 1.12 2003/01/16 07:28:12 obrien Exp $ +.\" $FreeBSD: src/contrib/isc-dhcp/client/dhclient.8,v 1.13 2003/03/18 19:46:55 obrien Exp $ .\" .TH dhclient 8 .SH NAME @@ -41,6 +41,9 @@ .B -q ] [ +.B -v +] +[ .B -1 ] [ @@ -204,6 +207,10 @@ .B -q flag prevents any messages other than errors from being printed to the standard error descriptor. +.B -v +flag turns on all messages. +Opposite of +.B -q . .PP The client normally doesn't release the current lease as it is not required by the DHCP protocol. Some cable ISPs require their clients ==== //depot/projects/ia64/contrib/isc-dhcp/client/dhclient.c#6 (text+ko) ==== @@ -42,7 +42,7 @@ #ifndef lint static char ocopyright[] = "$Id: dhclient.c,v 1.129.2.12 2002/11/07 23:26:38 dhankins Exp $ Copyright (c) 1995-2002 Internet Software Consortium. All rights reserved.\n" -"$FreeBSD: src/contrib/isc-dhcp/client/dhclient.c,v 1.23 2003/01/15 10:44:05 murray Exp $\n"; +"$FreeBSD: src/contrib/isc-dhcp/client/dhclient.c,v 1.24 2003/03/18 19:46:55 obrien Exp $\n"; #endif /* not lint */ #include "dhcpd.h" @@ -185,6 +185,9 @@ } else if (!strcmp (argv [i], "-q")) { quiet = 1; quiet_interface_discovery = 1; + } else if (!strcmp (argv [i], "-v")) { + quiet = 0; + quiet_interface_discovery = 0; } else if (!strcmp (argv [i], "-s")) { if (++i == argc) usage (); ==== //depot/projects/ia64/contrib/one-true-awk/FIXES#5 (text+ko) ==== @@ -25,6 +25,21 @@ This file lists all bug fixes, changes, etc., made since the AWK book was sent to the printers in August, 1987. +Mar 14, 2003: + the internationalization changes, somewhat modified, are now + reinstated. in theory awk will now do character comparisons + and case conversions in national language, but "." will always + be the decimal point separator on input and output regardless + of national language. isblank(){} has an #ifndef. + + this no longer compiles on windows: LC_MESSAGES isn't defined + in vc6++. + + fixed subtle behavior in field and record splitting: if FS is + a single character and RS is not empty, \n is NOT a separator. + this tortuous reading is found in the awk book; behavior now + matches gawk and mawk. + 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, ==== //depot/projects/ia64/contrib/one-true-awk/README#5 (text+ko) ==== @@ -72,8 +72,14 @@ *if* you provide versions of popen and pclose. The file missing95.c contains versions that can be used to get started with, though the underlying support has mysterious properties, -the symptom of which can be truncated pipe output. Beware. -The file makefile.win gives hints on how to proceed. +the symptom of which can be truncated pipe output. Beware. The +file makefile.win gives hints on how to proceed; if you run +vcvars32.bat, it will set up necessary paths and parameters so +you can subsequently run nmake -f makefile.win. Beware also that +when running on Windows under command.com, various quoting +conventions are different from Unix systems: single quotes won't +work around arguments, and various characters like % are +interpreted within double quotes. This compiles without change on Macintosh OS X using gcc and the standard developer tools. ==== //depot/projects/ia64/contrib/one-true-awk/b.c#5 (text+ko) ==== @@ -282,9 +282,24 @@ 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; @@ -303,15 +318,18 @@ c2 = *p++; if (c2 == '\\') c2 = quoted((char **) &p); - if (c > c2) { /* empty; ignore */ + if (collate_range_cmp(c, c2) > 0) { /* empty; ignore */ bp--; i--; continue; } - while (c < c2) { + for (j = 0; j < NCHARS; j++) { + if ((collate_range_cmp(c, j) > 0) || + collate_range_cmp(j, c2) > 0) + continue; if (!adjbuf((char **) &buf, &bufsz, bp-buf+2, 100, (char **) &bp, 0)) FATAL("out of space for character class [%.10s...] 2", p); - *bp++ = ++c; + *bp++ = j; i++; } continue; @@ -695,23 +713,39 @@ * relex(), the expanded character class (prior to range expansion) * must be less than twice the size of their full name. */ + +/* Because isblank doesn't show up in any of the header files on any + * system i use, it's defined here. if some other locale has a richer + * definition of "blank", define HAS_ISBLANK and provide your own + * version. + */ + +#ifndef HAS_ISBLANK + +int isblank(int c) +{ + return c==' ' || c=='\t'; +} + +#endif + struct charclass { const char *cc_name; int cc_namelen; - const char *cc_expand; + int (*cc_func)(int); } charclasses[] = { - { "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" }, + { "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 }, { NULL, 0, NULL }, }; @@ -724,7 +758,7 @@ static int bufsz = 100; uschar *bp; struct charclass *cc; - const uschar *p; + int i; switch (c = *prestr++) { case '|': return OR; @@ -773,8 +807,14 @@ if (cc->cc_name != NULL && prestr[1 + cc->cc_namelen] == ':' && prestr[2 + cc->cc_namelen] == ']') { prestr += cc->cc_namelen + 3; - for (p = (const uschar *) cc->cc_expand; *p; p++) - *bp++ = *p; + 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++; + } + } } else *bp++ = c; } else if (c == '\0') { ==== //depot/projects/ia64/contrib/one-true-awk/lib.c#3 (text+ko) ==== @@ -308,6 +308,13 @@ } *fr = 0; } else if (*r != 0) { /* if 0, it's a null field */ + /* subtlecase : if length(FS) == 1 && length(RS > 0) + * \n is NOT a field separator (cf awk book 61,84). + * this variable is tested in the inner while loop. + */ + int rtest = '\n'; /* normal case */ + if (strlen(*RS) > 0) + rtest = '\0'; for (;;) { i++; if (i > nfields) @@ -316,7 +323,7 @@ xfree(fldtab[i]->sval); fldtab[i]->sval = fr; fldtab[i]->tval = FLD | STR | DONTFREE; - while (*r != sep && *r != '\n' && *r != '\0') /* \n is always a separator */ + while (*r != sep && *r != rtest && *r != '\0') /* \n is always a separator */ *fr++ = *r++; *fr++ = 0; if (*r++ == 0) ==== //depot/projects/ia64/contrib/one-true-awk/main.c#6 (text+ko) ==== @@ -22,11 +22,12 @@ THIS SOFTWARE. ****************************************************************/ -const char *version = "version 20021213"; +const char *version = "version 20030314"; #define DEBUG #include #include +#include #include #include #include @@ -54,6 +55,10 @@ { const char *fs = NULL; + setlocale(LC_ALL, ""); + setlocale(LC_COLLATE, ""); + setlocale(LC_CTYPE, ""); + setlocale(LC_MESSAGES, ""); 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/makefile#5 (text+ko) ==== @@ -45,7 +45,7 @@ lib.c run.c tran.c missing95.c SHIP = README FIXES $(SOURCE) ytab[ch].bak makefile makefile.win \ - buildwin.bat mac.code awk.1 + vcvars32.bat buildwin.bat mac.code awk.1 a.out: ytab.o $(OFILES) $(CC) $(CFLAGS) ytab.o $(OFILES) $(ALLOC) -lm ==== //depot/projects/ia64/contrib/one-true-awk/run.c#5 (text+ko) ==== @@ -1509,11 +1509,11 @@ if (t == FTOUPPER) { for (p = buf; *p; p++) if (islower((uschar) *p)) - *p = toupper(*p); + *p = toupper((uschar)*p); } else { for (p = buf; *p; p++) if (isupper((uschar) *p)) - *p = tolower(*p); + *p = tolower((uschar)*p); } tempfree(x); x = gettemp(); ==== //depot/projects/ia64/crypto/openssl/crypto/rsa/rsa_eay.c#6 (text+ko) ==== @@ -195,6 +195,25 @@ return(r); } +static int rsa_eay_blinding(RSA *rsa, BN_CTX *ctx) + { + int ret = 1; + CRYPTO_w_lock(CRYPTO_LOCK_RSA); + /* Check again inside the lock - the macro's check is racey */ + if(rsa->blinding == NULL) + ret = RSA_blinding_on(rsa, ctx); + CRYPTO_w_unlock(CRYPTO_LOCK_RSA); + return ret; + } + +#define BLINDING_HELPER(rsa, ctx, err_instr) \ + do { \ + if(((rsa)->flags & RSA_FLAG_BLINDING) && \ + ((rsa)->blinding == NULL) && \ + !rsa_eay_blinding(rsa, ctx)) \ + err_instr \ + } while(0) + /* signing */ static int RSA_eay_private_encrypt(int flen, const unsigned char *from, unsigned char *to, RSA *rsa, int padding) @@ -239,8 +258,8 @@ goto err; } - if ((rsa->flags & RSA_FLAG_BLINDING) && (rsa->blinding == NULL)) - RSA_blinding_on(rsa,ctx); >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Mar 21 18:13:53 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 736E037B404; Fri, 21 Mar 2003 18:13:51 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 271BF37B401 for ; Fri, 21 Mar 2003 18:13:51 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 77A4543FA3 for ; Fri, 21 Mar 2003 18:13:50 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h2M2Do0U042531 for ; Fri, 21 Mar 2003 18:13:50 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2M2DoSY042528 for perforce@freebsd.org; Fri, 21 Mar 2003 18:13:50 -0800 (PST) Date: Fri, 21 Mar 2003 18:13:50 -0800 (PST) Message-Id: <200303220213.h2M2DoSY042528@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 27207 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=27207 Change 27207 by marcel@marcel_vaio on 2003/03/21 18:12:55 Fix a bug in the if-converter. This fix is filed against GCC as PR 10116 and is being tracked by FreeBSD PR 50059. Fix tested on i386 and ia64. Testing on Alpha is ongoing. Details on the bug can be found in the above mentioned PRs. Affected files ... .. //depot/projects/ia64/contrib/gcc/ifcvt.c#4 edit Differences ... ==== //depot/projects/ia64/contrib/gcc/ifcvt.c#4 (text+ko) ==== @@ -1934,9 +1934,10 @@ is more than one remaining edge, it must come from elsewhere. There may be zero incoming edges if the THEN block didn't actually join back up (as with a call to abort). */ - else if ((join_bb->pred == NULL - || join_bb->pred->pred_next == NULL) - && join_bb != EXIT_BLOCK_PTR) + else if ((join_bb->pred == NULL || join_bb->pred->pred_next == NULL) + && join_bb != EXIT_BLOCK_PTR + && (NEXT_INSN(combo_bb->end) == join_bb->head + || GET_CODE(NEXT_INSN(combo_bb->end)) != CODE_LABEL)) { /* We can merge the JOIN. */ if (life_data_ok) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Mar 21 18:45:36 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 10A0437B404; Fri, 21 Mar 2003 18:45:32 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8E39937B401 for ; Fri, 21 Mar 2003 18:45:31 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 269A643FBF for ; Fri, 21 Mar 2003 18:45:31 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h2M2jU0U044501 for ; Fri, 21 Mar 2003 18:45:30 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2M2jUak044498 for perforce@freebsd.org; Fri, 21 Mar 2003 18:45:30 -0800 (PST) Date: Fri, 21 Mar 2003 18:45:30 -0800 (PST) Message-Id: <200303220245.h2M2jUak044498@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 27210 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=27210 Change 27210 by marcel@marcel_vaio on 2003/03/21 18:45:20 Stub, glue and hack gdb(1) so that it at least compiles. It is possible to run an application within gdb(1) if you know how to do it (instructions left as an excercise for the reader :-) Obtained from: arun Affected files ... .. //depot/projects/ia64/contrib/gdb/gdb/config/ia64/nm-fbsd.h#1 add .. //depot/projects/ia64/contrib/gdb/gdb/config/ia64/tm-fbsd.h#1 add .. //depot/projects/ia64/contrib/gdb/gdb/config/ia64/tm-ia64.h#5 edit .. //depot/projects/ia64/contrib/gdb/gdb/defs.h#5 edit .. //depot/projects/ia64/contrib/gdb/gdb/ia64-fbsd-nat.c#1 add .. //depot/projects/ia64/contrib/gdb/gdb/ia64-fbsd-tdep.c#1 add .. //depot/projects/ia64/contrib/gdb/gdb/ia64-tdep.c#5 edit .. //depot/projects/ia64/gnu/usr.bin/binutils/Makefile#7 edit .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb/Makefile.ia64#2 edit .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb/freebsd-uthread.c#5 edit .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb/kvm-fbsd.c#8 edit Differences ... ==== //depot/projects/ia64/contrib/gdb/gdb/config/ia64/tm-ia64.h#5 (text+ko) ==== @@ -21,6 +21,8 @@ #ifndef TM_IA64_H #define TM_IA64_H +#include "regcache.h" + #if !defined(GDBSERVER) #define GDB_MULTI_ARCH 1 ==== //depot/projects/ia64/contrib/gdb/gdb/defs.h#5 (text+ko) ==== @@ -1027,6 +1027,8 @@ extern char *savestring (const char *, size_t); +extern char *tilde_expand (const char *); + extern char *msavestring (void *, const char *, size_t); extern char *mstrsave (void *, const char *); ==== //depot/projects/ia64/contrib/gdb/gdb/ia64-tdep.c#5 (text+ko) ==== @@ -79,9 +79,11 @@ #define BUNDLE_LEN 16 +#ifdef __linux__ /* FIXME: These extern declarations should go in ia64-tdep.h. */ extern CORE_ADDR ia64_linux_sigcontext_register_address (CORE_ADDR, int); extern CORE_ADDR ia64_aix_sigcontext_register_address (CORE_ADDR, int); +#endif static gdbarch_init_ftype ia64_gdbarch_init; @@ -2106,12 +2108,15 @@ native_find_global_pointer is nonzero to indicate that we're on AIX is kind of hokey, but I can't think of a better way to do it. */ +#ifdef __linux__ if (os_ident == ELFOSABI_LINUX) tdep->sigcontext_register_address = ia64_linux_sigcontext_register_address; else if (native_find_global_pointer != 0) tdep->sigcontext_register_address = ia64_aix_sigcontext_register_address; else +#else tdep->sigcontext_register_address = 0; +#endif /* We know that GNU/Linux won't have to resort to the native_find_global_pointer hackery. But that's the only one we ==== //depot/projects/ia64/gnu/usr.bin/binutils/Makefile#7 (text+ko) ==== @@ -10,7 +10,8 @@ TARGET_ARCH?= ${MACHINE_ARCH} .if (${TARGET_ARCH} == "alpha" \ - || ${TARGET_ARCH} == "i386" ) \ + || ${TARGET_ARCH} == "i386" \ + || ${TARGET_ARCH} == "ia64") \ && !defined(NO_GDB) SUBDIR+= gdb gdbreplay .endif ==== //depot/projects/ia64/gnu/usr.bin/binutils/gdb/Makefile.ia64#2 (text+ko) ==== @@ -2,4 +2,4 @@ XSRCS+= ia64-tdep.c ia64-fbsd-nat.c \ core-regset.c -CFLAGS+= -DDEFAULT_BFD_VEC=bfd_elf64_ia64_vec +CFLAGS+= -DDEFAULT_BFD_VEC=bfd_elf64_ia64_little_vec ==== //depot/projects/ia64/gnu/usr.bin/binutils/gdb/freebsd-uthread.c#5 (text+ko) ==== @@ -461,6 +461,14 @@ #endif +#ifdef __ia64__ + +static char jmpmap[125] = { + -1 +}; + +#endif + static void freebsd_uthread_fetch_registers (int regno) { ==== //depot/projects/ia64/gnu/usr.bin/binutils/gdb/kvm-fbsd.c#8 (text+ko) ==== @@ -596,6 +596,17 @@ #endif /* __sparc64__ */ +#ifdef __ia64__ + +#define SPARC_INTREG_SIZE 8 + +static void +fetch_kcore_registers (struct pcb *pcbp) +{ +} + +#endif /* __ia64__ */ + /* Get the registers out of a core file. This is the machine- independent part. Fetch_core_registers is the machine-dependent part, typically implemented in the xm-file for each architecture. */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Mar 21 18:53:10 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0CE8837B404; Fri, 21 Mar 2003 18:53:08 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A575637B401; Fri, 21 Mar 2003 18:53:07 -0800 (PST) Received: from canning.wemm.org (canning.wemm.org [192.203.228.65]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5278C43F3F; Fri, 21 Mar 2003 18:53:07 -0800 (PST) (envelope-from peter@wemm.org) Received: from wemm.org (localhost [127.0.0.1]) by canning.wemm.org (Postfix) with ESMTP id 329A52A8BB; Fri, 21 Mar 2003 18:53:07 -0800 (PST) (envelope-from peter@wemm.org) X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: Marcel Moolenaar Cc: Perforce Change Reviews Subject: Re: PERFORCE change 27210 for review In-Reply-To: <200303220245.h2M2jUak044498@repoman.freebsd.org> Date: Fri, 21 Mar 2003 18:53:07 -0800 From: Peter Wemm Message-Id: <20030322025307.329A52A8BB@canning.wemm.org> Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Marcel Moolenaar wrote: > +#ifdef __ia64__ > + > +#define SPARC_INTREG_SIZE 8 ^^^^^^^^^^^^^^^^^ Nifty. :-) Cheers, -Peter -- Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com "All of this is for nothing if we don't go to the stars" - JMS/B5 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Mar 21 18:59:50 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1BD2737B405; Fri, 21 Mar 2003 18:59:49 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DBEE737B404 for ; Fri, 21 Mar 2003 18:59:48 -0800 (PST) Received: from ns1.xcllnt.net (209-128-86-226.bayarea.net [209.128.86.226]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3B65443F85 for ; Fri, 21 Mar 2003 18:59:47 -0800 (PST) (envelope-from marcel@xcllnt.net) Received: from dhcp01.pn.xcllnt.net (dhcp01.pn.xcllnt.net [192.168.4.201]) by ns1.xcllnt.net (8.12.8/8.12.8) with ESMTP id h2M2xkSd033179; Fri, 21 Mar 2003 18:59:46 -0800 (PST) (envelope-from marcel@piii.pn.xcllnt.net) Received: from dhcp01.pn.xcllnt.net (localhost [127.0.0.1]) by dhcp01.pn.xcllnt.net (8.12.8/8.12.8) with ESMTP id h2M2xk94003900; Fri, 21 Mar 2003 18:59:46 -0800 (PST) (envelope-from marcel@dhcp01.pn.xcllnt.net) Received: (from marcel@localhost) by dhcp01.pn.xcllnt.net (8.12.8/8.12.8/Submit) id h2M2xkEP003899; Fri, 21 Mar 2003 18:59:46 -0800 (PST) Date: Fri, 21 Mar 2003 18:59:46 -0800 From: Marcel Moolenaar To: Peter Wemm Cc: Perforce Change Reviews Subject: Re: PERFORCE change 27210 for review Message-ID: <20030322025946.GA3861@dhcp01.pn.xcllnt.net> References: <200303220245.h2M2jUak044498@repoman.freebsd.org> <20030322025307.329A52A8BB@canning.wemm.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20030322025307.329A52A8BB@canning.wemm.org> User-Agent: Mutt/1.5.3i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Fri, Mar 21, 2003 at 06:53:07PM -0800, Peter Wemm wrote: > Marcel Moolenaar wrote: > > > +#ifdef __ia64__ > > + > > +#define SPARC_INTREG_SIZE 8 > ^^^^^^^^^^^^^^^^^ > Nifty. :-) I don't wanna know :-) There are probably more bogons. I'm trying to build myself and that fails. Not that I worry too much. I'd rather we get something going. BTW: I added NO_GDB to /etc/make.conf on pluto1 and pluto2 to make sure we don't break a buildworld while we mess with this. -- Marcel Moolenaar USPA: A-39004 marcel@xcllnt.net To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Mar 21 19:44:12 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1819537B404; Fri, 21 Mar 2003 19:43:49 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BA05737B401 for ; Fri, 21 Mar 2003 19:43:48 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2DA2343FA3 for ; Fri, 21 Mar 2003 19:43:47 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h2M3hl0U049310 for ; Fri, 21 Mar 2003 19:43:47 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2M3hhNh049307 for perforce@freebsd.org; Fri, 21 Mar 2003 19:43:43 -0800 (PST) Date: Fri, 21 Mar 2003 19:43:43 -0800 (PST) Message-Id: <200303220343.h2M3hhNh049307@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 27213 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=27213 Change 27213 by marcel@marcel_vaio on 2003/03/21 19:43:33 IFia64 Affected files ... .. //depot/projects/ia64_epc/Makefile.inc1#5 integrate .. //depot/projects/ia64_epc/bin/dd/args.c#3 integrate .. //depot/projects/ia64_epc/bin/sh/expand.c#2 integrate .. //depot/projects/ia64_epc/bin/sh/jobs.c#2 integrate .. //depot/projects/ia64_epc/contrib/cvs/src/parseinfo.c#2 integrate .. //depot/projects/ia64_epc/contrib/gcc/config/rs6000/sysv4.h#2 integrate .. //depot/projects/ia64_epc/contrib/gcc/ifcvt.c#2 integrate .. //depot/projects/ia64_epc/contrib/gdb/gdb/config/ia64/nm-fbsd.h#1 branch .. //depot/projects/ia64_epc/contrib/gdb/gdb/config/ia64/tm-fbsd.h#1 branch .. //depot/projects/ia64_epc/contrib/gdb/gdb/config/ia64/tm-ia64.h#2 integrate .. //depot/projects/ia64_epc/contrib/gdb/gdb/defs.h#2 integrate .. //depot/projects/ia64_epc/contrib/gdb/gdb/ia64-fbsd-nat.c#1 branch .. //depot/projects/ia64_epc/contrib/gdb/gdb/ia64-fbsd-tdep.c#1 branch .. //depot/projects/ia64_epc/contrib/gdb/gdb/ia64-tdep.c#2 integrate .. //depot/projects/ia64_epc/contrib/gdtoa/README#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/arithchk.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/dmisc.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/dtoa.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/g_Qfmt.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/g__fmt.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/g_ddfmt.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/g_dfmt.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/g_ffmt.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/g_xLfmt.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/g_xfmt.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/gdtoa.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/gdtoa.h#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/gdtoaimp.h#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/gethex.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/gmisc.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/hd_init.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/hexnan.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/makefile#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/misc.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/smisc.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/strtoIQ.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/strtoId.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/strtoIdd.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/strtoIf.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/strtoIg.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/strtoIx.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/strtoIxL.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/strtod.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/strtodI.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/strtodg.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/strtof.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/strtopQ.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/strtopd.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/strtopdd.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/strtopf.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/strtopx.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/strtopxL.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/strtorQ.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/strtord.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/strtordd.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/strtorf.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/strtorx.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/strtorxL.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/sum.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/test/Q.ou0#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/test/Q.ou1#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/test/Qtest.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/test/README#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/test/d.out#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/test/dI.out#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/test/dIsi.out#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/test/dItest.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/test/dd.out#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/test/ddsi.out#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/test/ddtest.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/test/dt.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/test/dtest.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/test/dtst.out#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/test/f.out#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/test/ftest.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/test/getround.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/test/makefile#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/test/rtestnos#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/test/strtoIdSI.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/test/strtoIddSI.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/test/strtodISI.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/test/strtodt.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/test/strtopddSI.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/test/strtorddSI.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/test/testnos#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/test/testnos1#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/test/testnos3#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/test/x.ou0#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/test/x.ou1#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/test/xL.ou0#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/test/xL.ou1#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/test/xLtest.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/test/xQtest.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/test/xsum0.out#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/test/xtest.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/ulp.c#1 branch .. //depot/projects/ia64_epc/contrib/gdtoa/xsum0.out#1 branch .. //depot/projects/ia64_epc/contrib/isc-dhcp/client/dhclient.8#2 integrate .. //depot/projects/ia64_epc/contrib/isc-dhcp/client/dhclient.c#2 integrate .. //depot/projects/ia64_epc/contrib/one-true-awk/FIXES#2 integrate .. //depot/projects/ia64_epc/contrib/one-true-awk/README#2 integrate .. //depot/projects/ia64_epc/contrib/one-true-awk/b.c#2 integrate .. //depot/projects/ia64_epc/contrib/one-true-awk/lib.c#2 integrate .. //depot/projects/ia64_epc/contrib/one-true-awk/main.c#2 integrate .. //depot/projects/ia64_epc/contrib/one-true-awk/makefile#2 integrate .. //depot/projects/ia64_epc/contrib/one-true-awk/run.c#2 integrate .. //depot/projects/ia64_epc/crypto/openssl/crypto/rsa/rsa_eay.c#3 integrate .. //depot/projects/ia64_epc/crypto/openssl/crypto/rsa/rsa_lib.c#3 integrate .. //depot/projects/ia64_epc/crypto/openssl/ssl/s3_srvr.c#2 integrate .. //depot/projects/ia64_epc/etc/defaults/rc.conf#3 integrate .. //depot/projects/ia64_epc/etc/mtree/BSD.root.dist#3 integrate .. //depot/projects/ia64_epc/etc/mtree/BSD.usr.dist#3 integrate .. //depot/projects/ia64_epc/etc/pam.d/Makefile#2 integrate .. //depot/projects/ia64_epc/etc/rc.d/Makefile#2 integrate .. //depot/projects/ia64_epc/etc/rc.d/kldxref#1 branch .. //depot/projects/ia64_epc/etc/sysctl.conf#2 integrate .. //depot/projects/ia64_epc/games/fortune/datfiles/fortunes#3 integrate .. //depot/projects/ia64_epc/games/fortune/datfiles/fortunes-o.real#2 integrate .. //depot/projects/ia64_epc/games/fortune/datfiles/fortunes2#3 integrate .. //depot/projects/ia64_epc/games/fortune/datfiles/fortunes2-o#2 integrate .. //depot/projects/ia64_epc/games/fortune/datfiles/murphy#2 integrate .. //depot/projects/ia64_epc/games/fortune/datfiles/murphy-o#2 integrate .. //depot/projects/ia64_epc/gnu/lib/libobjc/Makefile#2 integrate .. //depot/projects/ia64_epc/gnu/usr.bin/binutils/Makefile#2 integrate .. //depot/projects/ia64_epc/gnu/usr.bin/binutils/gdb/Makefile#2 integrate .. //depot/projects/ia64_epc/gnu/usr.bin/binutils/gdb/Makefile.ia64#2 integrate .. //depot/projects/ia64_epc/gnu/usr.bin/binutils/gdb/fbsd-kgdb.h#2 integrate .. //depot/projects/ia64_epc/gnu/usr.bin/binutils/gdb/freebsd-uthread.c#2 integrate .. //depot/projects/ia64_epc/gnu/usr.bin/binutils/gdb/kvm-fbsd.c#2 integrate .. //depot/projects/ia64_epc/gnu/usr.bin/binutils/gdb/solib-fbsd-kld.c#1 branch .. //depot/projects/ia64_epc/gnu/usr.bin/send-pr/send-pr.sh#2 integrate .. //depot/projects/ia64_epc/include/stdlib.h#2 integrate .. //depot/projects/ia64_epc/include/wchar.h#2 integrate .. //depot/projects/ia64_epc/lib/libc/Makefile#2 integrate .. //depot/projects/ia64_epc/lib/libc/alpha/arith.h#1 branch .. //depot/projects/ia64_epc/lib/libc/alpha/stdlib/gdtoa.mk#1 branch .. //depot/projects/ia64_epc/lib/libc/gdtoa/Makefile.inc#1 branch .. //depot/projects/ia64_epc/lib/libc/gdtoa/glue.c#1 branch .. //depot/projects/ia64_epc/lib/libc/gdtoa/machdep_ldisQ.c#1 branch .. //depot/projects/ia64_epc/lib/libc/gdtoa/machdep_ldisd.c#1 branch .. //depot/projects/ia64_epc/lib/libc/gdtoa/machdep_ldisx.c#1 branch .. //depot/projects/ia64_epc/lib/libc/gen/getgrent.c#2 integrate .. //depot/projects/ia64_epc/lib/libc/gen/getusershell.c#2 integrate .. //depot/projects/ia64_epc/lib/libc/gen/wordexp.3#2 integrate .. //depot/projects/ia64_epc/lib/libc/i386/arith.h#1 branch .. //depot/projects/ia64_epc/lib/libc/i386/stdlib/gdtoa.mk#1 branch .. //depot/projects/ia64_epc/lib/libc/i386/string/Makefile.inc#2 integrate .. //depot/projects/ia64_epc/lib/libc/i386/string/wcscmp.S#1 branch .. //depot/projects/ia64_epc/lib/libc/i386/string/wcslen.S#1 branch .. //depot/projects/ia64_epc/lib/libc/i386/string/wmemchr.S#1 branch .. //depot/projects/ia64_epc/lib/libc/ia64/arith.h#1 branch .. //depot/projects/ia64_epc/lib/libc/ia64/stdlib/gdtoa.mk#1 branch .. //depot/projects/ia64_epc/lib/libc/locale/Makefile.inc#2 integrate .. //depot/projects/ia64_epc/lib/libc/locale/lnumeric.c#2 integrate .. //depot/projects/ia64_epc/lib/libc/locale/setlocale.3#2 integrate .. //depot/projects/ia64_epc/lib/libc/locale/wcstod.3#2 integrate .. //depot/projects/ia64_epc/lib/libc/locale/wcstof.c#1 branch .. //depot/projects/ia64_epc/lib/libc/locale/wcstold.c#1 branch .. //depot/projects/ia64_epc/lib/libc/powerpc/arith.h#1 branch .. //depot/projects/ia64_epc/lib/libc/powerpc/stdlib/gdtoa.mk#1 branch .. //depot/projects/ia64_epc/lib/libc/sparc64/arith.h#1 branch .. //depot/projects/ia64_epc/lib/libc/sparc64/stdlib/gdtoa.mk#1 branch .. //depot/projects/ia64_epc/lib/libc/stdio/vfprintf.c#2 integrate .. //depot/projects/ia64_epc/lib/libc/stdio/vfwprintf.c#2 integrate .. //depot/projects/ia64_epc/lib/libc/stdlib/Makefile.inc#2 integrate .. //depot/projects/ia64_epc/lib/libc/stdlib/hcreate.3#2 integrate .. //depot/projects/ia64_epc/lib/libc/stdlib/strfmon.c#2 integrate .. //depot/projects/ia64_epc/lib/libc/stdlib/strtod.3#2 integrate .. //depot/projects/ia64_epc/lib/libc/stdlib/strtod.c#2 delete .. //depot/projects/ia64_epc/lib/libc/stdtime/strptime.c#3 integrate .. //depot/projects/ia64_epc/lib/libc/string/wcstok.c#2 integrate .. //depot/projects/ia64_epc/lib/libc/sys/sendfile.2#2 integrate .. //depot/projects/ia64_epc/lib/libdevstat/Makefile#2 integrate .. //depot/projects/ia64_epc/lib/libdevstat/devstat.3#3 integrate .. //depot/projects/ia64_epc/lib/libdevstat/devstat.c#3 integrate .. //depot/projects/ia64_epc/lib/libdevstat/devstat.h#2 integrate .. //depot/projects/ia64_epc/lib/libdisk/disk.c#2 integrate .. //depot/projects/ia64_epc/lib/libfetch/ftp.c#2 integrate .. //depot/projects/ia64_epc/lib/libfetch/http.c#2 integrate .. //depot/projects/ia64_epc/lib/libgeom/geom_stats.c#2 integrate .. //depot/projects/ia64_epc/lib/libgeom/geom_xml2tree.c#2 integrate .. //depot/projects/ia64_epc/lib/libgeom/libgeom.h#2 integrate .. //depot/projects/ia64_epc/lib/libkvm/kvm_proc.c#3 integrate .. //depot/projects/ia64_epc/lib/libpam/modules/pam_krb5/Makefile#3 integrate .. //depot/projects/ia64_epc/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8#3 integrate .. //depot/projects/ia64_epc/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c#3 integrate .. //depot/projects/ia64_epc/lib/libpam/modules/pam_ssh/Makefile#3 integrate .. //depot/projects/ia64_epc/lib/libpthread/thread/thr_rwlock.c#2 integrate .. //depot/projects/ia64_epc/lib/libutil/pw_util.c#2 integrate .. //depot/projects/ia64_epc/lib/libz/gzio.c#2 integrate .. //depot/projects/ia64_epc/libexec/rpc.rstatd/rstat_proc.c#3 integrate .. //depot/projects/ia64_epc/libexec/rtld-elf/alpha/reloc.c#2 integrate .. //depot/projects/ia64_epc/libexec/rtld-elf/i386/reloc.c#2 integrate .. //depot/projects/ia64_epc/libexec/rtld-elf/ia64/reloc.c#2 integrate .. //depot/projects/ia64_epc/libexec/rtld-elf/map_object.c#2 integrate .. //depot/projects/ia64_epc/libexec/rtld-elf/powerpc/reloc.c#2 integrate .. //depot/projects/ia64_epc/libexec/rtld-elf/sparc64/reloc.c#2 integrate .. //depot/projects/ia64_epc/libexec/tftpd/tftpd.c#2 integrate .. //depot/projects/ia64_epc/release/Makefile#4 integrate .. //depot/projects/ia64_epc/release/doc/en_US.ISO8859-1/errata/article.sgml#4 integrate .. //depot/projects/ia64_epc/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#6 integrate .. //depot/projects/ia64_epc/release/doc/ja_JP.eucJP/errata/article.sgml#2 integrate .. //depot/projects/ia64_epc/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#2 integrate .. //depot/projects/ia64_epc/release/i386/drivers.conf#3 integrate .. //depot/projects/ia64_epc/release/ia64/doFS.sh#2 integrate .. //depot/projects/ia64_epc/release/pc98/drivers.conf#2 integrate .. //depot/projects/ia64_epc/release/picobsd/tinyware/simple_httpd/simple_httpd.c#2 integrate .. //depot/projects/ia64_epc/release/scripts/doFS.sh#3 integrate .. //depot/projects/ia64_epc/sbin/camcontrol/modeedit.c#3 integrate .. //depot/projects/ia64_epc/sbin/disklabel/disklabel.8#3 integrate .. //depot/projects/ia64_epc/sbin/disklabel/disklabel.c#3 integrate .. //depot/projects/ia64_epc/sbin/ipfw/ipfw.8#3 integrate .. //depot/projects/ia64_epc/sbin/ipfw/ipfw2.c#2 integrate .. //depot/projects/ia64_epc/sbin/ping/ping.8#4 integrate .. //depot/projects/ia64_epc/sbin/ping/ping.c#4 integrate .. //depot/projects/ia64_epc/sbin/vinum/commands.c#3 integrate .. //depot/projects/ia64_epc/sbin/vinum/list.c#3 integrate .. //depot/projects/ia64_epc/secure/lib/libcrypto/Makefile#3 integrate .. //depot/projects/ia64_epc/share/man/man4/Makefile#3 integrate .. //depot/projects/ia64_epc/share/man/man4/asr.4#1 branch .. //depot/projects/ia64_epc/share/man/man4/rndtest.4#1 branch .. //depot/projects/ia64_epc/share/man/man4/tcp.4#2 integrate .. //depot/projects/ia64_epc/share/man/man5/rc.conf.5#5 integrate .. //depot/projects/ia64_epc/share/man/man7/release.7#3 integrate .. //depot/projects/ia64_epc/share/man/man7/tuning.7#2 integrate .. //depot/projects/ia64_epc/share/man/man9/ifnet.9#2 integrate .. //depot/projects/ia64_epc/share/mk/bsd.README#2 integrate .. //depot/projects/ia64_epc/share/mk/bsd.libnames.mk#3 integrate .. //depot/projects/ia64_epc/sys/alpha/alpha/busdma_machdep.c#3 integrate .. //depot/projects/ia64_epc/sys/alpha/include/pmap.h#3 integrate .. //depot/projects/ia64_epc/sys/alpha/linux/linux_sysvec.c#2 integrate .. //depot/projects/ia64_epc/sys/alpha/osf1/imgact_osf1.c#3 integrate .. //depot/projects/ia64_epc/sys/alpha/osf1/osf1_mount.c#2 integrate .. //depot/projects/ia64_epc/sys/boot/forth/loader.conf#3 integrate .. //depot/projects/ia64_epc/sys/cam/cam_periph.c#3 integrate .. //depot/projects/ia64_epc/sys/cam/scsi/scsi_cd.c#5 integrate .. //depot/projects/ia64_epc/sys/cam/scsi/scsi_da.c#4 integrate .. //depot/projects/ia64_epc/sys/cam/scsi/scsi_pt.c#4 integrate .. //depot/projects/ia64_epc/sys/cam/scsi/scsi_sa.c#5 integrate .. //depot/projects/ia64_epc/sys/compat/linprocfs/linprocfs.c#3 integrate .. //depot/projects/ia64_epc/sys/compat/linux/linux_file.c#4 integrate .. //depot/projects/ia64_epc/sys/compat/linux/linux_getcwd.c#3 integrate .. //depot/projects/ia64_epc/sys/compat/linux/linux_ioctl.c#4 integrate .. //depot/projects/ia64_epc/sys/compat/linux/linux_mib.c#3 integrate .. //depot/projects/ia64_epc/sys/compat/linux/linux_mib.h#2 integrate .. //depot/projects/ia64_epc/sys/compat/linux/linux_misc.c#5 integrate .. //depot/projects/ia64_epc/sys/compat/linux/linux_stats.c#3 integrate .. //depot/projects/ia64_epc/sys/compat/svr4/svr4_sysvec.c#3 integrate .. //depot/projects/ia64_epc/sys/conf/NOTES#6 integrate .. //depot/projects/ia64_epc/sys/conf/files#6 integrate .. //depot/projects/ia64_epc/sys/conf/files.sparc64#4 integrate .. //depot/projects/ia64_epc/sys/conf/options#5 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/fla/fla.c#4 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/oltr/if_oltr.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/aac/aac.c#5 integrate .. //depot/projects/ia64_epc/sys/dev/ata/ata-all.c#6 integrate .. //depot/projects/ia64_epc/sys/dev/ata/ata-chipset.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/ata/ata-raid.c#4 integrate .. //depot/projects/ia64_epc/sys/dev/ata/atapi-all.c#4 integrate .. //depot/projects/ia64_epc/sys/dev/ata/atapi-cd.c#5 integrate .. //depot/projects/ia64_epc/sys/dev/ata/atapi-tape.c#5 integrate .. //depot/projects/ia64_epc/sys/dev/awi/if_awi_pccard.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/ccd/ccd.c#5 integrate .. //depot/projects/ia64_epc/sys/dev/ciss/ciss.c#5 integrate .. //depot/projects/ia64_epc/sys/dev/drm/drm_fops.h#3 integrate .. //depot/projects/ia64_epc/sys/dev/drm/radeon_drv.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/em/LICENSE#2 integrate .. //depot/projects/ia64_epc/sys/dev/em/README#2 integrate .. //depot/projects/ia64_epc/sys/dev/em/if_em.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/em/if_em.h#2 integrate .. //depot/projects/ia64_epc/sys/dev/em/if_em_hw.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/em/if_em_hw.h#2 integrate .. //depot/projects/ia64_epc/sys/dev/em/if_em_osdep.h#2 integrate .. //depot/projects/ia64_epc/sys/dev/en/midway.c#4 integrate .. //depot/projects/ia64_epc/sys/dev/fb/vga.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/firewire/if_fwe.c#4 integrate .. //depot/projects/ia64_epc/sys/dev/firewire/sbp.c#6 integrate .. //depot/projects/ia64_epc/sys/dev/hifn/hifn7751.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/hifn/hifn7751var.h#2 integrate .. //depot/projects/ia64_epc/sys/dev/ida/ida.c#5 integrate .. //depot/projects/ia64_epc/sys/dev/iir/iir_pci.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/md/md.c#5 integrate .. //depot/projects/ia64_epc/sys/dev/musycc/musycc.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/pccard/pccard.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/pccard/pccard_cis.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/pccard/pccarddevs#3 integrate .. //depot/projects/ia64_epc/sys/dev/pccard/pccarddevs.h#3 integrate .. //depot/projects/ia64_epc/sys/dev/pdq/pdq_freebsd.h#3 integrate .. //depot/projects/ia64_epc/sys/dev/pdq/pdq_ifsubr.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/puc/puc.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/puc/pucdata.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/puc/pucvar.h#2 integrate .. //depot/projects/ia64_epc/sys/dev/raidframe/rf_threadstuff.h#2 integrate .. //depot/projects/ia64_epc/sys/dev/rndtest/rndtest.c#1 branch .. //depot/projects/ia64_epc/sys/dev/rndtest/rndtest.h#1 branch .. //depot/projects/ia64_epc/sys/dev/sio/sio.c#4 integrate .. //depot/projects/ia64_epc/sys/dev/sio/sio_isa.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/sio/sioreg.h#2 integrate .. //depot/projects/ia64_epc/sys/dev/sound/pci/via8233.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/sound/pcm/ac97.c#4 integrate .. //depot/projects/ia64_epc/sys/dev/twe/twe_compat.h#4 integrate .. //depot/projects/ia64_epc/sys/dev/twe/twe_freebsd.c#5 integrate .. //depot/projects/ia64_epc/sys/dev/ubsec/ubsec.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/ubsec/ubsecvar.h#2 integrate .. //depot/projects/ia64_epc/sys/dev/usb/if_cue.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/usb/udbp.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/usb/uhci.c#4 integrate .. //depot/projects/ia64_epc/sys/dev/usb/umass.c#4 integrate .. //depot/projects/ia64_epc/sys/dev/usb/usbdevs#3 integrate .. //depot/projects/ia64_epc/sys/dev/usb/usbdevs.h#3 integrate .. //depot/projects/ia64_epc/sys/dev/usb/usbdevs_data.h#3 integrate .. //depot/projects/ia64_epc/sys/dev/wi/if_wi.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/wi/if_wi_pccard.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/wi/if_wi_pci.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/wi/if_wivar.h#2 integrate .. //depot/projects/ia64_epc/sys/fs/devfs/devfs_vfsops.c#3 integrate .. //depot/projects/ia64_epc/sys/fs/fdescfs/fdesc_vfsops.c#3 integrate .. //depot/projects/ia64_epc/sys/fs/hpfs/hpfs_vfsops.c#3 integrate .. //depot/projects/ia64_epc/sys/fs/ntfs/ntfs_vfsops.c#3 integrate .. //depot/projects/ia64_epc/sys/fs/nwfs/nwfs_vfsops.c#3 integrate .. //depot/projects/ia64_epc/sys/fs/portalfs/portal_vfsops.c#3 integrate .. //depot/projects/ia64_epc/sys/fs/pseudofs/pseudofs.h#3 integrate .. //depot/projects/ia64_epc/sys/fs/smbfs/smbfs_vfsops.c#3 integrate .. //depot/projects/ia64_epc/sys/fs/specfs/spec_vnops.c#3 integrate .. //depot/projects/ia64_epc/sys/fs/udf/udf_vfsops.c#3 integrate .. //depot/projects/ia64_epc/sys/fs/udf/udf_vnops.c#4 integrate .. //depot/projects/ia64_epc/sys/fs/umapfs/umap_vfsops.c#3 integrate .. //depot/projects/ia64_epc/sys/fs/unionfs/union_vfsops.c#3 integrate .. //depot/projects/ia64_epc/sys/geom/bde/g_bde.c#3 integrate .. //depot/projects/ia64_epc/sys/geom/bde/g_bde_crypt.c#3 integrate .. //depot/projects/ia64_epc/sys/geom/bde/g_bde_lock.c#2 integrate .. //depot/projects/ia64_epc/sys/geom/bde/g_bde_work.c#2 integrate .. //depot/projects/ia64_epc/sys/geom/geom.h#3 integrate .. //depot/projects/ia64_epc/sys/geom/geom_bsd.c#2 integrate .. //depot/projects/ia64_epc/sys/geom/geom_ctl.c#3 integrate .. //depot/projects/ia64_epc/sys/geom/geom_dev.c#5 integrate .. //depot/projects/ia64_epc/sys/geom/geom_disk.c#5 integrate .. //depot/projects/ia64_epc/sys/geom/geom_dump.c#2 integrate .. //depot/projects/ia64_epc/sys/geom/geom_event.c#4 integrate .. //depot/projects/ia64_epc/sys/geom/geom_int.h#2 integrate .. //depot/projects/ia64_epc/sys/geom/geom_io.c#4 integrate .. //depot/projects/ia64_epc/sys/geom/geom_kern.c#2 integrate .. //depot/projects/ia64_epc/sys/geom/geom_slice.c#3 integrate .. //depot/projects/ia64_epc/sys/geom/geom_stats.c#4 delete .. //depot/projects/ia64_epc/sys/geom/geom_stats.h#2 delete .. //depot/projects/ia64_epc/sys/geom/geom_subr.c#4 integrate .. //depot/projects/ia64_epc/sys/gnu/ext2fs/fs.h#3 integrate .. //depot/projects/ia64_epc/sys/i386/i386/busdma_machdep.c#3 integrate .. //depot/projects/ia64_epc/sys/i386/i386/identcpu.c#3 integrate .. //depot/projects/ia64_epc/sys/i386/i386/initcpu.c#2 integrate .. //depot/projects/ia64_epc/sys/i386/i386/pmap.c#4 integrate .. //depot/projects/ia64_epc/sys/i386/i386/tsc.c#2 integrate .. //depot/projects/ia64_epc/sys/i386/include/apic.h#2 integrate .. //depot/projects/ia64_epc/sys/i386/include/bus_at386.h#3 integrate .. //depot/projects/ia64_epc/sys/i386/include/pmap.h#3 integrate .. //depot/projects/ia64_epc/sys/i386/isa/clock.c#2 integrate .. //depot/projects/ia64_epc/sys/i386/isa/if_le.c#3 integrate .. //depot/projects/ia64_epc/sys/i386/linux/linux_machdep.c#3 integrate .. //depot/projects/ia64_epc/sys/i386/linux/linux_sysvec.c#4 integrate .. //depot/projects/ia64_epc/sys/ia64/ia64/busdma_machdep.c#3 integrate .. //depot/projects/ia64_epc/sys/ia64/include/pmap.h#3 integrate .. //depot/projects/ia64_epc/sys/isa/fd.c#4 integrate .. //depot/projects/ia64_epc/sys/isofs/cd9660/cd9660_vfsops.c#3 integrate .. //depot/projects/ia64_epc/sys/kern/kern_acct.c#3 integrate .. //depot/projects/ia64_epc/sys/kern/kern_exec.c#3 integrate .. //depot/projects/ia64_epc/sys/kern/kern_exit.c#3 integrate .. //depot/projects/ia64_epc/sys/kern/kern_fork.c#3 integrate .. //depot/projects/ia64_epc/sys/kern/kern_ktr.c#3 integrate .. //depot/projects/ia64_epc/sys/kern/kern_ktrace.c#3 integrate .. //depot/projects/ia64_epc/sys/kern/kern_lock.c#4 integrate .. //depot/projects/ia64_epc/sys/kern/kern_lockf.c#3 integrate .. //depot/projects/ia64_epc/sys/kern/kern_malloc.c#3 integrate .. //depot/projects/ia64_epc/sys/kern/kern_mutex.c#4 integrate .. //depot/projects/ia64_epc/sys/kern/kern_physio.c#2 integrate .. //depot/projects/ia64_epc/sys/kern/kern_proc.c#3 integrate .. //depot/projects/ia64_epc/sys/kern/kern_resource.c#4 integrate .. //depot/projects/ia64_epc/sys/kern/kern_sig.c#5 integrate .. //depot/projects/ia64_epc/sys/kern/kern_switch.c#4 integrate .. //depot/projects/ia64_epc/sys/kern/kern_synch.c#5 integrate .. //depot/projects/ia64_epc/sys/kern/kern_sysctl.c#4 integrate .. //depot/projects/ia64_epc/sys/kern/kern_tc.c#2 integrate .. //depot/projects/ia64_epc/sys/kern/kern_thread.c#5 integrate .. //depot/projects/ia64_epc/sys/kern/subr_bus.c#3 integrate .. //depot/projects/ia64_epc/sys/kern/subr_devstat.c#3 integrate .. //depot/projects/ia64_epc/sys/kern/subr_disk.c#3 integrate .. //depot/projects/ia64_epc/sys/kern/subr_eventhandler.c#2 integrate .. //depot/projects/ia64_epc/sys/kern/subr_mbuf.c#5 integrate .. //depot/projects/ia64_epc/sys/kern/subr_prf.c#3 integrate .. //depot/projects/ia64_epc/sys/kern/subr_trap.c#4 integrate .. //depot/projects/ia64_epc/sys/kern/subr_witness.c#5 integrate .. //depot/projects/ia64_epc/sys/kern/sys_process.c#2 integrate .. //depot/projects/ia64_epc/sys/kern/uipc_cow.c#3 integrate .. //depot/projects/ia64_epc/sys/kern/uipc_mbuf.c#3 integrate .. //depot/projects/ia64_epc/sys/kern/uipc_sem.c#3 integrate .. //depot/projects/ia64_epc/sys/kern/uipc_syscalls.c#4 integrate .. //depot/projects/ia64_epc/sys/kern/vfs_bio.c#4 integrate .. //depot/projects/ia64_epc/sys/kern/vfs_cache.c#3 integrate .. //depot/projects/ia64_epc/sys/kern/vfs_cluster.c#4 integrate .. //depot/projects/ia64_epc/sys/kern/vfs_default.c#5 integrate .. //depot/projects/ia64_epc/sys/kern/vfs_subr.c#4 integrate .. //depot/projects/ia64_epc/sys/modules/Makefile#6 integrate .. //depot/projects/ia64_epc/sys/modules/hifn/Makefile#2 integrate .. //depot/projects/ia64_epc/sys/modules/oltr/Makefile#2 integrate .. //depot/projects/ia64_epc/sys/modules/rndtest/Makefile#1 branch .. //depot/projects/ia64_epc/sys/modules/ubsec/Makefile#2 integrate .. //depot/projects/ia64_epc/sys/net/bpf.c#4 integrate .. //depot/projects/ia64_epc/sys/net/if.c#5 integrate .. //depot/projects/ia64_epc/sys/net/if_arp.h#2 integrate .. //depot/projects/ia64_epc/sys/net/if_atm.h#2 integrate .. //depot/projects/ia64_epc/sys/net/if_atmsubr.c#4 integrate .. //depot/projects/ia64_epc/sys/net/if_ethersubr.c#4 integrate .. //depot/projects/ia64_epc/sys/net/if_fddisubr.c#4 integrate .. //depot/projects/ia64_epc/sys/net/if_iso88025subr.c#4 integrate .. //depot/projects/ia64_epc/sys/net/if_vlan.c#4 integrate .. //depot/projects/ia64_epc/sys/net/if_vlan_var.h#3 integrate .. //depot/projects/ia64_epc/sys/net/iso88025.h#2 integrate .. //depot/projects/ia64_epc/sys/netatalk/aarp.c#4 integrate .. //depot/projects/ia64_epc/sys/netinet/ip.h#2 integrate .. //depot/projects/ia64_epc/sys/netinet/ip_encap.c#3 integrate .. //depot/projects/ia64_epc/sys/netinet/ip_fw.h#2 integrate .. //depot/projects/ia64_epc/sys/netinet/ip_fw2.c#3 integrate .. //depot/projects/ia64_epc/sys/netinet/ip_icmp.c#3 integrate .. //depot/projects/ia64_epc/sys/netinet/ip_icmp.h#2 integrate .. //depot/projects/ia64_epc/sys/netinet/tcp_input.c#5 integrate .. //depot/projects/ia64_epc/sys/netinet6/ip6_input.c#4 integrate .. //depot/projects/ia64_epc/sys/netncp/ncp_conn.c#3 integrate .. //depot/projects/ia64_epc/sys/nfsclient/nfs_vnops.c#4 integrate .. //depot/projects/ia64_epc/sys/nfsserver/nfs_serv.c#3 integrate .. //depot/projects/ia64_epc/sys/pc98/pc98/clock.c#2 integrate .. //depot/projects/ia64_epc/sys/pc98/pc98/fd.c#4 integrate .. //depot/projects/ia64_epc/sys/pci/agp_sis.c#2 integrate .. //depot/projects/ia64_epc/sys/pci/if_dc.c#3 integrate .. //depot/projects/ia64_epc/sys/pci/if_de.c#3 integrate .. //depot/projects/ia64_epc/sys/pci/if_rl.c#3 integrate .. //depot/projects/ia64_epc/sys/pci/if_rlreg.h#3 integrate .. //depot/projects/ia64_epc/sys/pci/if_xl.c#4 integrate .. //depot/projects/ia64_epc/sys/pci/if_xlreg.h#3 integrate .. //depot/projects/ia64_epc/sys/powerpc/include/pmap.h#2 integrate .. //depot/projects/ia64_epc/sys/powerpc/powermac/macio.c#3 integrate .. //depot/projects/ia64_epc/sys/powerpc/powerpc/busdma_machdep.c#3 integrate .. //depot/projects/ia64_epc/sys/powerpc/powerpc/fpu.c#2 integrate .. //depot/projects/ia64_epc/sys/powerpc/powerpc/genassym.c#3 integrate .. //depot/projects/ia64_epc/sys/powerpc/powerpc/machdep.c#2 integrate .. //depot/projects/ia64_epc/sys/powerpc/powerpc/swtch.S#2 integrate .. //depot/projects/ia64_epc/sys/powerpc/powerpc/trap.c#4 integrate .. //depot/projects/ia64_epc/sys/security/mac_portacl/mac_portacl.c#2 integrate .. //depot/projects/ia64_epc/sys/sparc64/include/cache.h#2 integrate .. //depot/projects/ia64_epc/sys/sparc64/include/pcpu.h#2 integrate .. //depot/projects/ia64_epc/sys/sparc64/include/pmap.h#2 integrate .. //depot/projects/ia64_epc/sys/sparc64/include/smp.h#2 integrate .. //depot/projects/ia64_epc/sys/sparc64/sparc64/bus_machdep.c#3 integrate .. //depot/projects/ia64_epc/sys/sparc64/sparc64/cache.c#2 integrate .. //depot/projects/ia64_epc/sys/sparc64/sparc64/cheetah.c#1 branch .. //depot/projects/ia64_epc/sys/sparc64/sparc64/db_trace.c#2 integrate .. //depot/projects/ia64_epc/sys/sparc64/sparc64/identcpu.c#2 integrate .. //depot/projects/ia64_epc/sys/sparc64/sparc64/locore.S#2 integrate .. //depot/projects/ia64_epc/sys/sparc64/sparc64/machdep.c#2 integrate .. //depot/projects/ia64_epc/sys/sparc64/sparc64/mem.c#4 integrate .. //depot/projects/ia64_epc/sys/sparc64/sparc64/mp_exception.S#2 integrate .. //depot/projects/ia64_epc/sys/sparc64/sparc64/mp_machdep.c#2 integrate .. //depot/projects/ia64_epc/sys/sparc64/sparc64/pmap.c#3 integrate .. //depot/projects/ia64_epc/sys/sparc64/sparc64/spitfire.c#1 branch .. //depot/projects/ia64_epc/sys/sparc64/sparc64/tick.c#2 integrate .. //depot/projects/ia64_epc/sys/sparc64/sparc64/vm_machdep.c#3 integrate .. //depot/projects/ia64_epc/sys/sys/buf.h#4 integrate .. //depot/projects/ia64_epc/sys/sys/devicestat.h#3 integrate .. //depot/projects/ia64_epc/sys/sys/eventhandler.h#2 integrate .. //depot/projects/ia64_epc/sys/sys/kse.h#3 integrate .. //depot/projects/ia64_epc/sys/sys/ktr.h#2 integrate .. //depot/projects/ia64_epc/sys/sys/ktrace.h#2 integrate .. //depot/projects/ia64_epc/sys/sys/malloc.h#3 integrate .. //depot/projects/ia64_epc/sys/sys/mbuf.h#3 integrate .. //depot/projects/ia64_epc/sys/sys/mount.h#2 integrate .. //depot/projects/ia64_epc/sys/sys/mutex.h#2 integrate .. //depot/projects/ia64_epc/sys/sys/param.h#5 integrate .. //depot/projects/ia64_epc/sys/sys/proc.h#3 integrate .. //depot/projects/ia64_epc/sys/sys/stat.h#4 integrate .. //depot/projects/ia64_epc/sys/sys/systm.h#2 integrate .. //depot/projects/ia64_epc/sys/ufs/ffs/ffs_alloc.c#5 integrate .. //depot/projects/ia64_epc/sys/ufs/ffs/ffs_snapshot.c#5 integrate .. //depot/projects/ia64_epc/sys/ufs/ffs/ffs_softdep.c#4 integrate .. //depot/projects/ia64_epc/sys/ufs/ffs/ffs_subr.c#2 integrate .. //depot/projects/ia64_epc/sys/ufs/ffs/ffs_vfsops.c#5 integrate .. //depot/projects/ia64_epc/sys/ufs/ffs/ffs_vnops.c#4 integrate .. //depot/projects/ia64_epc/sys/ufs/ufs/ufs_extattr.c#3 integrate .. //depot/projects/ia64_epc/sys/vm/pmap.h#3 integrate .. //depot/projects/ia64_epc/sys/vm/vm_map.c#4 integrate .. //depot/projects/ia64_epc/sys/vm/vm_map.h#3 integrate .. //depot/projects/ia64_epc/sys/vm/vm_object.c#4 integrate .. //depot/projects/ia64_epc/sys/vm/vm_page.c#4 integrate .. //depot/projects/ia64_epc/sys/vm/vm_pageout.c#2 integrate .. //depot/projects/ia64_epc/sys/vm/vnode_pager.c#3 integrate .. //depot/projects/ia64_epc/tools/KSE/rr/rr.c#2 integrate .. //depot/projects/ia64_epc/tools/tools/crypto/Makefile#2 integrate .. //depot/projects/ia64_epc/tools/tools/crypto/cryptostats.c#2 integrate .. //depot/projects/ia64_epc/tools/tools/crypto/hifnstats.c#1 branch .. //depot/projects/ia64_epc/tools/tools/crypto/ipsecstats.c#1 branch .. //depot/projects/ia64_epc/tools/tools/crypto/ubsecstats.c#1 branch .. //depot/projects/ia64_epc/tools/tools/tinderbox/tbmaster.pl#3 integrate .. //depot/projects/ia64_epc/tools/tools/tinderbox/tinderbox.pl#5 integrate .. //depot/projects/ia64_epc/usr.bin/awk/Makefile#2 integrate .. //depot/projects/ia64_epc/usr.bin/calendar/calendars/calendar.birthday#2 integrate .. //depot/projects/ia64_epc/usr.bin/calendar/calendars/calendar.freebsd#3 integrate .. //depot/projects/ia64_epc/usr.bin/calendar/calendars/calendar.history#3 integrate .. //depot/projects/ia64_epc/usr.bin/cksum/cksum.c#2 integrate .. //depot/projects/ia64_epc/usr.bin/cksum/crc.c#2 integrate .. //depot/projects/ia64_epc/usr.bin/cksum/crc32.c#2 integrate .. //depot/projects/ia64_epc/usr.bin/cksum/extern.h#2 integrate .. //depot/projects/ia64_epc/usr.bin/cksum/print.c#2 integrate .. //depot/projects/ia64_epc/usr.bin/cksum/sum1.c#2 integrate .. //depot/projects/ia64_epc/usr.bin/cksum/sum2.c#2 integrate .. //depot/projects/ia64_epc/usr.bin/fetch/fetch.1#3 integrate .. //depot/projects/ia64_epc/usr.bin/fetch/fetch.c#2 integrate .. //depot/projects/ia64_epc/usr.bin/file/file.1#2 integrate .. //depot/projects/ia64_epc/usr.bin/file/magic.5#2 integrate .. //depot/projects/ia64_epc/usr.bin/kdump/kdump.c#2 integrate .. //depot/projects/ia64_epc/usr.bin/su/su.c#2 integrate .. //depot/projects/ia64_epc/usr.bin/systat/iostat.c#3 integrate .. //depot/projects/ia64_epc/usr.bin/systat/vmstat.c#3 integrate .. //depot/projects/ia64_epc/usr.bin/uudecode/uudecode.c#4 integrate .. //depot/projects/ia64_epc/usr.bin/uuencode/uuencode.1#3 integrate .. //depot/projects/ia64_epc/usr.bin/uuidgen/uuidgen.1#2 integrate .. //depot/projects/ia64_epc/usr.bin/uuidgen/uuidgen.c#2 integrate .. //depot/projects/ia64_epc/usr.bin/vmstat/vmstat.c#3 integrate .. //depot/projects/ia64_epc/usr.sbin/Makefile#3 integrate .. //depot/projects/ia64_epc/usr.sbin/adduser/adduser.8#2 integrate .. //depot/projects/ia64_epc/usr.sbin/adduser/adduser.sh#3 integrate .. //depot/projects/ia64_epc/usr.sbin/btxld/Makefile#2 integrate .. //depot/projects/ia64_epc/usr.sbin/btxld/a.out.h#2 delete .. //depot/projects/ia64_epc/usr.sbin/btxld/btxld.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/btxld/elfh.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/ckdist/ckdist.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/crunch/crunchide/exec_elf32.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/gstat/Makefile#1 branch .. //depot/projects/ia64_epc/usr.sbin/gstat/gstat.c#1 branch .. //depot/projects/ia64_epc/usr.sbin/iostat/iostat.c#3 integrate .. //depot/projects/ia64_epc/usr.sbin/jail/jail.8#3 integrate .. //depot/projects/ia64_epc/usr.sbin/kgzip/elfhdr.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/kgzip/endian.h#1 branch .. //depot/projects/ia64_epc/usr.sbin/kgzip/i386_a.out.h#1 branch .. //depot/projects/ia64_epc/usr.sbin/kgzip/kgzcmp.c#3 integrate .. //depot/projects/ia64_epc/usr.sbin/mtree/compare.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/mtree/create.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/mtree/extern.h#2 integrate .. //depot/projects/ia64_epc/usr.sbin/mtree/mtree.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/mtree/verify.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/ofwdump/ofw_util.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/pccard/pccardd/readcis.c#3 integrate .. //depot/projects/ia64_epc/usr.sbin/setfmac/Makefile#2 integrate .. //depot/projects/ia64_epc/usr.sbin/setfmac/setfmac.8#2 integrate .. //depot/projects/ia64_epc/usr.sbin/setfmac/setfsmac.8#1 branch .. //depot/projects/ia64_epc/usr.sbin/sysinstall/menus.c#3 integrate .. //depot/projects/ia64_epc/usr.sbin/ypserv/Makefile.yp#2 integrate Differences ... ==== //depot/projects/ia64_epc/Makefile.inc1#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.325 2003/03/08 10:01:26 markm Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.326 2003/03/11 11:45:43 ru Exp $ # # Make command line options: # -DMAKE_KERBEROS5 to build Kerberos5 @@ -661,8 +661,9 @@ _elf2exe= usr.sbin/elf2exe .endif -.if ${TARGET_ARCH} == "i386" && ${MACHINE_ARCH} != "i386" +.if ${TARGET_ARCH} == "i386" _btxld= usr.sbin/btxld +_kgzip= usr.sbin/kgzip .endif .if ${TARGET_ARCH} == "sparc64" @@ -674,7 +675,7 @@ cross-tools: .for _tool in ${_btxld} ${_elf2aout} ${_elf2exe} \ gnu/usr.bin/binutils usr.sbin/crunch/crunchide \ - gnu/usr.bin/cc ${_xlint} + gnu/usr.bin/cc ${_xlint} ${_kgzip} ${ECHODIR} "===> ${_tool}"; \ cd ${.CURDIR}/${_tool}; \ ${MAKE} DIRPRFX=${_tool}/ obj; \ ==== //depot/projects/ia64_epc/bin/dd/args.c#3 (text+ko) ==== @@ -41,7 +41,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/dd/args.c,v 1.34 2003/02/27 18:04:54 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/dd/args.c,v 1.36 2003/03/15 13:34:48 ru Exp $"); #include @@ -189,7 +189,7 @@ res = get_num(arg); if (res < 1 || res > SSIZE_MAX) - errx(1, "bs must be between 1 and %d", SSIZE_MAX); + errx(1, "bs must be between 1 and %jd", (intmax_t)SSIZE_MAX); in.dbsz = out.dbsz = (size_t)res; } @@ -200,7 +200,7 @@ res = get_num(arg); if (res < 1 || res > SSIZE_MAX) - errx(1, "cbs must be between 1 and %d", SSIZE_MAX); + errx(1, "cbs must be between 1 and %jd", (intmax_t)SSIZE_MAX); cbsz = (size_t)res; } @@ -235,7 +235,8 @@ if (!(ddflags & C_BS)) { res = get_num(arg); if (res < 1 || res > SSIZE_MAX) - errx(1, "ibs must be between 1 and %zd", SSIZE_MAX); + errx(1, "ibs must be between 1 and %jd", + (intmax_t)SSIZE_MAX); in.dbsz = (size_t)res; } } @@ -255,7 +256,8 @@ if (!(ddflags & C_BS)) { res = get_num(arg); if (res < 1 || res > SSIZE_MAX) - errx(1, "obs must be between 1 and %zd", SSIZE_MAX); + errx(1, "obs must be between 1 and %jd", + (intmax_t)SSIZE_MAX); out.dbsz = (size_t)res; } } ==== //depot/projects/ia64_epc/bin/sh/expand.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.41 2003/01/08 10:50:08 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.42 2003/03/15 07:56:59 ru Exp $"); #include #include @@ -531,7 +531,7 @@ outfmt(&errout, "%s\n", startp); error((char *)NULL); } - error("%.*s: parameter %snot set", p - str - 1, + error("%.*s: parameter %snot set", (int)(p - str - 1), str, (varflags & VSNUL) ? "null or " : nullstr); return 0; @@ -666,7 +666,8 @@ case VSTRIMRIGHT: case VSTRIMRIGHTMAX: case VSLENGTH: - error("%.*s: parameter not set", p - var - 1, var); + error("%.*s: parameter not set", (int)(p - var - 1), + var); } } if (set && subtype != VSPLUS) { ==== //depot/projects/ia64_epc/bin/sh/jobs.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.62 2003/01/27 07:41:12 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.63 2003/03/17 11:28:56 tjr Exp $"); #include #include @@ -740,6 +740,7 @@ TRACE(("forkshell(%%%d, 0x%lx, %d) called\n", jp - jobtab, (long)n, mode)); INTOFF; + flushall(); pid = fork(); if (pid == -1) { TRACE(("Fork failed, errno=%d\n", errno)); ==== //depot/projects/ia64_epc/contrib/cvs/src/parseinfo.c#2 (text+ko) ==== @@ -4,6 +4,8 @@ * * You may distribute under the terms of the GNU General Public License as * specified in the README file that comes with the CVS source distribution. + * + * $FreeBSD: src/contrib/cvs/src/parseinfo.c,v 1.2 2003/03/20 11:05:48 des Exp $ */ #include "cvs.h" @@ -340,6 +342,25 @@ goto error_return; } } + else if (strcmp (line, "tag") == 0) { + RCS_setlocalid(p); + } + else if (strcmp (line, "umask") == 0) { + cvsumask = (mode_t)(strtol(p, NULL, 8) & 0777); + } + else if (strcmp (line, "dlimit") == 0) { +#ifdef BSD +#include + struct rlimit rl; + + if (getrlimit(RLIMIT_DATA, &rl) != -1) { + rl.rlim_cur = atoi(p); + rl.rlim_cur *= 1024; + + (void) setrlimit(RLIMIT_DATA, &rl); + } +#endif /* BSD */ + } else if (strcmp (line, "PreservePermissions") == 0) { if (strcmp (p, "no") == 0) ==== //depot/projects/ia64_epc/contrib/gcc/config/rs6000/sysv4.h#2 (text+ko) ==== @@ -20,8 +20,6 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/gcc/config/rs6000/sysv4.h,v 1.5 2003/02/10 06:05:38 kan Exp $ */ - /* Yes! We are ELF. */ #define TARGET_OBJECT_FORMAT OBJECT_ELF @@ -1209,7 +1207,7 @@ /* FreeBSD support. */ #define CPP_OS_FREEBSD_SPEC "\ - -D__PPC__ -D__ppc__ -D__PowerPC__ -D__powerpc__ -D__ELF__ \ + -D__PPC__ -D__ppc__ -D__PowerPC__ -D__powerpc__ \ -Acpu=powerpc -Amachine=powerpc" #define STARTFILE_FREEBSD_SPEC FBSD_STARTFILE_SPEC ==== //depot/projects/ia64_epc/contrib/gcc/ifcvt.c#2 (text+ko) ==== @@ -1934,9 +1934,10 @@ is more than one remaining edge, it must come from elsewhere. There may be zero incoming edges if the THEN block didn't actually join back up (as with a call to abort). */ - else if ((join_bb->pred == NULL - || join_bb->pred->pred_next == NULL) - && join_bb != EXIT_BLOCK_PTR) + else if ((join_bb->pred == NULL || join_bb->pred->pred_next == NULL) + && join_bb != EXIT_BLOCK_PTR + && (NEXT_INSN(combo_bb->end) == join_bb->head + || GET_CODE(NEXT_INSN(combo_bb->end)) != CODE_LABEL)) { /* We can merge the JOIN. */ if (life_data_ok) ==== //depot/projects/ia64_epc/contrib/gdb/gdb/config/ia64/tm-ia64.h#2 (text+ko) ==== @@ -21,6 +21,8 @@ #ifndef TM_IA64_H #define TM_IA64_H +#include "regcache.h" + #if !defined(GDBSERVER) #define GDB_MULTI_ARCH 1 ==== //depot/projects/ia64_epc/contrib/gdb/gdb/defs.h#2 (text+ko) ==== @@ -1027,6 +1027,8 @@ extern char *savestring (const char *, size_t); +extern char *tilde_expand (const char *); + extern char *msavestring (void *, const char *, size_t); extern char *mstrsave (void *, const char *); ==== //depot/projects/ia64_epc/contrib/gdb/gdb/ia64-tdep.c#2 (text+ko) ==== @@ -79,9 +79,11 @@ #define BUNDLE_LEN 16 +#ifdef __linux__ /* FIXME: These extern declarations should go in ia64-tdep.h. */ extern CORE_ADDR ia64_linux_sigcontext_register_address (CORE_ADDR, int); extern CORE_ADDR ia64_aix_sigcontext_register_address (CORE_ADDR, int); +#endif static gdbarch_init_ftype ia64_gdbarch_init; @@ -2106,12 +2108,15 @@ native_find_global_pointer is nonzero to indicate that we're on AIX is kind of hokey, but I can't think of a better way to do it. */ +#ifdef __linux__ if (os_ident == ELFOSABI_LINUX) tdep->sigcontext_register_address = ia64_linux_sigcontext_register_address; else if (native_find_global_pointer != 0) tdep->sigcontext_register_address = ia64_aix_sigcontext_register_address; else +#else tdep->sigcontext_register_address = 0; +#endif /* We know that GNU/Linux won't have to resort to the native_find_global_pointer hackery. But that's the only one we ==== //depot/projects/ia64_epc/contrib/isc-dhcp/client/dhclient.8#2 (text+ko) ==== @@ -20,7 +20,7 @@ .\" .\" Portions copyright (c) 2000 David E. O'Brien. .\" All rights reserved. -.\" $FreeBSD: src/contrib/isc-dhcp/client/dhclient.8,v 1.12 2003/01/16 07:28:12 obrien Exp $ +.\" $FreeBSD: src/contrib/isc-dhcp/client/dhclient.8,v 1.13 2003/03/18 19:46:55 obrien Exp $ .\" .TH dhclient 8 .SH NAME @@ -41,6 +41,9 @@ .B -q ] [ +.B -v +] +[ .B -1 ] [ @@ -204,6 +207,10 @@ .B -q flag prevents any messages other than errors from being printed to the standard error descriptor. +.B -v +flag turns on all messages. +Opposite of +.B -q . .PP The client normally doesn't release the current lease as it is not required by the DHCP protocol. Some cable ISPs require their clients ==== //depot/projects/ia64_epc/contrib/isc-dhcp/client/dhclient.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ #ifndef lint static char ocopyright[] = "$Id: dhclient.c,v 1.129.2.12 2002/11/07 23:26:38 dhankins Exp $ Copyright (c) 1995-2002 Internet Software Consortium. All rights reserved.\n" -"$FreeBSD: src/contrib/isc-dhcp/client/dhclient.c,v 1.23 2003/01/15 10:44:05 murray Exp $\n"; +"$FreeBSD: src/contrib/isc-dhcp/client/dhclient.c,v 1.24 2003/03/18 19:46:55 obrien Exp $\n"; #endif /* not lint */ #include "dhcpd.h" @@ -185,6 +185,9 @@ } else if (!strcmp (argv [i], "-q")) { quiet = 1; quiet_interface_discovery = 1; + } else if (!strcmp (argv [i], "-v")) { + quiet = 0; + quiet_interface_discovery = 0; } else if (!strcmp (argv [i], "-s")) { if (++i == argc) usage (); ==== //depot/projects/ia64_epc/contrib/one-true-awk/FIXES#2 (text+ko) ==== @@ -25,6 +25,21 @@ This file lists all bug fixes, changes, etc., made since the AWK book was sent to the printers in August, 1987. +Mar 14, 2003: + the internationalization changes, somewhat modified, are now + reinstated. in theory awk will now do character comparisons + and case conversions in national language, but "." will always + be the decimal point separator on input and output regardless + of national language. isblank(){} has an #ifndef. + + this no longer compiles on windows: LC_MESSAGES isn't defined + in vc6++. + + fixed subtle behavior in field and record splitting: if FS is + a single character and RS is not empty, \n is NOT a separator. + this tortuous reading is found in the awk book; behavior now + matches gawk and mawk. + 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, ==== //depot/projects/ia64_epc/contrib/one-true-awk/README#2 (text+ko) ==== @@ -72,8 +72,14 @@ *if* you provide versions of popen and pclose. The file missing95.c contains versions that can be used to get started with, though the underlying support has mysterious properties, -the symptom of which can be truncated pipe output. Beware. -The file makefile.win gives hints on how to proceed. +the symptom of which can be truncated pipe output. Beware. The +file makefile.win gives hints on how to proceed; if you run +vcvars32.bat, it will set up necessary paths and parameters so +you can subsequently run nmake -f makefile.win. Beware also that +when running on Windows under command.com, various quoting +conventions are different from Unix systems: single quotes won't +work around arguments, and various characters like % are +interpreted within double quotes. This compiles without change on Macintosh OS X using gcc and the standard developer tools. ==== //depot/projects/ia64_epc/contrib/one-true-awk/b.c#2 (text+ko) ==== @@ -282,9 +282,24 @@ 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; @@ -303,15 +318,18 @@ c2 = *p++; if (c2 == '\\') c2 = quoted((char **) &p); - if (c > c2) { /* empty; ignore */ + if (collate_range_cmp(c, c2) > 0) { /* empty; ignore */ bp--; i--; continue; } - while (c < c2) { + for (j = 0; j < NCHARS; j++) { + if ((collate_range_cmp(c, j) > 0) || + collate_range_cmp(j, c2) > 0) + continue; if (!adjbuf((char **) &buf, &bufsz, bp-buf+2, 100, (char **) &bp, 0)) FATAL("out of space for character class [%.10s...] 2", p); - *bp++ = ++c; + *bp++ = j; i++; } continue; @@ -695,23 +713,39 @@ * relex(), the expanded character class (prior to range expansion) * must be less than twice the size of their full name. */ + +/* Because isblank doesn't show up in any of the header files on any + * system i use, it's defined here. if some other locale has a richer + * definition of "blank", define HAS_ISBLANK and provide your own + * version. + */ + +#ifndef HAS_ISBLANK + +int isblank(int c) +{ + return c==' ' || c=='\t'; +} + +#endif + struct charclass { const char *cc_name; int cc_namelen; - const char *cc_expand; + int (*cc_func)(int); } charclasses[] = { - { "alnum", 5, "0-9A-Za-z" }, >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Mar 22 10:20:41 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 979E237B404; Sat, 22 Mar 2003 10:20:39 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4B06237B401 for ; Sat, 22 Mar 2003 10:20:39 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D79F843FD7 for ; Sat, 22 Mar 2003 10:20:38 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h2MIKc0U068011 for ; Sat, 22 Mar 2003 10:20:38 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2MIKcFt068008 for perforce@freebsd.org; Sat, 22 Mar 2003 10:20:38 -0800 (PST) Date: Sat, 22 Mar 2003 10:20:38 -0800 (PST) Message-Id: <200303221820.h2MIKcFt068008@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler Subject: PERFORCE change 27238 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=27238 Change 27238 by sam@sam_ebb on 2003/03/22 10:20:01 remove M_* workaround Affected files ... .. //depot/projects/em/if_em.c#5 edit Differences ... ==== //depot/projects/em/if_em.c#5 (text+ko) ==== @@ -35,10 +35,6 @@ #include -#ifndef M_DONTWAIT -#define M_DONTWAIT M_NOWAIT /* XXX temporary workaround */ -#endif - /********************************************************************* * Set this to one to display debug statistics *********************************************************************/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Mar 22 18:58: 8 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 325F137B404; Sat, 22 Mar 2003 18:58:04 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D619B37B401 for ; Sat, 22 Mar 2003 18:58:03 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 77A5143FA3 for ; Sat, 22 Mar 2003 18:58:03 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h2N2w30U017777 for ; Sat, 22 Mar 2003 18:58:03 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2N2w3O9017774 for perforce@freebsd.org; Sat, 22 Mar 2003 18:58:03 -0800 (PST) Date: Sat, 22 Mar 2003 18:58:03 -0800 (PST) Message-Id: <200303230258.h2N2w3O9017774@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 27243 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=27243 Change 27243 by rwatson@rwatson_paprika on 2003/03/22 18:57:46 Apply the cmask to nfs_mnod(). Note that due to the semantics of the vap->nfsattr conversion macro for NFSv3, we have to modify caller-owned vap memory, which is unfortunate. Affected files ... .. //depot/projects/trustedbsd/acl/sys/nfsclient/nfs_vnops.c#5 edit Differences ... ==== //depot/projects/trustedbsd/acl/sys/nfsclient/nfs_vnops.c#5 (text+ko) ==== @@ -1184,7 +1184,7 @@ */ static int nfs_mknodrpc(struct vnode *dvp, struct vnode **vpp, struct componentname *cnp, - struct vattr *vap) + struct vattr *vap, int cmask) { struct nfsv2_sattr *sp; u_int32_t *tl; @@ -1197,6 +1197,12 @@ u_int32_t rdev; int v3 = NFS_ISV3(dvp); + /* + * XXXACL: This changes the value in vap, which is caller-owned + * memory. Unfortunately, nfsm_v3attrbuild accepts a full + * vattr, not just the elements. + */ + vap->va_mode &= ~cmask; if (vap->va_type == VCHR || vap->va_type == VBLK) rdev = txdr_unsigned(vap->va_rdev); else if (vap->va_type == VFIFO || vap->va_type == VSOCK) @@ -1273,7 +1279,8 @@ nfs_mknod(struct vop_mknod_args *ap) { - return nfs_mknodrpc(ap->a_dvp, ap->a_vpp, ap->a_cnp, ap->a_vap); + return nfs_mknodrpc(ap->a_dvp, ap->a_vpp, ap->a_cnp, ap->a_vap, + ap->a_cmask); } static u_long create_verf; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Mar 22 19: 3:17 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BC73737B405; Sat, 22 Mar 2003 19:03:11 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3C53337B404 for ; Sat, 22 Mar 2003 19:03:11 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6A7CF43FAF for ; Sat, 22 Mar 2003 19:03:10 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h2N33A0U019226 for ; Sat, 22 Mar 2003 19:03:10 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2N3394l019223 for perforce@freebsd.org; Sat, 22 Mar 2003 19:03:09 -0800 (PST) Date: Sat, 22 Mar 2003 19:03:09 -0800 (PST) Message-Id: <200303230303.h2N3394l019223@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 27244 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=27244 Change 27244 by rwatson@rwatson_paprika on 2003/03/22 19:02:15 More file systems updated to handle new cmask semantics for vop_mknod(). Affected files ... .. //depot/projects/trustedbsd/acl/sys/coda/coda_vnops.c#4 edit .. //depot/projects/trustedbsd/acl/sys/fs/devfs/devfs_vnops.c#4 edit .. //depot/projects/trustedbsd/acl/sys/fs/fifofs/fifo_vnops.c#4 edit .. //depot/projects/trustedbsd/acl/sys/fs/unionfs/union_vnops.c#4 edit .. //depot/projects/trustedbsd/acl/sys/gnu/ext2fs/ext2_vnops.c#4 edit Differences ... ==== //depot/projects/trustedbsd/acl/sys/coda/coda_vnops.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/acl/sys/fs/devfs/devfs_vnops.c#4 (text+ko) ==== @@ -458,6 +458,7 @@ struct vnode **a_vpp; struct componentname *a_cnp; struct vattr *a_vap; + int a_cmask; }; */ { @@ -729,6 +730,7 @@ struct devfs_dirent *de; struct vattr *vap; struct vnode *vp; + u_short mode; int c, error; uid_t uid; gid_t gid; @@ -746,6 +748,7 @@ (vap->va_gen != VNOVAL)) { return (EINVAL); } + mode = vap->va_mode &~ ap->a_cmask; de = vp->v_data; if (vp->v_type == VDIR) @@ -770,11 +773,11 @@ c = 1; } - if (vap->va_mode != (mode_t)VNOVAL) { + if (mode != (mode_t)VNOVAL) { if ((ap->a_cred->cr_uid != de->de_uid) && (error = suser_cred(ap->a_td->td_ucred, PRISON_ROOT))) return (error); - de->de_mode = vap->va_mode; + de->de_mode = mode; c = 1; } ==== //depot/projects/trustedbsd/acl/sys/fs/fifofs/fifo_vnops.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/acl/sys/fs/unionfs/union_vnops.c#4 (text+ko) ==== @@ -692,6 +692,7 @@ struct vnode **a_vpp; struct componentname *a_cnp; struct vattr *a_vap; + int a_cmask; } */ *ap; { struct union_node *dun = VTOUNION(ap->a_dvp); ==== //depot/projects/trustedbsd/acl/sys/gnu/ext2fs/ext2_vnops.c#4 (text+ko) ==== @@ -83,7 +83,7 @@ #include #include -static int ext2_makeinode(int mode, struct vnode *, struct vnode **, struct componentname *); +static int ext2_makeinode(int mode, int cmask, struct vnode *, struct vnode **, struct componentname *); static int ext2_access(struct vop_access_args *); static int ext2_advlock(struct vop_advlock_args *); @@ -283,13 +283,11 @@ int a_cmask; } */ *ap; { - u_short mode; int error; - mode = ap->a_vap->va_mode &~ ap->a_cmask; error = - ext2_makeinode(MAKEIMODE(ap->a_vap->va_type, mode), ap->a_dvp, - ap->a_vpp, ap->a_cnp); + ext2_makeinode(MAKEIMODE(ap->a_vap->va_type, ap->a_mode), + ap->a_cmask, ap->a_dvp, ap->a_vpp, ap->a_cnp); if (error) return (error); return (0); @@ -698,6 +696,7 @@ struct vnode **a_vpp; struct componentname *a_cnp; struct vattr *a_vap; + int a_cmask; } */ *ap; { struct vattr *vap = ap->a_vap; @@ -707,7 +706,7 @@ int error; error = ext2_makeinode(MAKEIMODE(vap->va_type, vap->va_mode), - ap->a_dvp, vpp, ap->a_cnp); + ap->a_cmask, ap->a_dvp, vpp, ap->a_cnp); if (error) return (error); ip = VTOI(*vpp); @@ -1188,6 +1187,7 @@ struct vnode **a_vpp; struct componentname *a_cnp; struct vattr *a_vap; + int a_cmask; } */ *ap; { struct vnode *dvp = ap->a_dvp; @@ -1207,7 +1207,7 @@ error = EMLINK; goto out; } - dmode = vap->va_mode & 0777; + dmode = vap->va_mode & 0777 &~ ap->a_cmask; dmode |= IFDIR; /* * Must simulate part of ext2_makeinode here to acquire the inode, @@ -1779,8 +1779,9 @@ * Allocate a new inode. */ static int -ext2_makeinode(mode, dvp, vpp, cnp) +ext2_makeinode(mode, cmask, dvp, vpp, cnp) int mode; + int cmask; struct vnode *dvp; struct vnode **vpp; struct componentname *cnp; @@ -1789,6 +1790,11 @@ struct vnode *tvp; int error; + /* + * XXXACL: If and when we support ext2fs ACLs, the new object mode + * will need to be calculated using the ACL_MASK entry also. + */ + mode &= ~cmask; pdir = VTOI(dvp); #ifdef DIAGNOSTIC if ((cnp->cn_flags & HASBUF) == 0) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Mar 22 19: 7:20 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9580937B404; Sat, 22 Mar 2003 19:07:17 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3431B37B401 for ; Sat, 22 Mar 2003 19:07:17 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C989543F75 for ; Sat, 22 Mar 2003 19:07:16 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h2N37G0U019473 for ; Sat, 22 Mar 2003 19:07:16 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2N37GB9019470 for perforce@freebsd.org; Sat, 22 Mar 2003 19:07:16 -0800 (PST) Date: Sat, 22 Mar 2003 19:07:16 -0800 (PST) Message-Id: <200303230307.h2N37GB9019470@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 27246 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=27246 Change 27246 by rwatson@rwatson_paprika on 2003/03/22 19:06:15 Adapt ufs_create() and ufs_mknod() for new cmask semantics; don't permit ACL override of the umask yet since I haven't decided how best to re-mix ufs_makeinode(), etc. Affected files ... .. //depot/projects/trustedbsd/acl/sys/ufs/ufs/ufs_vnops.c#3 edit Differences ... ==== //depot/projects/trustedbsd/acl/sys/ufs/ufs/ufs_vnops.c#3 (text+ko) ==== @@ -190,13 +190,19 @@ struct vnode **a_vpp; struct componentname *a_cnp; struct vattr *a_vap; + int a_cmask; } */ *ap; { + u_short mode; int error; + /* + * XXXACL: No ACL umask override here yet. + */ + mode = ap->a_vap->va_mode &~ ap->a_cmask; error = - ufs_makeinode(MAKEIMODE(ap->a_vap->va_type, ap->a_vap->va_mode), - ap->a_dvp, ap->a_vpp, ap->a_cnp); + ufs_makeinode(MAKEIMODE(ap->a_vap->va_type, mode), ap->a_dvp, + ap->a_vpp, ap->a_cnp); if (error) return (error); VN_KNOTE(ap->a_dvp, NOTE_WRITE); @@ -214,16 +220,22 @@ struct vnode **a_vpp; struct componentname *a_cnp; struct vattr *a_vap; + int a_cmask; } */ *ap; { struct vattr *vap = ap->a_vap; struct vnode **vpp = ap->a_vpp; struct inode *ip; + u_short mode; ino_t ino; int error; - error = ufs_makeinode(MAKEIMODE(vap->va_type, vap->va_mode), - ap->a_dvp, vpp, ap->a_cnp); + /* + * XXXACL: No ACL umask override here yet. + */ + mode = vap->va_mode &~ ap->a_cmask; + error = ufs_makeinode(MAKEIMODE(vap->va_type, mode), ap->a_dvp, vpp, + ap->a_cnp); if (error) return (error); VN_KNOTE(ap->a_dvp, NOTE_WRITE); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message