Date: Wed, 17 Jul 2002 16:54:16 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 14402 for review Message-ID: <200207172354.g6HNsGoE094487@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14402 Change 14402 by peter@peter_daintree on 2002/07/17 16:53:21 IFC @14401 (damn, missed 14400 by one) Affected files ... .. //depot/projects/ia64/crypto/openssh/auth2-pam-freebsd.c#2 integrate .. //depot/projects/ia64/etc/rc.d/network1#3 integrate .. //depot/projects/ia64/include/glob.h#3 integrate .. //depot/projects/ia64/include/protocols/dumprestore.h#4 integrate .. //depot/projects/ia64/lib/libc/gen/glob.3#2 integrate .. //depot/projects/ia64/lib/libc/gen/glob.c#3 integrate .. //depot/projects/ia64/lib/libc/sys/utimes.2#2 integrate .. //depot/projects/ia64/libexec/ftpd/ftpcmd.y#5 integrate .. //depot/projects/ia64/libexec/ftpd/ftpd.c#6 integrate .. //depot/projects/ia64/libexec/ftpd/popen.c#3 integrate .. //depot/projects/ia64/libexec/rtld-elf/sparc64/rtld_start.S#2 integrate .. //depot/projects/ia64/sbin/Makefile#16 integrate .. //depot/projects/ia64/sbin/devfs/Makefile#1 branch .. //depot/projects/ia64/sbin/devfs/devfs.8#1 branch .. //depot/projects/ia64/sbin/devfs/devfs.c#1 branch .. //depot/projects/ia64/sbin/devfs/extern.h#1 branch .. //depot/projects/ia64/sbin/devfs/rule.c#1 branch .. //depot/projects/ia64/sbin/dump/traverse.c#8 integrate .. //depot/projects/ia64/sbin/newfs/mkfs.c#13 integrate .. //depot/projects/ia64/sbin/restore/dirs.c#4 integrate .. //depot/projects/ia64/sbin/restore/restore.h#4 integrate .. //depot/projects/ia64/sbin/restore/tape.c#8 integrate .. //depot/projects/ia64/share/man/man1/builtin.1#4 integrate .. //depot/projects/ia64/share/mk/Makefile#7 integrate .. //depot/projects/ia64/sys/conf/files#33 integrate .. //depot/projects/ia64/sys/conf/kmod.mk#12 integrate .. //depot/projects/ia64/sys/dev/pccard/card_if.m#4 integrate .. //depot/projects/ia64/sys/dev/pccard/pccard_common.c#2 delete .. //depot/projects/ia64/sys/dev/pccard/pccarddevs#12 integrate .. //depot/projects/ia64/sys/dev/pccard/pccarddevs.h#12 integrate .. //depot/projects/ia64/sys/dev/pccard/pccardvar.h#6 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi_pccard.c#6 integrate .. //depot/projects/ia64/sys/i386/i386/machdep.c#20 integrate .. //depot/projects/ia64/sys/i386/i386/pmap.c#13 integrate .. //depot/projects/ia64/sys/i386/include/atomic.h#4 integrate .. //depot/projects/ia64/sys/ia64/acpica/madt.c#10 integrate .. //depot/projects/ia64/sys/ia64/ia64/efi.c#4 integrate .. //depot/projects/ia64/sys/ia64/ia64/pmap.c#29 integrate .. //depot/projects/ia64/sys/kern/kern_condvar.c#9 integrate .. //depot/projects/ia64/sys/kern/kern_descrip.c#25 integrate .. //depot/projects/ia64/sys/kern/kern_idle.c#5 integrate .. //depot/projects/ia64/sys/kern/kern_shutdown.c#9 integrate .. //depot/projects/ia64/sys/kern/kern_switch.c#8 integrate .. //depot/projects/ia64/sys/kern/kern_synch.c#11 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#3 integrate .. //depot/projects/ia64/sys/netinet/ip_dummynet.c#7 integrate .. //depot/projects/ia64/sys/netinet/ip_fw.h#9 integrate .. //depot/projects/ia64/sys/netinet/tcp_timer.h#3 integrate .. //depot/projects/ia64/sys/pc98/conf/GENERIC#13 integrate .. //depot/projects/ia64/sys/pc98/i386/machdep.c#18 integrate .. //depot/projects/ia64/sys/pccard/i82365.h#4 integrate .. //depot/projects/ia64/sys/pccard/pccard_nbk.c#4 integrate .. //depot/projects/ia64/sys/pccard/pcic.c#8 integrate .. //depot/projects/ia64/sys/pccard/pcic_pci.c#8 integrate .. //depot/projects/ia64/sys/pci/agp_intel.c#5 integrate .. //depot/projects/ia64/sys/sys/proc.h#22 integrate .. //depot/projects/ia64/usr.bin/alias/Makefile#2 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.freebsd#16 integrate .. //depot/projects/ia64/usr.sbin/chown/chown.c#6 integrate Differences ... ==== //depot/projects/ia64/crypto/openssh/auth2-pam-freebsd.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include "includes.h" -RCSID("$FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.2 2002/07/05 15:27:26 des Exp $"); +RCSID("$FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.3 2002/07/17 17:44:02 des Exp $"); #ifdef USE_PAM #include <security/pam_appl.h> @@ -154,6 +154,17 @@ exit(0); } +static void +pam_cleanup(void *ctxtp) +{ + struct pam_ctxt *ctxt = ctxtp; + int status; + + close(ctxt->pam_sock); + kill(ctxt->pam_pid, SIGHUP); + waitpid(ctxt->pam_pid, &status, 0); +} + static void * pam_init_ctx(Authctxt *authctxt) { @@ -190,6 +201,7 @@ } ctxt->pam_sock = socks[0]; close(socks[1]); + fatal_add_cleanup(pam_cleanup, ctxt); return (ctxt); } @@ -295,6 +307,7 @@ struct pam_ctxt *ctxt = ctxtp; int status; + fatal_remove_cleanup(pam_cleanup, ctxt); close(ctxt->pam_sock); kill(ctxt->pam_pid, SIGHUP); waitpid(ctxt->pam_pid, &status, 0); ==== //depot/projects/ia64/etc/rc.d/network1#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh -x # -# $FreeBSD: src/etc/rc.d/network1,v 1.4 2002/06/18 23:12:50 dougb Exp $ +# $FreeBSD: src/etc/rc.d/network1,v 1.5 2002/07/17 03:29:37 dd Exp $ # # PROVIDE: network1 @@ -205,8 +205,6 @@ fi done - echo '.' - # Resync ipfilter /etc/rc.d/ipfilter resync } ==== //depot/projects/ia64/include/glob.h#3 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)glob.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/include/glob.h,v 1.6 2002/03/23 17:24:53 imp Exp $ + * $FreeBSD: src/include/glob.h,v 1.7 2002/07/17 04:58:09 mikeh Exp $ */ #ifndef _GLOB_H_ @@ -64,13 +64,24 @@ int (*gl_stat)(const char *, struct stat *); } glob_t; +#if __POSIX_VISIBLE >= 199209 +/* Believed to have been introduced in 1003.2-1992 */ #define GLOB_APPEND 0x0001 /* Append to output from previous call. */ #define GLOB_DOOFFS 0x0002 /* Use gl_offs. */ #define GLOB_ERR 0x0004 /* Return on error. */ #define GLOB_MARK 0x0008 /* Append / to matching directories. */ #define GLOB_NOCHECK 0x0010 /* Return pattern itself if nothing matches. */ #define GLOB_NOSORT 0x0020 /* Don't sort. */ +#define GLOB_NOESCAPE 0x2000 /* Disable backslash escaping. */ + +/* Error values returned by glob(3) */ +#define GLOB_NOSPACE (-1) /* Malloc call failed. */ +#define GLOB_ABORTED (-2) /* Unignored error. */ +#define GLOB_NOMATCH (-3) /* No match and GLOB_NOCHECK was not set. */ +#define GLOB_NOSYS (-4) /* Obsolete: source comptability only. */ +#endif /* __POSIX_VISIBLE >= 199209 */ +#if __BSD_VISIBLE #define GLOB_ALTDIRFUNC 0x0040 /* Use alternately specified directory funcs. */ #define GLOB_BRACE 0x0080 /* Expand braces ala csh. */ #define GLOB_MAGCHAR 0x0100 /* Pattern had globbing characters. */ @@ -79,11 +90,10 @@ #define GLOB_TILDE 0x0800 /* Expand tilde names from the passwd file. */ #define GLOB_LIMIT 0x1000 /* limit number of returned paths */ -/* backwards compatibility, this is the old name for this option */ +/* source compatibility, these are the old names */ #define GLOB_MAXPATH GLOB_LIMIT - -#define GLOB_NOSPACE (-1) /* Malloc call failed. */ -#define GLOB_ABEND (-2) /* Unignored error. */ +#define GLOB_ABEND GLOB_ABORTED +#endif /* __BSD_VISIBLE */ __BEGIN_DECLS int glob(const char *, int, int (*)(const char *, int), glob_t *); ==== //depot/projects/ia64/include/protocols/dumprestore.h#4 (text+ko) ==== @@ -37,7 +37,7 @@ * * @(#)dumprestore.h 8.2 (Berkeley) 1/21/94 * - * $FreeBSD: src/include/protocols/dumprestore.h,v 1.9 2002/06/21 06:17:46 mckusick Exp $ + * $FreeBSD: src/include/protocols/dumprestore.h,v 1.10 2002/07/17 02:03:19 mckusick Exp $ */ #ifndef _PROTOCOLS_DUMPRESTORE_H_ @@ -93,8 +93,8 @@ int32_t c_mtimensec; /* last modified time, nanosecs */ int32_t c_spare2[2]; /* old ctime */ int32_t c_rdev; /* for devices, device number */ - int32_t c_createtimensec; /* creation time, nanosecs */ - int64_t c_createtime; /* creation time, seconds */ + int32_t c_birthtimensec; /* creation time, nanosecs */ + int64_t c_birthtime; /* creation time, seconds */ int64_t c_atime; /* last access time, seconds */ int64_t c_mtime; /* last modified time, seconds */ int32_t c_spare4[7]; /* old block pointers */ ==== //depot/projects/ia64/lib/libc/gen/glob.3#2 (text+ko) ==== @@ -32,7 +32,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)glob.3 8.3 (Berkeley) 4/16/94 -.\" $FreeBSD: src/lib/libc/gen/glob.3,v 1.20 2001/10/01 16:08:51 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/glob.3,v 1.21 2002/07/17 04:58:09 mikeh Exp $ .\" .Dd April 16, 1994 .Dt GLOB 3 @@ -187,9 +187,15 @@ .Fa pattern , with the number of total pathnames is set to 1, and the number of matched pathnames set to 0. +The effect of backslash escaping is present in the pattern returned. +.It Dv GLOB_NOESCAPE +By default, a backslash +.Pq Ql \e +character is used to escape the following character in the pattern, +avoiding any special interpretation of the character. If -.Dv GLOB_QUOTE -is set, its effect is present in the pattern returned. +.Dv GLOB_NOESCAPE +is set, backslash escaping is disabled. .It Dv GLOB_NOSORT By default, the pathnames are sorted in ascending .Tn ASCII @@ -250,12 +256,6 @@ is provided to simplify implementing the historic .Xr csh 1 globbing behavior and should probably not be used anywhere else. -.It Dv GLOB_QUOTE -Use the backslash -.Pq Ql \e -character for quoting: every occurrence of -a backslash followed by a character in the pattern is replaced by that -character, avoiding any special interpretation of the character. .It Dv GLOB_TILDE Expand patterns that start with .Ql ~ @@ -304,7 +304,7 @@ returns non-zero, .Fn glob stops the scan and returns -.Dv GLOB_ABEND +.Dv GLOB_ABORTED after setting .Fa gl_pathc and @@ -386,12 +386,16 @@ was specified in the flags and .Fa pglob\->gl_matchc or more patterns were matched. -.It Dv GLOB_ABEND +.It Dv GLOB_ABORTED The scan was stopped because an error was encountered and either .Dv GLOB_ERR was set or .Fa \*(lp*errfunc\*(rp\*(lp\*(rp returned non-zero. +.It Dv GLOB_NOMATCH +The pattern did not match a pathname and +.Dv GLOB_NOCHECK +was not set. .El .Pp The arguments @@ -430,7 +434,6 @@ .Dv GLOB_LIMIT , .Dv GLOB_MAGCHAR , .Dv GLOB_NOMAGIC , -.Dv GLOB_QUOTE , and .Dv GLOB_TILDE , and the fields ==== //depot/projects/ia64/lib/libc/gen/glob.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)glob.c 8.3 (Berkeley) 10/13/93"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/glob.c,v 1.19 2002/02/01 01:32:19 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/glob.c,v 1.20 2002/07/17 04:58:09 mikeh Exp $"); /* * glob(3) -- a superset of the one defined in POSIX 1003.2. @@ -182,7 +182,10 @@ bufnext = patbuf; bufend = bufnext + MAXPATHLEN - 1; - if (flags & GLOB_QUOTE) { + if (flags & GLOB_NOESCAPE) + while (bufnext < bufend && (c = *patnext++) != EOS) + *bufnext++ = c; + else { /* Protect the quoted characters. */ while (bufnext < bufend && (c = *patnext++) != EOS) if (c == QUOTE) { @@ -195,9 +198,6 @@ else *bufnext++ = c; } - else - while (bufnext < bufend && (c = *patnext++) != EOS) - *bufnext++ = c; *bufnext = EOS; if (flags & GLOB_BRACE) @@ -415,8 +415,7 @@ * The main glob() routine: compiles the pattern (optionally processing * quotes), calls glob1() to do the real pattern matching, and finally * sorts the list (unless unsorted operation is requested). Returns 0 - * if things went well, nonzero if errors occurred. It is not an error - * to find no matches. + * if things went well, nonzero if errors occurred. */ static int glob0(pattern, pglob, limit) @@ -493,12 +492,15 @@ * and the pattern did not contain any magic characters * GLOB_NOMAGIC is there just for compatibility with csh. */ - if (pglob->gl_pathc == oldpathc && - ((pglob->gl_flags & GLOB_NOCHECK) || - ((pglob->gl_flags & GLOB_NOMAGIC) && - !(pglob->gl_flags & GLOB_MAGCHAR)))) - return(globextend(pattern, pglob, limit)); - else if (!(pglob->gl_flags & GLOB_NOSORT)) + if (pglob->gl_pathc == oldpathc) { + if (((pglob->gl_flags & GLOB_NOCHECK) || + ((pglob->gl_flags & GLOB_NOMAGIC) && + !(pglob->gl_flags & GLOB_MAGCHAR)))) + return(globextend(pattern, pglob, limit)); + else + return(GLOB_NOMATCH); + } + if (!(pglob->gl_flags & GLOB_NOSORT)) qsort(pglob->gl_pathv + pglob->gl_offs + oldpathc, pglob->gl_pathc - oldpathc, sizeof(char *), compare); return(0); @@ -557,7 +559,7 @@ (g_stat(pathbuf, &sb, pglob) == 0) && S_ISDIR(sb.st_mode)))) { if (pathend + 1 > pathend_last) - return (1); + return (GLOB_ABORTED); *pathend++ = SEP; *pathend = EOS; } @@ -572,7 +574,7 @@ if (ismeta(*p)) anymeta = 1; if (q + 1 > pathend_last) - return (1); + return (GLOB_ABORTED); *q++ = *p++; } @@ -581,7 +583,7 @@ pattern = p; while (*pattern == SEP) { if (pathend + 1 > pathend_last) - return (1); + return (GLOB_ABORTED); *pathend++ = *pattern++; } } else /* Need expansion, recurse. */ @@ -611,7 +613,7 @@ struct dirent *(*readdirfunc)(); if (pathend > pathend_last) - return (1); + return (GLOB_ABORTED); *pathend = EOS; errno = 0; @@ -619,10 +621,10 @@ /* TODO: don't call for ENOENT or ENOTDIR? */ if (pglob->gl_errfunc) { if (g_Ctoc(pathbuf, buf, sizeof(buf))) - return (GLOB_ABEND); + return (GLOB_ABORTED); if (pglob->gl_errfunc(buf, errno) || pglob->gl_flags & GLOB_ERR) - return (GLOB_ABEND); + return (GLOB_ABORTED); } return(0); } ==== //depot/projects/ia64/lib/libc/sys/utimes.2#2 (text+ko) ==== @@ -32,7 +32,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)utimes.2 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/sys/utimes.2,v 1.12 2001/10/01 16:09:03 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/utimes.2,v 1.13 2002/07/17 02:03:18 mckusick Exp $ .\" .Dd June 4, 1993 .Dt UTIMES 2 @@ -75,6 +75,15 @@ it is assumed to point to an array of two timeval structures. The access time is set to the value of the first element, and the modification time is set to the value of the second element. +For filesystems that support file birth (creation) times (such as +.Dv UFS2 ), +the birth time will be set to the value of the second element +if the second element is older than the currently set birth time. +To set both a birth time and a modification time, +two calls are required; the first to set the birth time +and the second to set the (presumably newer) modification time. +Ideally a new system call will be added that allows the setting +of all three times at once. The caller must be the owner of the file or be the super-user. .Pp In either case, the inode-change-time of the file is set to the current ==== //depot/projects/ia64/libexec/ftpd/ftpcmd.y#5 (text+ko) ==== @@ -45,7 +45,7 @@ static char sccsid[] = "@(#)ftpcmd.y 8.3 (Berkeley) 4/6/94"; #endif static const char rcsid[] = - "$FreeBSD: src/libexec/ftpd/ftpcmd.y,v 1.33 2002/03/14 16:05:06 maxim Exp $"; + "$FreeBSD: src/libexec/ftpd/ftpcmd.y,v 1.34 2002/07/17 05:47:49 mikeh Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -969,7 +969,7 @@ if (logged_in && $1) { glob_t gl; int flags = - GLOB_BRACE|GLOB_NOCHECK|GLOB_QUOTE|GLOB_TILDE; + GLOB_BRACE|GLOB_NOCHECK|GLOB_TILDE; memset(&gl, 0, sizeof(gl)); flags |= GLOB_MAXPATH; ==== //depot/projects/ia64/libexec/ftpd/ftpd.c#6 (text+ko) ==== @@ -44,7 +44,7 @@ static char sccsid[] = "@(#)ftpd.c 8.4 (Berkeley) 4/16/94"; #endif static const char rcsid[] = - "$FreeBSD: src/libexec/ftpd/ftpd.c,v 1.108 2002/07/16 16:48:15 yar Exp $"; + "$FreeBSD: src/libexec/ftpd/ftpd.c,v 1.111 2002/07/17 19:29:25 yar Exp $"; #endif /* not lint */ /* @@ -787,12 +787,12 @@ /* XXX: getaddrinfo() can't do alias check */ switch(hrp->hostinfo->ai_family) { case AF_INET: - addr = &((struct sockaddr_in *)&hrp->hostinfo->ai_addr)->sin_addr; - addrsize = sizeof(struct sockaddr_in); + addr = &((struct sockaddr_in *)hrp->hostinfo->ai_addr)->sin_addr; + addrsize = sizeof(struct in_addr); break; case AF_INET6: - addr = &((struct sockaddr_in6 *)&hrp->hostinfo->ai_addr)->sin6_addr; - addrsize = sizeof(struct sockaddr_in6); + addr = &((struct sockaddr_in6 *)hrp->hostinfo->ai_addr)->sin6_addr; + addrsize = sizeof(struct in6_addr); break; default: /* should not reach here */ @@ -829,7 +829,8 @@ lhrp->next = hrp; lhrp = hrp; } - freehostent(hp); + if (hp) + freehostent(hp); } nextline: if (mp) @@ -2737,7 +2738,7 @@ glob_t gl; if (strpbrk(whichf, "~{[*?") != NULL) { - int flags = GLOB_BRACE|GLOB_NOCHECK|GLOB_QUOTE|GLOB_TILDE; + int flags = GLOB_BRACE|GLOB_NOCHECK|GLOB_TILDE; memset(&gl, 0, sizeof(gl)); gl.gl_matchc = MAXGLOBARGS; ==== //depot/projects/ia64/libexec/ftpd/popen.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)popen.c 8.3 (Berkeley) 4/6/94"; #endif static const char rcsid[] = - "$FreeBSD: src/libexec/ftpd/popen.c,v 1.22 2002/02/03 15:53:02 imp Exp $"; + "$FreeBSD: src/libexec/ftpd/popen.c,v 1.23 2002/07/17 05:47:49 mikeh Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -103,7 +103,7 @@ gargv[0] = argv[0]; for (gargc = argc = 1; argv[argc] && gargc < (MAXGLOBARGS-1); argc++) { glob_t gl; - int flags = GLOB_BRACE|GLOB_NOCHECK|GLOB_QUOTE|GLOB_TILDE; + int flags = GLOB_BRACE|GLOB_NOCHECK|GLOB_TILDE; memset(&gl, 0, sizeof(gl)); gl.gl_matchc = MAXGLOBARGS; ==== //depot/projects/ia64/libexec/rtld-elf/sparc64/rtld_start.S#2 (text+ko) ==== @@ -37,7 +37,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/libexec/rtld-elf/sparc64/rtld_start.S,v 1.1 2002/03/13 02:40:39 jake Exp $ + * $FreeBSD: src/libexec/rtld-elf/sparc64/rtld_start.S,v 1.2 2002/07/17 22:20:41 jake Exp $ */ #include <machine/asm.h> @@ -65,6 +65,7 @@ mov %l1, %o3 jmp %o0 mov %l0, %o0 +END(.rtld_start) /* * We have two separate entry points to the runtime linker. @@ -124,6 +125,7 @@ jmp %o0 /* return value == function address */ restore /* Dump our stack frame */ +END(_rtld_bind_start_0) ENTRY(_rtld_bind_start_1) srax %o0, 15, %o2 /* %o0 is the index to our PLT slot */ @@ -140,4 +142,4 @@ jmp %o0 /* return value == function address */ restore /* Dump our stack frame */ - +END(_rtld_bind_start_1) ==== //depot/projects/ia64/sbin/Makefile#16 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.5 (Berkeley) 3/31/94 -# $FreeBSD: src/sbin/Makefile,v 1.108 2002/07/07 22:14:40 gordon Exp $ +# $FreeBSD: src/sbin/Makefile,v 1.109 2002/07/17 01:46:47 dd Exp $ # XXX MISSING: icheck ncheck @@ -12,6 +12,7 @@ clri \ comcontrol \ conscontrol \ + devfs \ dhclient \ disklabel \ dmesg \ ==== //depot/projects/ia64/sbin/dump/traverse.c#8 (text+ko) ==== @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)traverse.c 8.7 (Berkeley) 6/15/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/dump/traverse.c,v 1.23 2002/07/08 23:53:21 iedowse Exp $"; + "$FreeBSD: src/sbin/dump/traverse.c,v 1.24 2002/07/17 02:03:18 mckusick Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -407,8 +407,8 @@ spcl.c_atimensec = dp->dp1.di_atimensec; spcl.c_mtime = _time32_to_time(dp->dp1.di_mtime); spcl.c_mtimensec = dp->dp1.di_mtimensec; - spcl.c_createtime = 0; - spcl.c_createtimensec = 0; + spcl.c_birthtime = 0; + spcl.c_birthtimensec = 0; spcl.c_rdev = dp->dp1.di_rdev; spcl.c_file_flags = dp->dp1.di_flags; spcl.c_uid = dp->dp1.di_uid; @@ -420,8 +420,8 @@ spcl.c_atimensec = dp->dp2.di_atimensec; spcl.c_mtime = _time64_to_time(dp->dp2.di_mtime); spcl.c_mtimensec = dp->dp2.di_mtimensec; - spcl.c_createtime = _time64_to_time(dp->dp2.di_createtime); - spcl.c_createtimensec = dp->dp2.di_creatensec; + spcl.c_birthtime = _time64_to_time(dp->dp2.di_birthtime); + spcl.c_birthtimensec = dp->dp2.di_birthnsec; spcl.c_rdev = dp->dp2.di_rdev; spcl.c_file_flags = dp->dp2.di_flags; spcl.c_uid = dp->dp2.di_uid; ==== //depot/projects/ia64/sbin/newfs/mkfs.c#13 (text+ko) ==== @@ -48,7 +48,7 @@ static char sccsid[] = "@(#)mkfs.c 8.11 (Berkeley) 5/3/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/newfs/mkfs.c,v 1.59 2002/07/11 17:49:41 bde Exp $"; + "$FreeBSD: src/sbin/newfs/mkfs.c,v 1.60 2002/07/17 10:31:38 roberto Exp $"; #endif /* not lint */ #include <err.h> @@ -708,7 +708,7 @@ node.dp2.di_atime = utime; node.dp2.di_mtime = utime; node.dp2.di_ctime = utime; - node.dp2.di_createtime = utime; + node.dp2.di_birthtime = utime; /* * create the root directory */ ==== //depot/projects/ia64/sbin/restore/dirs.c#4 (text+ko) ==== @@ -41,7 +41,7 @@ static char sccsid[] = "@(#)dirs.c 8.7 (Berkeley) 5/1/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/restore/dirs.c,v 1.22 2002/06/21 06:18:00 mckusick Exp $"; + "$FreeBSD: src/sbin/restore/dirs.c,v 1.23 2002/07/17 02:03:18 mckusick Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -82,7 +82,8 @@ */ struct modeinfo { ino_t ino; - struct timeval timep[2]; + struct timeval ctimep[2]; + struct timeval mtimep[2]; mode_t mode; uid_t uid; gid_t gid; @@ -597,7 +598,8 @@ if (!Nflag) { (void) chown(cp, node.uid, node.gid); (void) chmod(cp, node.mode); - utimes(cp, node.timep); + utimes(cp, node.ctimep); + utimes(cp, node.mtimep); (void) chflags(cp, node.flags); } ep->e_flags &= ~NEW; @@ -685,10 +687,14 @@ if (mf == NULL) return (itp); node.ino = ctxp->ino; - node.timep[0].tv_sec = ctxp->atime_sec; - node.timep[0].tv_usec = ctxp->atime_nsec / 1000; - node.timep[1].tv_sec = ctxp->mtime_sec; - node.timep[1].tv_usec = ctxp->mtime_nsec / 1000; + node.mtimep[0].tv_sec = ctxp->atime_sec; + node.mtimep[0].tv_usec = ctxp->atime_nsec / 1000; + node.mtimep[1].tv_sec = ctxp->mtime_sec; + node.mtimep[1].tv_usec = ctxp->mtime_nsec / 1000; + node.ctimep[0].tv_sec = ctxp->atime_sec; + node.ctimep[0].tv_usec = ctxp->atime_nsec / 1000; + node.ctimep[1].tv_sec = ctxp->birthtime_sec; + node.ctimep[1].tv_usec = ctxp->birthtime_nsec / 1000; node.mode = ctxp->mode; node.flags = ctxp->file_flags; node.uid = ctxp->uid; ==== //depot/projects/ia64/sbin/restore/restore.h#4 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)restore.h 8.3 (Berkeley) 9/13/94 - * $FreeBSD: src/sbin/restore/restore.h,v 1.4 2002/06/21 06:18:00 mckusick Exp $ + * $FreeBSD: src/sbin/restore/restore.h,v 1.5 2002/07/17 02:03:18 mckusick Exp $ */ /* @@ -113,8 +113,10 @@ int rdev; /* device number of file */ time_t atime_sec; /* access time seconds */ time_t mtime_sec; /* modified time seconds */ + time_t birthtime_sec; /* creation time seconds */ int atime_nsec; /* access time nanoseconds */ int mtime_nsec; /* modified time nanoseconds */ + int birthtime_nsec; /* creation time nanoseconds */ off_t size; /* size of file */ char *name; /* name of file */ } curfile; ==== //depot/projects/ia64/sbin/restore/tape.c#8 (text+ko) ==== @@ -41,7 +41,7 @@ static char sccsid[] = "@(#)tape.c 8.9 (Berkeley) 5/1/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/restore/tape.c,v 1.35 2002/06/21 06:18:00 mckusick Exp $"; + "$FreeBSD: src/sbin/restore/tape.c,v 1.36 2002/07/17 02:03:18 mckusick Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -521,15 +521,19 @@ { int flags; mode_t mode; - struct timeval timep[2]; + struct timeval mtimep[2], ctimep[2]; struct entry *ep; curfile.name = name; curfile.action = USING; - timep[0].tv_sec = curfile.atime_sec; - timep[0].tv_usec = curfile.atime_nsec / 1000; - timep[1].tv_sec = curfile.mtime_sec; - timep[1].tv_usec = curfile.mtime_nsec / 1000; + mtimep[0].tv_sec = curfile.atime_sec; + mtimep[0].tv_usec = curfile.atime_nsec / 1000; + mtimep[1].tv_sec = curfile.mtime_sec; + mtimep[1].tv_usec = curfile.mtime_nsec / 1000; + ctimep[0].tv_sec = curfile.atime_sec; + ctimep[0].tv_usec = curfile.atime_nsec / 1000; + ctimep[1].tv_sec = curfile.birthtime_sec; + ctimep[1].tv_usec = curfile.birthtime_nsec / 1000; mode = curfile.mode; flags = curfile.file_flags; switch (mode & IFMT) { @@ -567,7 +571,8 @@ if (linkit(lnkbuf, name, SYMLINK) == GOOD) { (void) lchown(name, curfile.uid, curfile.gid); (void) lchmod(name, mode); - (void) lutimes(name, timep); + (void) lutimes(name, ctimep); + (void) lutimes(name, mtimep); return (GOOD); } return (FAIL); @@ -588,7 +593,8 @@ } (void) chown(name, curfile.uid, curfile.gid); (void) chmod(name, mode); - (void) utimes(name, timep); + (void) utimes(name, ctimep); + (void) utimes(name, mtimep); (void) chflags(name, flags); skipfile(); return (GOOD); @@ -610,7 +616,8 @@ } (void) chown(name, curfile.uid, curfile.gid); (void) chmod(name, mode); - (void) utimes(name, timep); + (void) utimes(name, ctimep); + (void) utimes(name, mtimep); (void) chflags(name, flags); skipfile(); return (GOOD); @@ -634,7 +641,8 @@ (void) fchmod(ofile, mode); getfile(xtrfile, xtrskip); (void) close(ofile); - utimes(name, timep); + (void) utimes(name, ctimep); + (void) utimes(name, mtimep); (void) chflags(name, flags); return (GOOD); } @@ -1174,6 +1182,8 @@ curfile.atime_nsec = header->c_atimensec; curfile.mtime_sec = header->c_mtime; curfile.mtime_nsec = header->c_mtimensec; + curfile.birthtime_sec = header->c_birthtime; + curfile.birthtime_nsec = header->c_birthtimensec; curfile.size = header->c_size; curfile.ino = header->c_inumber; break; ==== //depot/projects/ia64/share/man/man1/builtin.1#4 (text+ko) ==== @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man1/builtin.1,v 1.17 2001/11/20 18:41:01 knu Exp $ +.\" $FreeBSD: src/share/man/man1/builtin.1,v 1.19 2002/07/17 15:34:25 sheldonh Exp $ .\" .Dd September 1, 1999 .Dt BUILTIN 1 @@ -171,17 +171,17 @@ .It Xo .Em "Command External" Ta Xr csh 1 Ta Xr sh 1 .Xc -.It Ic alias Ta \&No Ta Yes Ta Yes +.It Ic alias Ta Yes Ta Yes Ta Yes .It Ic alloc Ta \&No Ta Yes Ta \&No -.It Ic bg Ta \&No Ta Yes Ta Yes +.It Ic bg Ta Yes Ta Yes Ta Yes .It Ic bindkey Ta \&No Ta Yes Ta \&No .It Ic break Ta \&No Ta Yes Ta \&Yes .It Ic breaksw Ta \&No Ta Yes Ta \&No .It Ic builtins Ta \&No Ta Yes Ta \&No .It Ic case Ta \&No Ta Yes Ta Yes -.It Ic cd Ta \&No Ta Yes Ta Yes +.It Ic cd Ta Yes Ta Yes Ta Yes .It Ic chdir Ta \&No Ta Yes Ta \&Yes -.It Ic command Ta \&No Ta \&No Ta Yes +.It Ic command Ta Yes Ta \&No Ta Yes .It Ic complete Ta \&No Ta Yes Ta \&No .It Ic continue Ta \&No Ta Yes Ta \&Yes .It Ic default Ta \&No Ta Yes Ta \&No @@ -201,13 +201,13 @@ .It Ic exit Ta \&No Ta Yes Ta Yes .It Ic export Ta \&No Ta \&No Ta Yes .It Ic false Ta Yes Ta \&No Ta Yes -.It Ic fc Ta \&No Ta \&No Ta Yes -.It Ic fg Ta \&No Ta Yes Ta Yes +.It Ic fc Ta Yes Ta \&No Ta Yes +.It Ic fg Ta Yes Ta Yes Ta Yes .It Ic filetest Ta \&No Ta Yes Ta \&No .It Ic fi Ta \&No Ta \&No Ta Yes .It Ic for Ta \&No Ta \&No Ta Yes .It Ic foreach Ta \&No Ta Yes Ta \&No -.It Ic getopts Ta \&No Ta \&No Ta Yes +.It Ic getopts Ta Yes Ta \&No Ta Yes .It Ic glob Ta \&No Ta Yes Ta \&No .It Ic goto Ta \&No Ta Yes Ta \&No .It Ic hash Ta \&No Ta \&No Ta Yes @@ -216,7 +216,7 @@ .It Ic hup Ta \&No Ta Yes Ta \&No .It Ic if Ta \&No Ta Yes Ta \&Yes .It Ic jobid Ta \&No Ta \&No Ta Yes -.It Ic jobs Ta \&No Ta Yes Ta Yes +.It Ic jobs Ta Yes Ta Yes Ta Yes .It Ic kill Ta Yes Ta Yes Ta \&No .It Ic limit Ta \&No Ta Yes Ta \&No .It Ic log Ta \&No Ta Yes Ta \&No @@ -231,7 +231,7 @@ .It Ic printenv Ta Yes Ta Yes Ta \&No .It Ic pushd Ta \&No Ta Yes Ta \&No .It Ic pwd Ta Yes Ta \&No Ta Yes -.It Ic read Ta \&No Ta \&No Ta Yes +.It Ic read Ta Yes Ta \&No Ta Yes .It Ic readonly Ta \&No Ta \&No Ta Yes .It Ic rehash Ta \&No Ta Yes Ta \&No .It Ic repeat Ta \&No Ta Yes Ta \&No @@ -254,15 +254,15 @@ .It Ic true Ta Yes Ta \&No Ta Yes .It Ic type Ta \&No Ta \&No Ta Yes .It Ic ulimit Ta \&No Ta \&No Ta Yes -.It Ic umask Ta \&No Ta Yes Ta Yes -.It Ic unalias Ta \&No Ta Yes Ta Yes +.It Ic umask Ta Yes Ta Yes Ta Yes +.It Ic unalias Ta Yes Ta Yes Ta Yes .It Ic uncomplete Ta \&No Ta Yes Ta \&No .It Ic unhash Ta \&No Ta Yes Ta \&No .It Ic unlimit Ta \&No Ta Yes Ta \&No .It Ic unset Ta \&No Ta Yes Ta Yes .It Ic unsetenv Ta \&No Ta Yes Ta \&No .It Ic until Ta \&No Ta \&No Ta Yes -.It Ic wait Ta \&No Ta Yes Ta Yes +.It Ic wait Ta Yes Ta Yes Ta Yes .It Ic where Ta \&No Ta Yes Ta \&No .It Ic which Ta Yes Ta Yes Ta \&No .It Ic while Ta \&No Ta Yes Ta \&Yes ==== //depot/projects/ia64/share/mk/Makefile#7 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/share/mk/Makefile,v 1.40 2002/07/02 12:16:54 ru Exp $ +# $FreeBSD: src/share/mk/Makefile,v 1.41 2002/07/17 16:35:00 ru Exp $ # @(#)Makefile 8.1 (Berkeley) 6/8/93 FILES= bsd.README FILES+= bsd.cpu.mk bsd.dep.mk bsd.doc.mk bsd.files.mk -FILES+= bsd.info.mk bsd.incs.mk bsd.init.mk +FILES+= bsd.incs.mk bsd.info.mk bsd.init.mk FILES+= bsd.kern.mk bsd.kmod.mk FILES+= bsd.lib.mk bsd.libnames.mk bsd.links.mk bsd.man.mk bsd.nls.mk FILES+= bsd.obj.mk bsd.own.mk ==== //depot/projects/ia64/sys/conf/files#33 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.665 2002/07/17 01:46:48 dd Exp $ +# $FreeBSD: src/sys/conf/files,v 1.666 2002/07/17 05:22:00 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -463,7 +463,6 @@ dev/nge/if_nge.c optional nge dev/null/null.c standard dev/nmdm/nmdm.c optional nmdm -dev/pccard/pccard_common.c standard dev/pccard/card_if.m standard dev/pccard/pccard.c optional pccard dev/pccard/pccard_cis.c optional pccard ==== //depot/projects/ia64/sys/conf/kmod.mk#12 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.126 2002/07/11 14:13:37 ru Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.127 2002/07/17 08:21:50 ru Exp $ # # The include file <bsd.kmod.mk> handles installing Kernel Loadable Device # drivers (KLD's). @@ -19,13 +19,6 @@ # # KMODMODE KLD mode. [${BINMODE}] # -# LINKS The list of KLD links; should be full pathnames, the -# linked-to file coming first, followed by the linked -# file. The files are hard-linked. For example, to link -# /modules/master and /modules/meister, use: -# -# LINKS= /modules/master /modules/meister -# # KMODLOAD Command to load a kernel module [/sbin/kldload] # # KMODUNLOAD Command to unload a kernel module [/sbin/kldunload] @@ -35,15 +28,8 @@ # # SRCS List of source files # -# SUBDIR A list of subdirectories that should be built as well. -# Each of the targets will execute the same target in the -# subdirectories. +# DESTDIR Change the tree where the module gets installed. [not set] # -# SYMLINKS Same as LINKS, except it creates symlinks and the -# linked-to pathname may be relative. -# -# DESTDIR, DISTDIR are set by other Makefiles (e.g. bsd.own.mk) -# # MFILES Optionally a list of interfaces used by the module. # This file contains a default list of interfaces. # @@ -54,10 +40,6 @@ # # +++ targets +++ # -# distribute: -# This is a variant of install, which will -# put the stuff into the right "distribution". -# # install: # install the kernel module; if the Makefile # does not itself define the target install, the targets @@ -207,12 +189,6 @@ CLEANFILES+= ${PROG} ${FULLPROG} ${KMOD}.kld ${OBJS} ${_ILINKS} symb.tmp tmp.o .if !target(install) -.if !target(beforeinstall) -beforeinstall: -.endif -.if !target(afterinstall) -afterinstall: -.endif _INSTALLFLAGS:= ${INSTALLFLAGS} .for ie in ${INSTALLFLAGS_EDIT} @@ -224,47 +200,34 @@ cd ${.CURDIR}; ${MAKE} -DINSTALL_DEBUG install .endif -realinstall: +.if !target(realinstall) +realinstall: _kmodinstall +.ORDER: beforeinstall _kmodinstall .if defined(DEBUG) && defined(INSTALL_DEBUG) +_kmodinstall: ${INSTALL} ${COPY} -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \ - ${_INSTALLFLAGS} ${FULLPROG} ${DESTDIR}${KMODDIR}/ + ${_INSTALLFLAGS} ${FULLPROG} ${DESTDIR}${KMODDIR} .else +_kmodinstall: ${INSTALL} ${COPY} -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \ - ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${KMODDIR}/ -.if defined(LINKS) && !empty(LINKS) - @set ${LINKS}; \ - while test $$# -ge 2; do \ - l=${DESTDIR}$$1; \ - shift; \ - t=${DESTDIR}$$1; \ - shift; \ - ${ECHO} $$t -\> $$l; \ - ln -f $$l $$t; \ - done; true -.endif -.if defined(SYMLINKS) && !empty(SYMLINKS) >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200207172354.g6HNsGoE094487>