Date: Thu, 3 Oct 2002 18:16:02 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 18629 for review Message-ID: <200210040116.g941G2dQ004593@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=18629 Change 18629 by peter@peter_daintree on 2002/10/03 18:16:01 IFC @18627 Affected files ... .. //depot/projects/ia64/etc/rc#19 integrate .. //depot/projects/ia64/include/string.h#7 integrate .. //depot/projects/ia64/lib/libc/string/Makefile.inc#5 integrate .. //depot/projects/ia64/lib/libc/string/stpcpy.c#1 branch .. //depot/projects/ia64/lib/libc/string/strcpy.3#5 integrate .. //depot/projects/ia64/lib/libc/string/string.3#2 integrate .. //depot/projects/ia64/lib/libopie/Makefile#4 integrate .. //depot/projects/ia64/lib/libz/minigzip.c#4 integrate .. //depot/projects/ia64/sbin/newfs_msdos/newfs_msdos.c#5 integrate .. //depot/projects/ia64/share/man/man5/utmp.5#5 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_da.c#18 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_pcib.c#13 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_resource.c#5 integrate .. //depot/projects/ia64/sys/ia64/ia64/clock.c#10 integrate .. //depot/projects/ia64/sys/ia64/ia64/interrupt.c#16 integrate .. //depot/projects/ia64/sys/ia64/ia64/machdep.c#49 integrate .. //depot/projects/ia64/sys/ia64/ia64/mp_machdep.c#22 integrate .. //depot/projects/ia64/sys/ia64/ia64/trap.c#35 integrate .. //depot/projects/ia64/sys/ia64/ia64/vm_machdep.c#14 integrate .. //depot/projects/ia64/sys/nfsserver/nfs_serv.c#11 integrate .. //depot/projects/ia64/sys/sys/dmap.h#2 integrate .. //depot/projects/ia64/sys/sys/types.h#19 integrate .. //depot/projects/ia64/usr.bin/minigzip/minigzip.1#3 integrate Differences ... ==== //depot/projects/ia64/etc/rc#19 (text+ko) ==== @@ -25,7 +25,7 @@ # SUCH DAMAGE. # # @(#)rc 5.27 (Berkeley) 6/5/91 -# $FreeBSD: src/etc/rc,v 1.320 2002/10/02 00:59:14 dd Exp $ +# $FreeBSD: src/etc/rc,v 1.321 2002/10/03 20:39:29 schweikh Exp $ # # System startup script run by init on autoboot @@ -54,10 +54,10 @@ # XXX - The only purpose of duplicating it here is to catch rc_ng="YES" # if [ -r /etc/defaults/rc.conf ]; then - . /etc/defaults/rc.conf - source_rc_confs + . /etc/defaults/rc.conf + source_rc_confs elif [ -r /etc/rc.conf ]; then - . /etc/rc.conf + . /etc/rc.conf fi # Diskless setups have to depend on a different mechanism since @@ -75,9 +75,9 @@ load_rc_config 'XXX' if [ "$1" = autoboot ]; then - autoboot=yes + autoboot=yes _boot="faststart" - rc_fast=yes # run_rc_command(): do fast booting + rc_fast=yes # run_rc_command(): do fast booting else autoboot=no _boot="start" @@ -87,7 +87,7 @@ files=`rcorder -k ${os} -s nostart /etc/rc.d/* 2>/dev/null` for _rc_elem in ${files}; do - run_rc_script ${_rc_elem} ${_boot} + run_rc_script ${_rc_elem} ${_boot} # Local FreeBSD hack to reload the rc.conf on # a return status of 2 if [ $? -eq 2 ]; then @@ -158,12 +158,12 @@ [Yy][Ee][Ss]) case ${dep_val} in [Yy][Ee][Ss]) - ;; + ;; *) - eval ${dep_var}="YES" - echo "DEPENDENCY NOTE: ${dep} will be enabled" \ - "to support ${svc}" - ;; + eval ${dep_var}="YES" + echo "DEPENDENCY NOTE: ${dep} will be enabled" \ + "to support ${svc}" + ;; esac ;; esac @@ -545,10 +545,10 @@ fi case "`mount -d -a -t ${fstype}`" in *mount_${fstype}*) - echo -n "Mounting ${fsdecr} filesystems:" - mount -a -t ${fstype} - echo '.' - ;; + echo -n "Mounting ${fsdecr} filesystems:" + mount -a -t ${fstype} + echo '.' + ;; esac done ==== //depot/projects/ia64/include/string.h#7 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)string.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/include/string.h,v 1.15 2002/08/21 16:19:55 mike Exp $ + * $FreeBSD: src/include/string.h,v 1.16 2002/10/03 19:51:04 obrien Exp $ */ #ifndef _STRING_H_ @@ -68,6 +68,7 @@ int strcmp(const char *, const char *); int strcoll(const char *, const char *); char *strcpy(char * __restrict, const char * __restrict); +char *stpcpy(char *, const char *); size_t strcspn(const char *, const char *); char *strerror(int); size_t strlen(const char *); ==== //depot/projects/ia64/lib/libc/string/Makefile.inc#5 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/string/Makefile.inc,v 1.29 2002/09/07 08:16:57 tjr Exp $ +# $FreeBSD: src/lib/libc/string/Makefile.inc,v 1.30 2002/10/03 19:39:20 obrien Exp $ .PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/string ${.CURDIR}/../libc/string @@ -7,8 +7,8 @@ # machine-independent string sources MISRCS+=bcmp.c bcopy.c bzero.c ffs.c index.c memccpy.c memchr.c memcmp.c \ - memcpy.c memmove.c memset.c rindex.c strcasecmp.c strcat.c strchr.c \ - strcmp.c strcoll.c strcpy.c strcspn.c strdup.c strerror.c \ + memcpy.c memmove.c memset.c rindex.c stpcpy.c strcasecmp.c strcat.c \ + strchr.c strcmp.c strcoll.c strcpy.c strcspn.c strdup.c strerror.c \ strlcat.c strlcpy.c strlen.c strmode.c strncat.c strncmp.c strncpy.c \ strcasestr.c strnstr.c \ strpbrk.c strrchr.c strsep.c strsignal.c strspn.c strstr.c strtok.c \ @@ -34,6 +34,7 @@ MLINKS+=strcasecmp.3 strncasecmp.3 MLINKS+=strcat.3 strncat.3 MLINKS+=strcmp.3 strncmp.3 +MLINKS+=strcpy.3 stpcpy.3 MLINKS+=strcpy.3 strncpy.3 MLINKS+=strerror.3 perror.3 strerror.3 sys_errlist.3 strerror.3 sys_nerr.3 MLINKS+=strerror.3 strerror_r.3 ==== //depot/projects/ia64/lib/libc/string/strcpy.3#5 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)strcpy.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/string/strcpy.3,v 1.17 2002/09/06 11:24:06 tjr Exp $ +.\" $FreeBSD: src/lib/libc/string/strcpy.3,v 1.18 2002/10/03 19:39:20 obrien Exp $ .\" .Dd August 9, 2001 .Dt STRCPY 3 @@ -47,11 +47,14 @@ .Sh SYNOPSIS .In string.h .Ft char * +.Fn stpcpy "char *dst" "const char *src" +.Ft char * .Fn strcpy "char * restrict dst" "const char * restrict src" .Ft char * .Fn strncpy "char * restrict dst" "const char * restrict src" "size_t len" .Sh DESCRIPTION The +.Fn stpcpy , .Fn strcpy function copies the string @@ -89,6 +92,12 @@ functions return .Fa dst . +The +.Fn stpcpy +function returns a pointer to the terminating +.Ql \e0 +character of +.Fa dst . .Sh EXAMPLES The following sets .Va chararray @@ -178,3 +187,14 @@ functions conform to .St -isoC . +The +.Fn stpcpy +function is an MS-DOS and GNUism. +.Fn stpcpy +conforms to no standard. +.Sh HISTORY +The +.Fn stpcpy +function first appeared in +.Fx 4.4 , +comming from 1998-ventage Linux. ==== //depot/projects/ia64/lib/libc/string/string.3#2 (text+ko) ==== @@ -32,12 +32,13 @@ .\" SUCH DAMAGE. .\" .\" @(#)string.3 8.2 (Berkeley) 12/11/93 -.\" $FreeBSD: src/lib/libc/string/string.3,v 1.11 2001/10/01 16:09:00 ru Exp $ +.\" $FreeBSD: src/lib/libc/string/string.3,v 1.12 2002/10/03 19:39:20 obrien Exp $ .\" .Dd December 11, 1993 .Dt STRING 3 .Os .Sh NAME +.Nm stpcpy , .Nm strcat , .Nm strncat , .Nm strchr , @@ -64,6 +65,8 @@ .Sh SYNOPSIS .In string.h .Ft char * +.Fn stpcpy "char *dst" "const char *src" +.Ft char * .Fn strcat "char *s" "const char * append" .Ft char * .Fn strncat "char *s" "const char *append" "size_t count" @@ -120,6 +123,7 @@ .Xr bstring 3 , .Xr index 3 , .Xr rindex 3 , +.Xr stpcpy 3 , .Xr strcasecmp 3 , .Xr strcat 3 , .Xr strchr 3 , ==== //depot/projects/ia64/lib/libopie/Makefile#4 (text+ko) ==== @@ -1,6 +1,6 @@ # Makefile for libopie # -# $FreeBSD: src/lib/libopie/Makefile,v 1.16 2002/09/28 00:25:30 peter Exp $ +# $FreeBSD: src/lib/libopie/Makefile,v 1.17 2002/10/04 00:24:31 peter Exp $ # OPIE_DIST?= ${.CURDIR}/../../contrib/opie DIST_DIR= ${OPIE_DIST}/${.CURDIR:T} ==== //depot/projects/ia64/lib/libz/minigzip.c#4 (text+ko) ==== @@ -14,7 +14,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libz/minigzip.c,v 1.12 2002/08/01 11:29:05 markm Exp $"); +__FBSDID("$FreeBSD: src/lib/libz/minigzip.c,v 1.13 2002/10/03 19:30:21 johan Exp $"); #include <stdio.h> #include "zlib.h" @@ -271,7 +271,8 @@ /* =========================================================================== - * Usage: minigzip [-d] [-f] [-h] [-1 to -9] [files...] + * Usage: minigzip [-c ] [-d] [-f] [-h] [-1 to -9] [files...] + * -c : write to standard output * -d : decompress * -f : compress with Z_FILTERED * -h : compress with Z_HUFFMAN_ONLY @@ -282,6 +283,7 @@ int argc; char *argv[]; { + int copyout = 0; int uncompr = 0; gzFile file; char *bname, outmode[20]; @@ -296,12 +298,14 @@ bname = argv[0]; argc--, argv++; - if (!strcmp(bname, "gunzip") || !strcmp(bname, "zcat")) + if (!strcmp(bname, "gunzip")) uncompr = 1; + else if (!strcmp(bname, "zcat")) + copyout = uncompr = 1; while (argc > 0) { if (strcmp(*argv, "-c") == 0) - ; /* Just for compatibility with gzip */ + copyout = 1; else if (strcmp(*argv, "-d") == 0) uncompr = 1; else if (strcmp(*argv, "-f") == 0) @@ -328,11 +332,36 @@ gz_compress(stdin, file); } } else { + if (copyout) { + SET_BINARY_MODE(stdout); + } do { if (uncompr) { - file_uncompress(*argv); + if (copyout) { + file = gzopen(*argv, "rb"); + if (file == NULL) + fprintf(stderr, "%s: can't gzopen %s\n", prog, *argv); + else + gz_uncompress(file, stdout); + } else { + file_uncompress(*argv); + } } else { - file_compress(*argv, outmode); + if (copyout) { + FILE * in = fopen(*argv, "rb"); + + if (in == NULL) { + perror(*argv); + } else { + file = gzdopen(fileno(stdout), outmode); + if (file == NULL) error("can't gzdopen stdout"); + + gz_compress(in, file); + } + + } else { + file_compress(*argv, outmode); + } } } while (argv++, --argc); } ==== //depot/projects/ia64/sbin/newfs_msdos/newfs_msdos.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sbin/newfs_msdos/newfs_msdos.c,v 1.17 2002/08/21 18:11:32 trhodes Exp $"; + "$FreeBSD: src/sbin/newfs_msdos/newfs_msdos.c,v 1.18 2002/10/04 00:29:26 peter Exp $"; #endif /* not lint */ #include <sys/param.h> ==== //depot/projects/ia64/share/man/man5/utmp.5#5 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)utmp.5 8.2 (Berkeley) 3/17/94 -.\" $FreeBSD: src/share/man/man5/utmp.5,v 1.18 2001/11/21 11:36:23 ru Exp $ +.\" $FreeBSD: src/share/man/man5/utmp.5,v 1.19 2002/10/04 00:25:50 peter Exp $ .\" .Dd November 14, 2001 .Dt UTMP 5 ==== //depot/projects/ia64/sys/cam/scsi/scsi_da.c#18 (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.110 2002/10/01 15:42:04 sobomax Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.111 2002/10/03 19:59:24 ken Exp $ */ #ifdef _KERNEL @@ -276,14 +276,14 @@ {T_DIRECT, SIP_MEDIA_REMOVABLE, "Sony", "Sony DSC", "*"}, /*quirks*/ DA_Q_NO_6_BYTE|DA_Q_NO_SYNC_CACHE }, - { + { /* * Maxtor 3000LE USB Drive */ {T_DIRECT, SIP_MEDIA_FIXED, "MAXTOR*", "K040H2*", "*"}, /*quirks*/ DA_Q_NO_6_BYTE }, - { + { /* * LaCie USB drive, among others */ @@ -298,7 +298,8 @@ /* * Microtech USB CameraMate */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "eUSB Compact*", "Compact Flash*", "*"}, + {T_DIRECT, SIP_MEDIA_REMOVABLE, "eUSB Compact*", + "Compact Flash*", "*"}, /*quirks*/ DA_Q_NO_6_BYTE|DA_Q_NO_SYNC_CACHE }, { @@ -342,7 +343,8 @@ /* * FujiFilm Camera */ - {T_DIRECT, SIP_MEDIA_REMOVABLE, "FUJIFILMUSB-DRIVEUNIT", "USB-DRIVEUNIT", "*"}, + {T_DIRECT, SIP_MEDIA_REMOVABLE, "FUJIFILMUSB-DRIVEUNIT", + "USB-DRIVEUNIT", "*"}, /*quirks*/ DA_Q_NO_6_BYTE|DA_Q_NO_SYNC_CACHE }, { ==== //depot/projects/ia64/sys/dev/acpica/acpi_pcib.c#13 (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/dev/acpica/acpi_pcib.c,v 1.25 2002/09/23 18:14:30 jhb Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_pcib.c,v 1.27 2002/10/04 00:33:46 peter Exp $ */ #include "opt_acpi.h" #include <sys/param.h> @@ -72,7 +72,8 @@ status = AcpiGetIrqRoutingTable(acpi_get_handle(dev), prt); if (ACPI_FAILURE(status)) /* This is not an error, but it may reduce functionality. */ - device_printf(dev, "could not get PCI interrupt routing table for %s - %s\n", + device_printf(dev, + "could not get PCI interrupt routing table for %s - %s\n", acpi_name(acpi_get_handle(dev)), AcpiFormatException(status)); /* @@ -204,8 +205,10 @@ AcpiFormatException(status)); /* this is not fatal, since it may be hardwired */ } - ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "got %ld bytes for %s._CRS\n", crsbuf.Length, acpi_name(lnkdev))); - ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "got %ld bytes for %s._PRS\n", prsbuf.Length, acpi_name(lnkdev))); + ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "got %ld bytes for %s._CRS\n", + (long)crsbuf.Length, acpi_name(lnkdev))); + ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "got %ld bytes for %s._PRS\n", + (long)prsbuf.Length, acpi_name(lnkdev))); /* * The interrupt may already be routed, so check _CRS first. We don't check the ==== //depot/projects/ia64/sys/dev/acpica/acpi_resource.c#5 (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/dev/acpica/acpi_resource.c,v 1.14 2002/05/19 06:16:45 peter Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_resource.c,v 1.15 2002/10/04 00:35:22 peter Exp $ */ #include "opt_acpi.h" @@ -88,7 +88,7 @@ return_ACPI_STATUS(status); } ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "%s - got %ld bytes of resources\n", - acpi_name(handle), buf.Length)); + acpi_name(handle), (long)buf.Length)); set->set_init(dev, &context); /* ==== //depot/projects/ia64/sys/ia64/ia64/clock.c#10 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/ia64/ia64/clock.c,v 1.15 2002/05/16 21:25:45 trhodes Exp $ */ +/* $FreeBSD: src/sys/ia64/ia64/clock.c,v 1.16 2002/10/04 01:00:35 peter Exp $ */ /* $NetBSD: clock.c,v 1.20 1998/01/31 10:32:47 ross Exp $ */ /* ==== //depot/projects/ia64/sys/ia64/ia64/interrupt.c#16 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/ia64/ia64/interrupt.c,v 1.26 2002/09/17 01:48:57 peter Exp $ */ +/* $FreeBSD: src/sys/ia64/ia64/interrupt.c,v 1.27 2002/10/04 01:00:35 peter Exp $ */ /* $NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $ */ /* @@ -84,16 +84,15 @@ void (*perf_irq)(unsigned long, struct trapframe *) = dummy_perf; +static unsigned int ints[MAXCPU]; +static unsigned int clks[MAXCPU]; +static unsigned int asts[MAXCPU]; +static unsigned int rdvs[MAXCPU]; +SYSCTL_OPAQUE(_debug, OID_AUTO, ints, CTLFLAG_RW, &ints, sizeof(ints), "IU",""); +SYSCTL_OPAQUE(_debug, OID_AUTO, clks, CTLFLAG_RW, &clks, sizeof(clks), "IU",""); +SYSCTL_OPAQUE(_debug, OID_AUTO, asts, CTLFLAG_RW, &asts, sizeof(asts), "IU",""); +SYSCTL_OPAQUE(_debug, OID_AUTO, rdvs, CTLFLAG_RW, &rdvs, sizeof(rdvs), "IU",""); -static unsigned int ints[MAXCPU]; -static unsigned int clks[MAXCPU]; -static unsigned int asts[MAXCPU]; -static unsigned int rdvs[MAXCPU]; -SYSCTL_OPAQUE(_debug, OID_AUTO, ints, CTLFLAG_RW, &ints, sizeof(ints), "IU", ""); -SYSCTL_OPAQUE(_debug, OID_AUTO, clks, CTLFLAG_RW, &clks, sizeof(clks), "IU", ""); -SYSCTL_OPAQUE(_debug, OID_AUTO, asts, CTLFLAG_RW, &asts, sizeof(asts), "IU", ""); -SYSCTL_OPAQUE(_debug, OID_AUTO, rdvs, CTLFLAG_RW, &rdvs, sizeof(rdvs), "IU", ""); - static u_int schedclk2; void @@ -132,7 +131,7 @@ #endif handleclock(framep); /* divide hz (1024) by 8 to get stathz (128) */ - if((++schedclk2 & 0x7) == 0) + if ((++schedclk2 & 0x7) == 0) statclock((struct clockframe *)framep); #ifdef SMP } else { ==== //depot/projects/ia64/sys/ia64/ia64/machdep.c#49 (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/ia64/ia64/machdep.c,v 1.112 2002/09/20 17:50:58 phk Exp $ + * $FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.113 2002/10/04 01:00:35 peter Exp $ */ #include "opt_compat.h" ==== //depot/projects/ia64/sys/ia64/ia64/mp_machdep.c#22 (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/ia64/ia64/mp_machdep.c,v 1.39 2002/05/29 05:19:07 marcel Exp $ + * $FreeBSD: src/sys/ia64/ia64/mp_machdep.c,v 1.40 2002/10/04 01:00:35 peter Exp $ */ #include <sys/param.h> ==== //depot/projects/ia64/sys/ia64/ia64/trap.c#35 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/ia64/ia64/trap.c,v 1.63 2002/08/29 05:49:04 jake Exp $ */ +/* $FreeBSD: src/sys/ia64/ia64/trap.c,v 1.64 2002/10/04 00:18:21 peter Exp $ */ /* From: src/sys/alpha/alpha/trap.c,v 1.33 */ /* $NetBSD: trap.c,v 1.31 1998/03/26 02:21:46 thorpej Exp $ */ ==== //depot/projects/ia64/sys/ia64/ia64/vm_machdep.c#14 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ - * $FreeBSD: src/sys/ia64/ia64/vm_machdep.c,v 1.46 2002/09/07 01:26:34 peter Exp $ + * $FreeBSD: src/sys/ia64/ia64/vm_machdep.c,v 1.47 2002/10/04 00:19:58 peter Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. ==== //depot/projects/ia64/sys/nfsserver/nfs_serv.c#11 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_serv.c,v 1.123 2002/09/25 02:39:39 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_serv.c,v 1.124 2002/10/03 21:50:37 rwatson Exp $"); /* * nfs version 2 and 3 server calls to vnode ops @@ -2905,10 +2905,9 @@ if (dirp) diraft_ret = VOP_GETATTR(dirp, &diraft, cred, td); nfsm_reply(NFSX_WCCDATA(v3)); - if (v3) { + error = 0; + if (v3) nfsm_srvwcc_data(dirfor_ret, &dirfor, diraft_ret, &diraft); - error = 0; - } /* fall through */ nfsmout: ==== //depot/projects/ia64/sys/sys/dmap.h#2 (text+ko) ==== @@ -31,12 +31,14 @@ * SUCH DAMAGE. * * @(#)dmap.h 8.2 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/sys/dmap.h,v 1.7 1999/12/29 04:24:40 peter Exp $ + * $FreeBSD: src/sys/sys/dmap.h,v 1.8 2002/10/03 20:30:09 peter Exp $ */ #ifndef _SYS_DMAP_H_ #define _SYS_DMAP_H_ +typedef int32_t swblk_t; /* swap offset */ + /* * Definitions for the mapping of vitual swap space to the physical swap * area - the disk map. ==== //depot/projects/ia64/sys/sys/types.h#19 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)types.h 8.6 (Berkeley) 2/19/95 - * $FreeBSD: src/sys/sys/types.h,v 1.74 2002/10/02 04:13:32 mike Exp $ + * $FreeBSD: src/sys/sys/types.h,v 1.75 2002/10/03 20:30:09 peter Exp $ */ #ifndef _SYS_TYPES_H_ @@ -150,7 +150,6 @@ typedef __register_t register_t; typedef __int64_t rlim_t; /* resource limit (XXX not unsigned) */ typedef __segsz_t segsz_t; /* segment size (in pages) */ -typedef __int32_t swblk_t; /* swap offset */ typedef __u_register_t u_register_t; #ifndef _UID_T_DECLARED ==== //depot/projects/ia64/usr.bin/minigzip/minigzip.1#3 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/usr.bin/minigzip/minigzip.1,v 1.7 2002/04/20 12:15:48 charnier Exp $ +.\" $FreeBSD: src/usr.bin/minigzip/minigzip.1,v 1.8 2002/10/03 19:30:22 johan Exp $ .\" -.Dd December 13, 1997 +.Dd October 3, 2002 .Dt MINIGZIP 1 .Os .Sh NAME @@ -32,7 +32,7 @@ .Nd minimal implementation of the 'gzip' compression tool .Sh SYNOPSIS .Nm -.Op Fl d +.Op Fl cd .Op Ar .Sh DESCRIPTION The @@ -64,6 +64,13 @@ .Nm reads from standard input and writes the results of the operation to standard output. +.Pp +If the +.Fl c +option is specified, +.Nm +writes the results to standard output and keep the original files +unchanged. .Sh SEE ALSO .Xr gzip 1 .Sh AUTHORS To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200210040116.g941G2dQ004593>