Date: Mon, 30 Dec 2002 13:03:32 -0800 (PST) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 22943 for review Message-ID: <200212302103.gBUL3WDM055640@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=22943 Change 22943 by marcel@marcel_vaio on 2002/12/30 13:02:39 IFC @22939 Affected files ... .. //depot/projects/ia64/Makefile#20 integrate .. //depot/projects/ia64/Makefile.inc1#43 integrate .. //depot/projects/ia64/bin/df/df.c#12 integrate .. //depot/projects/ia64/bin/getfacl/getfacl.1#4 integrate .. //depot/projects/ia64/bin/getfacl/getfacl.c#6 integrate .. //depot/projects/ia64/bin/setfacl/setfacl.1#3 integrate .. //depot/projects/ia64/bin/setfacl/setfacl.c#4 integrate .. //depot/projects/ia64/bin/setfacl/setfacl.h#3 integrate .. //depot/projects/ia64/etc/mtree/BSD.include.dist#11 integrate .. //depot/projects/ia64/etc/mtree/BSD.local.dist#10 integrate .. //depot/projects/ia64/etc/mtree/BSD.usr.dist#16 integrate .. //depot/projects/ia64/include/Makefile#22 integrate .. //depot/projects/ia64/include/stdlib.h#15 integrate .. //depot/projects/ia64/lib/libc/gen/getbsize.3#3 integrate .. //depot/projects/ia64/lib/libc/gen/getbsize.c#4 integrate .. //depot/projects/ia64/lib/libmp/Makefile#3 integrate .. //depot/projects/ia64/sbin/mount_smbfs/Makefile#2 integrate .. //depot/projects/ia64/sbin/swapon/swapon.c#7 integrate .. //depot/projects/ia64/share/colldef/Makefile#10 integrate .. //depot/projects/ia64/share/colldef/ca_ES.ISO8859-1.src#1 branch .. //depot/projects/ia64/share/colldef/ca_ES.ISO8859-15.src#1 branch .. //depot/projects/ia64/share/mklocale/Makefile#8 integrate .. //depot/projects/ia64/share/monetdef/Makefile#8 integrate .. //depot/projects/ia64/share/monetdef/ca_ES.ISO8859-1.src#1 branch .. //depot/projects/ia64/share/msgdef/Makefile#8 integrate .. //depot/projects/ia64/share/msgdef/ca_ES.ISO8859-1.src#1 branch .. //depot/projects/ia64/share/numericdef/Makefile#8 integrate .. //depot/projects/ia64/share/numericdef/ca_ES.ISO8859-1.src#1 branch .. //depot/projects/ia64/share/timedef/Makefile#8 integrate .. //depot/projects/ia64/share/timedef/ca_ES.ISO8859-1.src#1 branch .. //depot/projects/ia64/sys/dev/awi/awi.c#9 integrate .. //depot/projects/ia64/sys/dev/awi/awi_wep.c#6 integrate .. //depot/projects/ia64/sys/dev/en/midway.c#6 integrate .. //depot/projects/ia64/sys/dev/firewire/iec13213.h#2 integrate .. //depot/projects/ia64/sys/dev/hifn/hifn7751.c#4 integrate .. //depot/projects/ia64/sys/dev/puc/pucdata.c#9 integrate .. //depot/projects/ia64/sys/dev/sab/sab.c#4 integrate .. //depot/projects/ia64/sys/dev/ubsec/ubsec.c#5 integrate .. //depot/projects/ia64/sys/i386/conf/OLDCARD#9 integrate .. //depot/projects/ia64/sys/i386/conf/SMP#1 branch .. //depot/projects/ia64/sys/kern/uipc_mbuf.c#11 integrate .. //depot/projects/ia64/sys/kern/uipc_mbuf2.c#7 integrate .. //depot/projects/ia64/sys/net/if_loop.c#10 integrate .. //depot/projects/ia64/sys/netatm/port.h#6 integrate .. //depot/projects/ia64/sys/netinet/ip_icmp.c#10 integrate .. //depot/projects/ia64/sys/netinet/ip_input.c#20 integrate .. //depot/projects/ia64/sys/netinet/tcp_input.c#30 integrate .. //depot/projects/ia64/sys/netinet6/esp_input.c#7 integrate .. //depot/projects/ia64/sys/netinet6/icmp6.c#11 integrate .. //depot/projects/ia64/sys/netinet6/ip6_input.c#11 integrate .. //depot/projects/ia64/sys/netinet6/ip6_output.c#10 integrate .. //depot/projects/ia64/sys/netinet6/ipsec.c#5 integrate .. //depot/projects/ia64/sys/netipsec/ipsec_mbuf.c#3 integrate .. //depot/projects/ia64/sys/netipsec/ipsec_output.c#2 integrate .. //depot/projects/ia64/sys/pci/if_xl.c#14 integrate .. //depot/projects/ia64/sys/sys/mbuf.h#13 integrate .. //depot/projects/ia64/usr.bin/Makefile#36 integrate .. //depot/projects/ia64/usr.bin/calendar/Makefile#10 integrate .. //depot/projects/ia64/usr.bin/chpass/Makefile#4 integrate .. //depot/projects/ia64/usr.bin/chpass/chpass.c#8 integrate .. //depot/projects/ia64/usr.bin/du/du.c#8 integrate .. //depot/projects/ia64/usr.bin/elf2aout/Makefile#4 integrate .. //depot/projects/ia64/usr.bin/elf2aout/elf2aout.c#7 integrate .. //depot/projects/ia64/usr.bin/systat/swap.c#5 integrate .. //depot/projects/ia64/usr.bin/whereis/Makefile#3 integrate .. //depot/projects/ia64/usr.sbin/Makefile#27 integrate .. //depot/projects/ia64/usr.sbin/burncd/Makefile#4 integrate .. //depot/projects/ia64/usr.sbin/burncd/burncd.c#12 integrate .. //depot/projects/ia64/usr.sbin/chown/chown.c#7 integrate .. //depot/projects/ia64/usr.sbin/crunch/crunchide/endian.h#2 delete .. //depot/projects/ia64/usr.sbin/crunch/crunchide/exec_elf32.c#5 integrate .. //depot/projects/ia64/usr.sbin/elf2aout/Makefile#3 delete .. //depot/projects/ia64/usr.sbin/elf2aout/elf2aout.c#2 delete .. //depot/projects/ia64/usr.sbin/fwcontrol/Makefile#1 branch .. //depot/projects/ia64/usr.sbin/fwcontrol/fwcontrol.8#1 branch .. //depot/projects/ia64/usr.sbin/fwcontrol/fwcontrol.c#1 branch .. //depot/projects/ia64/usr.sbin/fwcontrol/fwcrom.c#1 branch .. //depot/projects/ia64/usr.sbin/pkg_install/info/show.c#9 integrate .. //depot/projects/ia64/usr.sbin/pstat/pstat.c#7 integrate .. //depot/projects/ia64/usr.sbin/quot/quot.c#6 integrate Differences ... ==== //depot/projects/ia64/Makefile#20 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.272 2002/12/14 22:36:56 imp Exp $ +# $FreeBSD: src/Makefile,v 1.273 2002/12/30 16:48:35 schweikh Exp $ # # The user-driven targets are: # @@ -17,7 +17,7 @@ # upgrade - Upgrade a.out (2.2.x/3.0) system to the new ELF way # most - Build user commands, no libraries or include files. # installmost - Install user commands, no libraries or include files. -# aout-to-elf - Upgrade an system from a.out to elf format (see below). +# aout-to-elf - Upgrade a system from a.out to elf format (see below). # aout-to-elf-build - Build everything required to upgrade a system from # a.out to elf format (see below). # aout-to-elf-install - Install everything built by aout-to-elf-build (see @@ -26,7 +26,7 @@ # of each elf library sub-directory. # # This makefile is simple by design. The FreeBSD make automatically reads -# the /usr/share/mk/sys.mk unless the -m argument is specified on the +# the /usr/share/mk/sys.mk unless the -m argument is specified on the # command line. By keeping this makefile simple, it doesn't matter too # much how different the installed mk files are from those in the source # tree. This makefile executes a child make process, forcing it to use @@ -71,7 +71,7 @@ # The aout->elf transition build is performed by doing a `make upgrade' (or # `make aout-to-elf') or in two steps by a `make aout-to-elf-build' followed # by a `make aout-to-elf-install', depending on user preference. -# You need to have at least 320 Mb of free space for the object tree. +# You need to have at least 320 MB of free space for the object tree. # # The upgrade process checks the installed release. If this is 3.0-CURRENT, # it is assumed that your kernel contains all the syscalls required by the @@ -253,4 +253,3 @@ > _.${TARGET_ARCH}.${kernel} 2>&1 .endif .endfor - ==== //depot/projects/ia64/Makefile.inc1#43 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.313 2002/12/02 14:03:40 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.314 2002/12/30 10:01:25 obrien Exp $ # # Make command line options: # -DMAKE_KERBEROS4 to build KerberosIV @@ -663,7 +663,7 @@ .endif .if ${TARGET_ARCH} == "sparc64" -_elf2aout= usr.sbin/elf2aout +_elf2aout= usr.bin/elf2aout .endif _xlint= usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint ==== //depot/projects/ia64/bin/df/df.c#12 (text+ko) ==== @@ -48,7 +48,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.44 2002/10/23 22:09:05 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.45 2002/12/30 18:10:37 mike Exp $"); #include <sys/param.h> #include <sys/stat.h> @@ -381,8 +381,7 @@ prtstat(struct statfs *sfsp, struct maxwidths *mwp) { static long blocksize; - static int timesthrough; - static size_t headerlen; + static int headerlen, timesthrough; static const char *header; long used, availblks, inodes; @@ -393,7 +392,7 @@ mwp->total = mwp->used = mwp->avail = strlen(header); } else { header = getbsize(&headerlen, &blocksize); - mwp->total = imax(mwp->total, (int)headerlen); + mwp->total = imax(mwp->total, headerlen); } mwp->used = imax(mwp->used, strlen("Used")); mwp->avail = imax(mwp->avail, strlen("Avail")); @@ -442,7 +441,7 @@ update_maxwidths(struct maxwidths *mwp, struct statfs *sfsp) { static long blocksize; - size_t dummy; + int dummy; if (blocksize == 0) getbsize(&dummy, &blocksize); ==== //depot/projects/ia64/bin/getfacl/getfacl.1#4 (text+ko) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2000-2001 Robert N. M. Watson +.\" Copyright (c) 2000, 2001, 2002 Robert N. M. Watson .\" All rights reserved. .\" .\" This software was developed by Robert Watson for the TrustedBSD Project. @@ -25,12 +25,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/bin/getfacl/getfacl.1,v 1.5 2002/11/03 23:22:34 tjr Exp $ +.\" $FreeBSD: src/bin/getfacl/getfacl.1,v 1.6 2002/12/30 15:36:29 rwatson Exp $ .\" .\" Developed by the TrustedBSD Project. .\" Support for POSIX.1e access control lists. .\" -.Dd March 30, 2000 +.Dd Decemer 30, 2002 .Dt GETFACL 1 .Os .Sh NAME @@ -38,7 +38,7 @@ .Nd get ACL information .Sh SYNOPSIS .Nm -.Op Fl d +.Op Fl dh .Op Ar .Sh DESCRIPTION The @@ -61,6 +61,9 @@ access ACL. An error is generated if a default ACL cannot be associated with .Ar file . +.It Fl h +If the target of the operation is a symbolic link, return the ACL from +the symbol link itself rather than following the link. .El .Pp The following operand is available: ==== //depot/projects/ia64/bin/getfacl/getfacl.c#6 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1999-2001 Robert N M Watson + * Copyright (c) 1999, 2001, 2002 Robert N M Watson * All rights reserved. * * This software was developed by Robert Watson for the TrustedBSD Project. @@ -32,7 +32,7 @@ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/getfacl/getfacl.c,v 1.8 2002/11/03 23:22:34 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/getfacl/getfacl.c,v 1.9 2002/12/30 15:36:29 rwatson Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -52,7 +52,7 @@ usage(void) { - fprintf(stderr, "getfacl [-d] [files ...]\n"); + fprintf(stderr, "getfacl [-dh] [files ...]\n"); } /* @@ -147,14 +147,17 @@ } static int -print_acl(char *path, acl_type_t type) +print_acl(char *path, acl_type_t type, int hflag) { struct stat sb; acl_t acl; char *acl_text; int error; - error = stat(path, &sb); + if (hflag) + error = lstat(path, &sb); + else + error = stat(path, &sb); if (error == -1) { warn("%s", path); return(-1); @@ -167,7 +170,10 @@ printf("#file:%s\n#owner:%d\n#group:%d\n", path, sb.st_uid, sb.st_gid); - acl = acl_get_file(path, type); + if (hflag) + acl = acl_get_link_np(path, type); + else + acl = acl_get_file(path, type); if (!acl) { if (errno != EOPNOTSUPP) { warn("%s", path); @@ -198,7 +204,7 @@ } static int -print_acl_from_stdin(acl_type_t type) +print_acl_from_stdin(acl_type_t type, int hflag) { char *p, pathname[PATH_MAX]; int carried_error = 0; @@ -206,7 +212,7 @@ while (fgets(pathname, (int)sizeof(pathname), stdin)) { if ((p = strchr(pathname, '\n')) != NULL) *p = '\0'; - if (print_acl(pathname, type) == -1) { + if (print_acl(pathname, type, hflag) == -1) { carried_error = -1; } } @@ -220,12 +226,17 @@ acl_type_t type = ACL_TYPE_ACCESS; int carried_error = 0; int ch, error, i; + int hflag; - while ((ch = getopt(argc, argv, "d")) != -1) + hflag = 0; + while ((ch = getopt(argc, argv, "dh")) != -1) switch(ch) { case 'd': type = ACL_TYPE_DEFAULT; break; + case 'h': + hflag = 1; + break; default: usage(); return(-1); @@ -234,17 +245,17 @@ argv += optind; if (argc == 0) { - error = print_acl_from_stdin(type); + error = print_acl_from_stdin(type, hflag); return(error ? 1 : 0); } for (i = 0; i < argc; i++) { if (!strcmp(argv[i], "-")) { - error = print_acl_from_stdin(type); + error = print_acl_from_stdin(type, hflag); if (error == -1) carried_error = -1; } else { - error = print_acl(argv[i], type); + error = print_acl(argv[i], type, hflag); if (error == -1) carried_error = -1; } ==== //depot/projects/ia64/bin/setfacl/setfacl.1#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/bin/setfacl/setfacl.1,v 1.7 2001/12/04 14:20:46 ru Exp $ +.\" $FreeBSD: src/bin/setfacl/setfacl.1,v 1.8 2002/12/30 15:36:29 rwatson Exp $ .\" .Dd January 7, 2001 .Dt SETFACL 1 @@ -33,7 +33,7 @@ .Nd set ACL information .Sh SYNOPSIS .Nm -.Op Fl bdkn +.Op Fl bdhkn .Op Fl m Ar entries .Op Fl M Ar file1 .Op Fl x Ar entries @@ -63,6 +63,9 @@ The operations apply to the default ACL entries instead of access ACL entries. Currently only directories may have default ACL's. +.It Fl h +If the target of the operation is a symbolic link, perform the operation +on the symbolic link itself, rather than following the link. .It Fl k Delete any default ACL entries on the specified files. It is not considered an error if the specified files do not have ==== //depot/projects/ia64/bin/setfacl/setfacl.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/setfacl/setfacl.c,v 1.6 2002/06/30 05:15:03 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/setfacl/setfacl.c,v 1.7 2002/12/30 15:36:29 rwatson Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -71,11 +71,19 @@ } acl = zmalloc(sizeof(acl_t) * 2); - acl[ACCESS_ACL] = acl_get_file(filename, ACL_TYPE_ACCESS); + if (h_flag) + acl[ACCESS_ACL] = acl_get_link_np(filename, ACL_TYPE_ACCESS); + else + acl[ACCESS_ACL] = acl_get_file(filename, ACL_TYPE_ACCESS); if (acl[ACCESS_ACL] == NULL) err(1, "acl_get_file() failed"); if (S_ISDIR(sb.st_mode)) { - acl[DEFAULT_ACL] = acl_get_file(filename, ACL_TYPE_DEFAULT); + if (h_flag) + acl[DEFAULT_ACL] = acl_get_link_np(filename, + ACL_TYPE_DEFAULT); + else + acl[DEFAULT_ACL] = acl_get_file(filename, + ACL_TYPE_DEFAULT); if (acl[DEFAULT_ACL] == NULL) err(1, "acl_get_file() failed"); } else @@ -88,7 +96,7 @@ usage(void) { - fprintf(stderr, "usage: setfacl [-bdknv] [-m entries] [-M file1] " + fprintf(stderr, "usage: setfacl [-bdhknv] [-m entries] [-M file1] " "[-x entries] [-X file2] [file ...]\n"); exit(1); } @@ -104,12 +112,12 @@ acl_type = ACL_TYPE_ACCESS; carried_error = local_error = 0; - have_mask = have_stdin = n_flag = need_mask = 0; + h_flag = have_mask = have_stdin = n_flag = need_mask = 0; TAILQ_INIT(&entrylist); TAILQ_INIT(&filelist); - while ((ch = getopt(argc, argv, "M:X:bdkm:nx:")) != -1) + while ((ch = getopt(argc, argv, "M:X:bdhkm:nx:")) != -1) switch(ch) { case 'M': entry = zmalloc(sizeof(struct sf_entry)); @@ -133,6 +141,9 @@ case 'd': acl_type = ACL_TYPE_DEFAULT; break; + case 'h': + h_flag = 1; + break; case 'k': entry = zmalloc(sizeof(struct sf_entry)); entry->op = OP_REMOVE_DEF; ==== //depot/projects/ia64/bin/setfacl/setfacl.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/bin/setfacl/setfacl.h,v 1.3 2001/12/03 01:20:52 jedgar Exp $ + * $FreeBSD: src/bin/setfacl/setfacl.h,v 1.4 2002/12/30 15:36:29 rwatson Exp $ */ #ifndef _SETFACL_H @@ -75,6 +75,7 @@ uint have_mask; uint need_mask; uint have_stdin; +uint h_flag; uint n_flag; #endif /* _SETFACL_H */ ==== //depot/projects/ia64/etc/mtree/BSD.include.dist#11 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.63 2002/12/03 15:05:32 rwatson Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.64 2002/12/30 09:45:03 simokawa Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -20,6 +20,8 @@ .. iicbus .. + firewire + .. ofw .. ppbus ==== //depot/projects/ia64/etc/mtree/BSD.local.dist#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.93 2002/10/29 16:48:03 tobez Exp $ +# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.94 2002/12/30 08:52:05 ache Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -231,6 +231,10 @@ .. bg_BG.CP1251 .. + ca_ES.ISO8859-1 + .. + ca_ES.ISO8859-15 + .. cs_CZ.ISO8859-2 .. da_DK.ISO8859-1 ==== //depot/projects/ia64/etc/mtree/BSD.usr.dist#16 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.269 2002/11/15 18:44:09 ru Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.270 2002/12/30 08:52:05 ache Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -341,6 +341,10 @@ .. bg_BG.CP1251 .. + ca_ES.ISO8859-1 + .. + ca_ES.ISO8859-15 + .. cs_CZ.ISO8859-2 .. da_DK.ISO8859-1 @@ -669,6 +673,10 @@ .. bg_BG.CP1251 .. + ca_ES.ISO8859-1 + .. + ca_ES.ISO8859-15 + .. cs_CZ.ISO8859-2 .. da_DK.ISO8859-1 ==== //depot/projects/ia64/include/Makefile#22 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.192 2002/12/26 14:30:55 tjr Exp $ +# $FreeBSD: src/include/Makefile,v 1.193 2002/12/30 09:45:03 simokawa Exp $ # # Doing a make install builds /usr/include # @@ -33,8 +33,8 @@ netipx netkey netnatm netncp netns netsmb nfs nfsclient nfsserver \ pccard posix4 sys vm -LSUBDIRS= cam/scsi dev/an dev/ic dev/iicbus dev/ofw dev/ppbus dev/smbus \ - dev/usb dev/wi fs/devfs \ +LSUBDIRS= cam/scsi dev/an dev/ic dev/iicbus dev/firewire dev/ofw \ + dev/ppbus dev/smbus dev/usb dev/wi fs/devfs \ fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs fs/nwfs fs/portalfs \ fs/procfs fs/smbfs fs/umapfs fs/unionfs isofs/cd9660 \ netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \ ==== //depot/projects/ia64/include/stdlib.h#15 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)stdlib.h 8.5 (Berkeley) 5/19/95 - * $FreeBSD: src/include/stdlib.h,v 1.45 2002/10/23 14:18:07 markm Exp $ + * $FreeBSD: src/include/stdlib.h,v 1.46 2002/12/30 11:12:16 obrien Exp $ */ #ifndef _STDLIB_H_ @@ -227,7 +227,7 @@ arc4random(void); void arc4random_addrandom(unsigned char *dat, int datlen); void arc4random_stir(void); -char *getbsize(size_t *, long *); +char *getbsize(int *, long *); /* getcap(3) functions */ char *cgetcap(char *, const char *, int); int cgetclose(void); ==== //depot/projects/ia64/lib/libc/gen/getbsize.3#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)getbsize.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/gen/getbsize.3,v 1.9 2002/10/23 14:18:07 markm Exp $ +.\" $FreeBSD: src/lib/libc/gen/getbsize.3,v 1.10 2002/12/30 11:12:16 obrien Exp $ .\" .Dd June 4, 1993 .Dt GETBSIZE 3 @@ -43,7 +43,7 @@ .Sh SYNOPSIS .In stdlib.h .Ft char * -.Fn getbsize "size_t *headerlenp" "long *blocksizep" +.Fn getbsize "int *headerlenp" "long *blocksizep" .Sh DESCRIPTION The .Fn getbsize ==== //depot/projects/ia64/lib/libc/gen/getbsize.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)getbsize.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/getbsize.c,v 1.5 2002/10/23 14:18:07 markm Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getbsize.c,v 1.7 2002/12/30 19:04:06 obrien Exp $"); #include <err.h> #include <stdio.h> @@ -44,7 +44,7 @@ char * getbsize(headerlenp, blocksizep) - size_t *headerlenp; + int *headerlenp; long *blocksizep; { static char header[20]; ==== //depot/projects/ia64/lib/libmp/Makefile#3 (text+ko) ==== @@ -1,13 +1,12 @@ -# $FreeBSD: src/lib/libmp/Makefile,v 1.6 2002/05/13 12:11:54 ru Exp $ +# $FreeBSD: src/lib/libmp/Makefile,v 1.7 2002/12/30 09:25:30 obrien Exp $ LIB= mp SHLIB_MAJOR= 4 +MAN= libmp.3 +INCS= mp.h +SRCS= mpasbn.c + +WARNS?= 2 CFLAGS+= -ansi -pedantic -WARNS?= 2 -# openssl/bn.h isn't WARNS-safe, but I still want the warings. -NO_WERROR= yes -SRCS= mpasbn.c -INCS= mp.h -MAN= libmp.3 .include <bsd.lib.mk> ==== //depot/projects/ia64/sbin/mount_smbfs/Makefile#2 (text+ko) ==== @@ -1,9 +1,8 @@ -# $FreeBSD: src/sbin/mount_smbfs/Makefile,v 1.1 2001/12/14 11:41:22 sheldonh Exp $ +# $FreeBSD: src/sbin/mount_smbfs/Makefile,v 1.2 2002/12/30 09:38:46 obrien Exp $ PROG= mount_smbfs SRCS= mount_smbfs.c getmntopts.c -WARNS?= 2 -NO_WERROR= yes +WARNS?= 0 MAN= mount_smbfs.8 MOUNTDIR= ${.CURDIR}/../mount ==== //depot/projects/ia64/sbin/swapon/swapon.c#7 (text+ko) ==== @@ -42,7 +42,7 @@ static char sccsid[] = "@(#)swapon.c 8.1 (Berkeley) 6/5/93"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/swapon/swapon.c,v 1.15 2002/12/30 05:35:06 mike Exp $"; + "$FreeBSD: src/sbin/swapon/swapon.c,v 1.16 2002/12/30 18:24:14 mike Exp $"; #endif /* not lint */ #include <sys/stat.h> @@ -211,7 +211,6 @@ size_t mibsize, size; struct xswdev xsw; int hlen, mib[16], n, pagesize; - size_t hsize; long blocksize; long long total = 0; long long used = 0; @@ -229,8 +228,7 @@ hlen = 10; break; default: - getbsize(&hsize, &blocksize); - hlen = hsize; + getbsize(&hlen, &blocksize); break; } ==== //depot/projects/ia64/share/colldef/Makefile#10 (text+ko) ==== @@ -1,10 +1,12 @@ -# $FreeBSD: src/share/colldef/Makefile,v 1.52 2002/10/25 22:02:09 ache Exp $ +# $FreeBSD: src/share/colldef/Makefile,v 1.53 2002/12/30 09:09:57 ache Exp $ # NOMAN=YES CLEANFILES+= ${LOCALES:S/$/.out/g} LOCALES= bg_BG.CP1251 \ + ca_ES.ISO8859-1 \ + ca_ES.ISO8859-15 \ cs_CZ.ISO8859-2 \ de_DE.ISO8859-1 \ de_DE.ISO8859-15 \ @@ -54,6 +56,8 @@ all: ${LOCALES:S/$/.out/g} bg_BG.CP1251.out: map.CP1251 +ca_ES.ISO8859-15.out: map.ISO8859-15 +ca_ES.ISO8859-1.out: map.ISO8859-1 cs_CZ.ISO8859-2.out: map.ISO8859-2 de_DE.ISO8859-15.out: map.ISO8859-15 de_DE.ISO8859-1.out: map.ISO8859-1 ==== //depot/projects/ia64/share/mklocale/Makefile#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mklocale/Makefile,v 1.47 2002/10/25 22:02:09 ache Exp $ +# $FreeBSD: src/share/mklocale/Makefile,v 1.48 2002/12/30 09:09:57 ache Exp $ NOMAN=YES CLEANFILES+= ${LOCALES:S/$/.out/g} @@ -25,9 +25,9 @@ LOCALEDIR= ${DESTDIR}/usr/share/locale ASCIILINKS= en_AU en_CA en_GB en_NZ en_US -LATIN1XLINKS= af_ZA da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_NZ en_US \ - es_ES fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT nl_BE \ - nl_NL no_NO pt_PT sv_SE +LATIN1XLINKS= af_ZA ca_ES da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_NZ \ + en_US es_ES fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT \ + nl_BE nl_NL no_NO pt_PT sv_SE LATIN1LINKS= ${LATIN1XLINKS} pt_BR LATIN15LINKS= ${LATIN1XLINKS} et_EE LATIN2LINKS= cs_CZ hr_HR hu_HU pl_PL sl_SI sr_YU ro_RO sk_SK ==== //depot/projects/ia64/share/monetdef/Makefile#8 (text+ko) ==== @@ -1,10 +1,11 @@ -# $FreeBSD: src/share/monetdef/Makefile,v 1.42 2002/10/25 22:02:09 ache Exp $ +# $FreeBSD: src/share/monetdef/Makefile,v 1.43 2002/12/30 09:09:57 ache Exp $ NOMAN=YES CLEANFILES+= ${LOCALES:S/$/.out/g} LOCALES= af_ZA.ISO8859-1 \ bg_BG.CP1251 \ + ca_ES.ISO8859-1 \ cs_CZ.ISO8859-2 \ da_DK.ISO8859-1 \ de_AT.ISO8859-1 \ @@ -54,9 +55,9 @@ LOCALEDIR= ${DESTDIR}/usr/share/locale ASCIILINKS= en_AU en_CA en_GB en_NZ en_US -LATIN15LINKS= af_ZA da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_NZ en_US \ - es_ES fi_FI fr_BE fr_CA fr_CH fr_FR is_IS is_IS it_IT it_CH \ - nl_BE nl_NL no_NO pt_PT sv_SE +LATIN15LINKS= af_ZA ca_ES da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_NZ \ + en_US es_ES fi_FI fr_BE fr_CA fr_CH fr_FR is_IS is_IS it_IT \ + it_CH nl_BE nl_NL no_NO pt_PT sv_SE CH_SRC= de_CH CH_LINKS= fr_CH it_CH ==== //depot/projects/ia64/share/msgdef/Makefile#8 (text+ko) ==== @@ -1,10 +1,11 @@ -# $FreeBSD: src/share/msgdef/Makefile,v 1.43 2002/10/25 22:02:09 ache Exp $ +# $FreeBSD: src/share/msgdef/Makefile,v 1.44 2002/12/30 09:09:58 ache Exp $ NOMAN=YES CLEANFILES+= ${LOCALES:S/$/.out/g} LOCALES= af_ZA.ISO8859-1 \ bg_BG.CP1251 \ + ca_ES.ISO8859-1 \ cs_CZ.ISO8859-2 \ da_DK.ISO8859-1 \ de_DE.ISO8859-1 \ @@ -48,8 +49,8 @@ LOCALEDIR= ${DESTDIR}/usr/share/locale ASCIILINKS= en_CA en_GB en_US -LATIN15LINKS= af_ZA da_DK de_DE en_CA en_GB en_US es_ES fi_FI fr_BE fr_CH \ - fr_FR is_IS it_IT nl_NL no_NO pt_PT sv_SE +LATIN15LINKS= af_ZA ca_ES da_DK de_DE en_CA en_GB en_US es_ES fi_FI fr_BE \ + fr_CH fr_FR is_IS it_IT nl_NL no_NO pt_PT sv_SE GB_LINKS= en_AU en_NZ FR_LINKS= fr_CA ==== //depot/projects/ia64/share/numericdef/Makefile#8 (text+ko) ==== @@ -1,10 +1,11 @@ -# $FreeBSD: src/share/numericdef/Makefile,v 1.41 2002/10/25 22:02:10 ache Exp $ +# $FreeBSD: src/share/numericdef/Makefile,v 1.42 2002/12/30 09:09:58 ache Exp $ NOMAN=YES CLEANFILES+= ${LOCALES:S/$/.out/g} LOCALES= af_ZA.ISO8859-1 \ bg_BG.CP1251 \ + ca_ES.ISO8859-1 \ cs_CZ.ISO8859-2 \ da_DK.ISO8859-1 \ de_DE.ISO8859-1 \ @@ -46,7 +47,7 @@ LOCALEDIR= ${DESTDIR}/usr/share/locale ASCIILINKS= en_US -LATIN15LINKS= af_ZA da_DK de_DE en_US es_ES fi_FI fr_BE fr_FR is_IS \ +LATIN15LINKS= af_ZA ca_ES da_DK de_DE en_US es_ES fi_FI fr_BE fr_FR is_IS \ it_CH it_IT nl_NL no_NO pt_PT sv_SE US_LINKS= en_CA en_GB ==== //depot/projects/ia64/share/timedef/Makefile#8 (text+ko) ==== @@ -1,9 +1,10 @@ -# $FreeBSD: src/share/timedef/Makefile,v 1.30 2002/10/25 22:02:10 ache Exp $ +# $FreeBSD: src/share/timedef/Makefile,v 1.31 2002/12/30 09:09:58 ache Exp $ NOMAN=YES CLEANFILES+= ${LOCALES:S/$/.out/g} LOCALES= bg_BG.CP1251 \ + ca_ES.ISO8859-1 \ cs_CZ.ISO8859-2 \ da_DK.ISO8859-1 \ de_AT.ISO8859-1 \ @@ -48,7 +49,7 @@ LOCALEDIR= ${DESTDIR}/usr/share/locale -LATIN15LINKS= da_DK de_AT de_DE en_GB en_US es_ES fi_FI fr_FR is_IS \ +LATIN15LINKS= ca_ES da_DK de_AT de_DE en_GB en_US es_ES fi_FI fr_FR is_IS \ it_IT la_LN nl_NL no_NO pt_PT sv_SE DE_LINKS= de_CH FR_LINKS= fr_BE fr_CA fr_CH ==== //depot/projects/ia64/sys/dev/awi/awi.c#9 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: awi.c,v 1.26 2000/07/21 04:48:55 onoe Exp $ */ -/* $FreeBSD: src/sys/dev/awi/awi.c,v 1.23 2002/11/14 23:54:49 sam Exp $ */ +/* $FreeBSD: src/sys/dev/awi/awi.c,v 1.24 2002/12/30 20:22:38 sam Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -1326,7 +1326,7 @@ m_freem(m0); return NULL; } - M_COPY_PKTHDR(n, m0); + M_MOVE_PKTHDR(n, m0); n->m_len = MHLEN; } else { MGET(n, M_DONTWAIT, MT_DATA); ==== //depot/projects/ia64/sys/dev/awi/awi_wep.c#6 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: awi_wep.c,v 1.4 2000/08/14 11:28:03 onoe Exp $ */ -/* $FreeBSD: src/sys/dev/awi/awi_wep.c,v 1.9 2002/09/21 08:44:48 phk Exp $ */ +/* $FreeBSD: src/sys/dev/awi/awi_wep.c,v 1.10 2002/12/30 20:22:38 sam Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -323,7 +323,7 @@ n0 = n; if (n == NULL) goto fail; - M_COPY_PKTHDR(n, m); + M_MOVE_PKTHDR(n, m); len = IEEE80211_WEP_IVLEN + IEEE80211_WEP_KIDLEN + IEEE80211_WEP_CRCLEN; if (txflag) { n->m_pkthdr.len += len; ==== //depot/projects/ia64/sys/dev/en/midway.c#6 (text+ko) ==== @@ -32,7 +32,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/en/midway.c,v 1.31 2002/11/14 23:54:51 sam Exp $ + * $FreeBSD: src/sys/dev/en/midway.c,v 1.32 2002/12/30 20:22:38 sam Exp $ */ /* @@ -1843,7 +1843,7 @@ return(0); } if (m->m_flags & M_PKTHDR) - M_COPY_PKTHDR(new, m); + M_MOVE_PKTHDR(new, m); MCLGET(new, M_DONTWAIT); if ((new->m_flags & M_EXT) == 0) { m_free(new); ==== //depot/projects/ia64/sys/dev/firewire/iec13213.h#2 (text+ko) ==== @@ -30,17 +30,53 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/iec13213.h,v 1.1 2002/09/13 12:31:56 ikob Exp $ + * $FreeBSD: src/sys/dev/firewire/iec13213.h,v 1.2 2002/12/30 09:41:32 simokawa Exp $ * */ + +#define CSRTYPE_SHIFT 6 +#define CSRTYPE_MASK (3 << CSRTYPE_SHIFT) +#define CSRTYPE_I (0 << CSRTYPE_SHIFT) /* Immediate */ +#define CSRTYPE_C (1 << CSRTYPE_SHIFT) /* CSR offset */ +#define CSRTYPE_L (2 << CSRTYPE_SHIFT) /* Leaf */ +#define CSRTYPE_D (3 << CSRTYPE_SHIFT) /* Directory */ + +#define CSRKEY_MASK 0x3f +#define CSRKEY_DESC 0x01 /* Descriptor */ +#define CSRKEY_BDINFO 0x02 /* Bus_Dependent_Info */ +#define CSRKEY_VENDOR 0x03 /* Vendor */ +#define CSRKEY_HW 0x04 /* Hardware_Version */ +#define CSRKEY_MODULE 0x07 /* Module */ +#define CSRKEY_NCAP 0x0c /* Node_Capabilities */ +#define CSRKEY_EUI64 0x0d /* EUI_64 */ +#define CSRKEY_UNIT 0x11 /* Unit */ +#define CSRKEY_SPEC 0x12 /* Specifier_ID */ +#define CSRKEY_VER 0x13 /* Version */ +#define CSRKEY_DINFO 0x14 /* Dependent_Info */ +#define CSRKEY_ULOC 0x15 /* Unit_Location */ +#define CSRKEY_MODEL 0x17 /* Model */ +#define CSRKEY_INST 0x18 /* Instance */ +#define CSRKEY_KEYW 0x19 /* Keyword */ +#define CSRKEY_FEAT 0x1a /* Feature */ +#define CSRKEY_EROM 0x1b /* Extended_ROM */ +#define CSRKEY_EKSID 0x1c /* Extended_Key_Specifier_ID */ +#define CSRKEY_EKEY 0x1d /* Extended_Key */ +#define CSRKEY_EDATA 0x1e /* Extended_Data */ +#define CSRKEY_MDESC 0x1f /* Modifiable_Descriptor */ +#define CSRKEY_DID 0x20 /* Directory_ID */ +#define CSRKEY_REV 0x21 /* Revision */ + +#define CROM_TEXTLEAF (CSRTYPE_L | CSRKEY_DESC) /* 0x81 */ +#define CROM_LUN (CSRTYPE_I | CSRKEY_DINFO) /* 0x14 */ + +/* ??? #define CSRKEY_MVID 0x3 -#define CSRKEY_NCAP 0xc #define CSRKEY_NUNQ 0x8d #define CSRKEY_NPWR 0x30 -#define CSRKEY_SPEC 0x12 +*/ + #define CSRVAL_1394TA 0x00a02d #define CSRVAL_ANSIT10 0x00609e -#define CSRKEY_VER 0x13 #define CSR_PROTAVC 0x010001 #define CSR_PROTCAL 0x010002 #define CSR_PROTEHS 0x010004 @@ -70,8 +106,8 @@ struct csrtext { u_int32_t crc:16, crc_len:16; - u_int32_t spec_id:16, - spec_type:16; + u_int32_t spec_id:24, + spec_type:8; u_int32_t lang_id; u_int32_t text[0]; }; @@ -90,3 +126,24 @@ v_id:24; u_int32_t c_id_lo; }; + +#define CROM_MAX_DEPTH 10 +struct crom_ptr { + struct csrdirectory *dir; + int index; +}; + +struct crom_context { + int depth; + struct crom_ptr stack[CROM_MAX_DEPTH]; +}; + +void crom_init_context(struct crom_context *, u_int32_t *); +struct csrreg *crom_get(struct crom_context *); +void crom_next(struct crom_context *); +void crom_parse_text(struct crom_context *, char *, int); +u_int16_t crom_crc(u_int32_t *r, int); +struct csrreg *crom_search_key(struct crom_context *, u_int8_t); +#ifndef _KERNEL +char *crom_desc(struct crom_context *, char *, int); +#endif >>> 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?200212302103.gBUL3WDM055640>