svn commit: r222977 - in user/hrs/ipv6: bin/sh
cddl/compat/opensolaris/include contrib/less contrib/top
games/fortune/datfiles gnu/usr.bin lib/libstand sbin/fsck_ffs
sbin/rtsol share/mk share/skel ...
Hiroki Sato
hrs at FreeBSD.org
Sat Jun 11 06:56:29 UTC 2011
Author: hrs
Date: Sat Jun 11 06:56:26 2011
New Revision: 222977
URL: http://svn.freebsd.org/changeset/base/222977
Log:
Merge from HEAD at 222975.
Added:
user/hrs/ipv6/tools/regression/bin/sh/execution/set-x1.0
- copied unchanged from r222976, head/tools/regression/bin/sh/execution/set-x1.0
user/hrs/ipv6/tools/regression/bin/sh/execution/set-x2.0
- copied unchanged from r222976, head/tools/regression/bin/sh/execution/set-x2.0
user/hrs/ipv6/tools/regression/bin/sh/execution/set-x3.0
- copied unchanged from r222976, head/tools/regression/bin/sh/execution/set-x3.0
user/hrs/ipv6/tools/regression/bin/sh/parameters/env1.0
- copied unchanged from r222976, head/tools/regression/bin/sh/parameters/env1.0
user/hrs/ipv6/tools/tools/cxgbetool/
- copied from r222976, head/tools/tools/cxgbetool/
Modified:
user/hrs/ipv6/bin/sh/eval.c
user/hrs/ipv6/bin/sh/expand.c
user/hrs/ipv6/bin/sh/main.c
user/hrs/ipv6/bin/sh/parser.c
user/hrs/ipv6/bin/sh/parser.h
user/hrs/ipv6/bin/sh/sh.1
user/hrs/ipv6/cddl/compat/opensolaris/include/assert.h
user/hrs/ipv6/contrib/less/NEWS
user/hrs/ipv6/contrib/less/README
user/hrs/ipv6/contrib/less/command.c
user/hrs/ipv6/contrib/less/funcs.h
user/hrs/ipv6/contrib/less/less.man
user/hrs/ipv6/contrib/less/less.nro
user/hrs/ipv6/contrib/less/lessecho.man
user/hrs/ipv6/contrib/less/lessecho.nro
user/hrs/ipv6/contrib/less/lesskey.man
user/hrs/ipv6/contrib/less/lesskey.nro
user/hrs/ipv6/contrib/less/optfunc.c
user/hrs/ipv6/contrib/less/opttbl.c
user/hrs/ipv6/contrib/less/version.c
user/hrs/ipv6/games/fortune/datfiles/fortunes
user/hrs/ipv6/gnu/usr.bin/Makefile
user/hrs/ipv6/lib/libstand/bswap.c
user/hrs/ipv6/sbin/fsck_ffs/suj.c
user/hrs/ipv6/sbin/rtsol/Makefile
user/hrs/ipv6/share/skel/dot.shrc
user/hrs/ipv6/sys/Makefile
user/hrs/ipv6/sys/amd64/amd64/legacy.c
user/hrs/ipv6/sys/cddl/compat/opensolaris/sys/kstat.h
user/hrs/ipv6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h
user/hrs/ipv6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/ddt.h
user/hrs/ipv6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h
user/hrs/ipv6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h
user/hrs/ipv6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h
user/hrs/ipv6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h
user/hrs/ipv6/sys/conf/Makefile.powerpc
user/hrs/ipv6/sys/conf/files
user/hrs/ipv6/sys/dev/aac/aac.c
user/hrs/ipv6/sys/dev/aac/aacvar.h
user/hrs/ipv6/sys/dev/acpica/acpi.c
user/hrs/ipv6/sys/dev/ata/ata-sata.c
user/hrs/ipv6/sys/dev/atkbdc/atkbd.c
user/hrs/ipv6/sys/dev/bxe/bxe_debug.h
user/hrs/ipv6/sys/dev/bxe/bxe_link.c
user/hrs/ipv6/sys/dev/bxe/if_bxe.c
user/hrs/ipv6/sys/dev/bxe/if_bxe.h
user/hrs/ipv6/sys/dev/cxgbe/adapter.h
user/hrs/ipv6/sys/dev/cxgbe/t4_ioctl.h
user/hrs/ipv6/sys/dev/cxgbe/t4_main.c
user/hrs/ipv6/sys/dev/cxgbe/t4_sge.c
user/hrs/ipv6/sys/dev/iwn/if_iwn.c
user/hrs/ipv6/sys/dev/pci/pci_pci.c
user/hrs/ipv6/sys/dev/xen/blkback/blkback.c
user/hrs/ipv6/sys/dev/xen/blkfront/blkfront.c
user/hrs/ipv6/sys/dev/xen/control/control.c
user/hrs/ipv6/sys/dev/xen/netfront/netfront.c
user/hrs/ipv6/sys/i386/i386/legacy.c
user/hrs/ipv6/sys/ia64/ia64/machdep.c
user/hrs/ipv6/sys/kern/kern_shutdown.c
user/hrs/ipv6/sys/kern/vfs_bio.c
user/hrs/ipv6/sys/sys/vnode.h
user/hrs/ipv6/sys/ufs/ffs/ffs_alloc.c
user/hrs/ipv6/sys/ufs/ffs/ffs_balloc.c
user/hrs/ipv6/sys/ufs/ffs/ffs_extern.h
user/hrs/ipv6/sys/ufs/ffs/ffs_inode.c
user/hrs/ipv6/sys/ufs/ffs/ffs_softdep.c
user/hrs/ipv6/sys/ufs/ffs/ffs_vfsops.c
user/hrs/ipv6/sys/ufs/ffs/ffs_vnops.c
user/hrs/ipv6/sys/ufs/ffs/fs.h
user/hrs/ipv6/sys/ufs/ffs/softdep.h
user/hrs/ipv6/sys/ufs/ufs/inode.h
user/hrs/ipv6/sys/ufs/ufs/quota.h
user/hrs/ipv6/sys/ufs/ufs/ufs_lookup.c
user/hrs/ipv6/sys/ufs/ufs/ufs_quota.c
user/hrs/ipv6/sys/ufs/ufs/ufsmount.h
user/hrs/ipv6/sys/x86/x86/tsc.c
user/hrs/ipv6/sys/xen/interface/io/xenbus.h
user/hrs/ipv6/sys/xen/xenbus/xenbus.c
user/hrs/ipv6/sys/xen/xenbus/xenbus_if.m
user/hrs/ipv6/sys/xen/xenbus/xenbusb.c
user/hrs/ipv6/sys/xen/xenbus/xenbusb.h
user/hrs/ipv6/sys/xen/xenbus/xenbusb_back.c
user/hrs/ipv6/sys/xen/xenbus/xenbusb_front.c
user/hrs/ipv6/sys/xen/xenbus/xenbusb_if.m
user/hrs/ipv6/sys/xen/xenbus/xenbusvar.h
user/hrs/ipv6/sys/xen/xenstore/xenstorevar.h
user/hrs/ipv6/tools/tools/README
user/hrs/ipv6/usr.sbin/mfiutil/mfi_config.c
user/hrs/ipv6/usr.sbin/mfiutil/mfi_drive.c
user/hrs/ipv6/usr.sbin/mfiutil/mfi_evt.c
user/hrs/ipv6/usr.sbin/mfiutil/mfi_flash.c
user/hrs/ipv6/usr.sbin/mfiutil/mfi_patrol.c
user/hrs/ipv6/usr.sbin/mfiutil/mfi_show.c
user/hrs/ipv6/usr.sbin/mfiutil/mfi_volume.c
user/hrs/ipv6/usr.sbin/rtadvd/config.c
user/hrs/ipv6/usr.sbin/rtadvd/config.h
user/hrs/ipv6/usr.sbin/rtadvd/rtadvd.8
user/hrs/ipv6/usr.sbin/rtadvd/rtadvd.c
user/hrs/ipv6/usr.sbin/rtadvd/rtadvd.h
Directory Properties:
user/hrs/ipv6/ (props changed)
user/hrs/ipv6/cddl/contrib/opensolaris/ (props changed)
user/hrs/ipv6/contrib/bind9/ (props changed)
user/hrs/ipv6/contrib/binutils/ (props changed)
user/hrs/ipv6/contrib/bzip2/ (props changed)
user/hrs/ipv6/contrib/compiler-rt/ (props changed)
user/hrs/ipv6/contrib/dialog/ (props changed)
user/hrs/ipv6/contrib/ee/ (props changed)
user/hrs/ipv6/contrib/expat/ (props changed)
user/hrs/ipv6/contrib/file/ (props changed)
user/hrs/ipv6/contrib/gcc/ (props changed)
user/hrs/ipv6/contrib/gdb/ (props changed)
user/hrs/ipv6/contrib/gdtoa/ (props changed)
user/hrs/ipv6/contrib/gnu-sort/ (props changed)
user/hrs/ipv6/contrib/groff/ (props changed)
user/hrs/ipv6/contrib/less/ (props changed)
user/hrs/ipv6/contrib/libpcap/ (props changed)
user/hrs/ipv6/contrib/libstdc++/ (props changed)
user/hrs/ipv6/contrib/llvm/ (props changed)
user/hrs/ipv6/contrib/llvm/tools/clang/ (props changed)
user/hrs/ipv6/contrib/ncurses/ (props changed)
user/hrs/ipv6/contrib/netcat/ (props changed)
user/hrs/ipv6/contrib/ntp/ (props changed)
user/hrs/ipv6/contrib/one-true-awk/ (props changed)
user/hrs/ipv6/contrib/openbsm/ (props changed)
user/hrs/ipv6/contrib/openpam/ (props changed)
user/hrs/ipv6/contrib/pf/ (props changed)
user/hrs/ipv6/contrib/sendmail/ (props changed)
user/hrs/ipv6/contrib/tcpdump/ (props changed)
user/hrs/ipv6/contrib/tcsh/ (props changed)
user/hrs/ipv6/contrib/top/ (props changed)
user/hrs/ipv6/contrib/top/install-sh (props changed)
user/hrs/ipv6/contrib/tzcode/stdtime/ (props changed)
user/hrs/ipv6/contrib/tzcode/zic/ (props changed)
user/hrs/ipv6/contrib/tzdata/ (props changed)
user/hrs/ipv6/contrib/wpa/ (props changed)
user/hrs/ipv6/contrib/xz/ (props changed)
user/hrs/ipv6/crypto/openssh/ (props changed)
user/hrs/ipv6/crypto/openssl/ (props changed)
user/hrs/ipv6/gnu/lib/ (props changed)
user/hrs/ipv6/gnu/usr.bin/binutils/ (props changed)
user/hrs/ipv6/gnu/usr.bin/cc/cc_tools/ (props changed)
user/hrs/ipv6/gnu/usr.bin/gdb/ (props changed)
user/hrs/ipv6/lib/libc/ (props changed)
user/hrs/ipv6/lib/libc/stdtime/ (props changed)
user/hrs/ipv6/lib/libutil/ (props changed)
user/hrs/ipv6/lib/libz/ (props changed)
user/hrs/ipv6/sbin/ (props changed)
user/hrs/ipv6/sbin/ipfw/ (props changed)
user/hrs/ipv6/share/mk/bsd.arch.inc.mk (props changed)
user/hrs/ipv6/share/zoneinfo/ (props changed)
user/hrs/ipv6/sys/ (props changed)
user/hrs/ipv6/sys/amd64/include/xen/ (props changed)
user/hrs/ipv6/sys/boot/ (props changed)
user/hrs/ipv6/sys/boot/i386/efi/ (props changed)
user/hrs/ipv6/sys/boot/ia64/efi/ (props changed)
user/hrs/ipv6/sys/boot/ia64/ski/ (props changed)
user/hrs/ipv6/sys/boot/powerpc/boot1.chrp/ (props changed)
user/hrs/ipv6/sys/boot/powerpc/ofw/ (props changed)
user/hrs/ipv6/sys/cddl/contrib/opensolaris/ (props changed)
user/hrs/ipv6/sys/conf/ (props changed)
user/hrs/ipv6/sys/contrib/dev/acpica/ (props changed)
user/hrs/ipv6/sys/contrib/octeon-sdk/ (props changed)
user/hrs/ipv6/sys/contrib/pf/ (props changed)
user/hrs/ipv6/sys/contrib/x86emu/ (props changed)
user/hrs/ipv6/usr.bin/calendar/ (props changed)
user/hrs/ipv6/usr.bin/csup/ (props changed)
user/hrs/ipv6/usr.bin/procstat/ (props changed)
user/hrs/ipv6/usr.sbin/ndiscvt/ (props changed)
user/hrs/ipv6/usr.sbin/rtsold/ (props changed)
user/hrs/ipv6/usr.sbin/zic/ (props changed)
Modified: user/hrs/ipv6/bin/sh/eval.c
==============================================================================
--- user/hrs/ipv6/bin/sh/eval.c Sat Jun 11 06:05:00 2011 (r222976)
+++ user/hrs/ipv6/bin/sh/eval.c Sat Jun 11 06:56:26 2011 (r222977)
@@ -745,8 +745,9 @@ evalcommand(union node *cmd, int flags,
/* Print the command if xflag is set. */
if (xflag) {
char sep = 0;
- const char *p;
- out2str(ps4val());
+ const char *p, *ps4;
+ ps4 = expandstr(ps4val());
+ out2str(ps4 != NULL ? ps4 : ps4val());
for (sp = varlist.list ; sp ; sp = sp->next) {
if (sep != 0)
out2c(' ');
Modified: user/hrs/ipv6/bin/sh/expand.c
==============================================================================
--- user/hrs/ipv6/bin/sh/expand.c Sat Jun 11 06:05:00 2011 (r222976)
+++ user/hrs/ipv6/bin/sh/expand.c Sat Jun 11 06:56:26 2011 (r222977)
@@ -174,6 +174,7 @@ expandarg(union node *arg, struct arglis
ifslastp = NULL;
argstr(arg->narg.text, flag);
if (arglist == NULL) {
+ STACKSTRNUL(expdest);
return; /* here document expanded */
}
STPUTC('\0', expdest);
Modified: user/hrs/ipv6/bin/sh/main.c
==============================================================================
--- user/hrs/ipv6/bin/sh/main.c Sat Jun 11 06:05:00 2011 (r222976)
+++ user/hrs/ipv6/bin/sh/main.c Sat Jun 11 06:56:26 2011 (r222977)
@@ -78,7 +78,7 @@ int rootshell;
struct jmploc main_handler;
int localeisutf8, initial_localeisutf8;
-static void read_profile(const char *);
+static void read_profile(char *);
static char *find_dot_file(char *);
/*
@@ -92,7 +92,7 @@ static char *find_dot_file(char *);
int
main(int argc, char *argv[])
{
- struct stackmark smark;
+ struct stackmark smark, smark2;
volatile int state;
char *shinit;
@@ -139,6 +139,7 @@ main(int argc, char *argv[])
rootshell = 1;
init();
setstackmark(&smark);
+ setstackmark(&smark2);
procargs(argc, argv);
pwd_init(iflag);
if (iflag)
@@ -163,6 +164,7 @@ state2:
}
state3:
state = 4;
+ popstackmark(&smark2);
if (minusc) {
evalstring(minusc, sflag ? 0 : EV_EXIT);
}
@@ -235,12 +237,16 @@ cmdloop(int top)
*/
static void
-read_profile(const char *name)
+read_profile(char *name)
{
int fd;
+ const char *expandedname;
+ expandedname = expandstr(name);
+ if (expandedname == NULL)
+ return;
INTOFF;
- if ((fd = open(name, O_RDONLY)) >= 0)
+ if ((fd = open(expandedname, O_RDONLY)) >= 0)
setinputfd(fd, 1);
INTON;
if (fd < 0)
Modified: user/hrs/ipv6/bin/sh/parser.c
==============================================================================
--- user/hrs/ipv6/bin/sh/parser.c Sat Jun 11 06:05:00 2011 (r222976)
+++ user/hrs/ipv6/bin/sh/parser.c Sat Jun 11 06:56:26 2011 (r222977)
@@ -2029,3 +2029,47 @@ getprompt(void *unused __unused)
ps[i] = '\0';
return (ps);
}
+
+
+const char *
+expandstr(char *ps)
+{
+ union node n;
+ struct jmploc jmploc;
+ struct jmploc *const savehandler = handler;
+ const int saveprompt = doprompt;
+ struct parsefile *const savetopfile = getcurrentfile();
+ struct parser_temp *const saveparser_temp = parser_temp;
+ const char *result = NULL;
+
+ if (!setjmp(jmploc.loc)) {
+ handler = &jmploc;
+ parser_temp = NULL;
+ setinputstring(ps, 1);
+ doprompt = 0;
+ readtoken1(pgetc(), DQSYNTAX, "\n\n", 0);
+ if (backquotelist != NULL)
+ error("Command substitution not allowed here");
+
+ n.narg.type = NARG;
+ n.narg.next = NULL;
+ n.narg.text = wordtext;
+ n.narg.backquote = backquotelist;
+
+ expandarg(&n, NULL, 0);
+ result = stackblock();
+ INTOFF;
+ }
+ handler = savehandler;
+ doprompt = saveprompt;
+ popfilesupto(savetopfile);
+ if (parser_temp != saveparser_temp) {
+ parser_temp_free_all();
+ parser_temp = saveparser_temp;
+ }
+ if (result != NULL) {
+ INTON;
+ } else if (exception == EXINT)
+ raise(SIGINT);
+ return result;
+}
Modified: user/hrs/ipv6/bin/sh/parser.h
==============================================================================
--- user/hrs/ipv6/bin/sh/parser.h Sat Jun 11 06:05:00 2011 (r222976)
+++ user/hrs/ipv6/bin/sh/parser.h Sat Jun 11 06:56:26 2011 (r222977)
@@ -82,3 +82,4 @@ void fixredir(union node *, const char *
int goodname(const char *);
int isassignment(const char *);
char *getprompt(void *);
+const char *expandstr(char *);
Modified: user/hrs/ipv6/bin/sh/sh.1
==============================================================================
--- user/hrs/ipv6/bin/sh/sh.1 Sat Jun 11 06:05:00 2011 (r222976)
+++ user/hrs/ipv6/bin/sh/sh.1 Sat Jun 11 06:56:26 2011 (r222977)
@@ -32,7 +32,7 @@
.\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95
.\" $FreeBSD$
.\"
-.Dd May 21, 2011
+.Dd June 10, 2011
.Dt SH 1
.Os
.Sh NAME
@@ -124,8 +124,8 @@ If the environment variable
.Ev ENV
is set on entry to a shell, or is set in the
.Pa .profile
-of a login shell, the shell then reads commands from the file named in
-.Ev ENV .
+of a login shell, the shell then subjects its value to parameter expansion
+and arithmetic expansion and reads commands from the named file.
Therefore, a user should place commands that are to be executed only
at login time in the
.Pa .profile
@@ -324,7 +324,7 @@ Useful for debugging.
Write each command
(preceded by the value of the
.Va PS4
-variable)
+variable subjected to parameter expansion and arithmetic expansion)
to standard error before it is executed.
Useful for debugging.
.El
Modified: user/hrs/ipv6/cddl/compat/opensolaris/include/assert.h
==============================================================================
--- user/hrs/ipv6/cddl/compat/opensolaris/include/assert.h Sat Jun 11 06:05:00 2011 (r222976)
+++ user/hrs/ipv6/cddl/compat/opensolaris/include/assert.h Sat Jun 11 06:56:26 2011 (r222977)
@@ -43,6 +43,10 @@
#include <stdio.h>
#include <stdlib.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
static __inline void
__assert(const char *expr, const char *file, int line)
{
@@ -52,4 +56,9 @@ __assert(const char *expr, const char *f
abort();
/* NOTREACHED */
}
+
+#ifdef __cplusplus
+}
+#endif
+
#endif /* !_ASSERT_H_ */
Modified: user/hrs/ipv6/contrib/less/NEWS
==============================================================================
--- user/hrs/ipv6/contrib/less/NEWS Sat Jun 11 06:05:00 2011 (r222976)
+++ user/hrs/ipv6/contrib/less/NEWS Sat Jun 11 06:56:26 2011 (r222977)
@@ -12,6 +12,15 @@
======================================================================
+ Major changes between "less" versions 443 and 444
+
+* Fix bug in unget handling that can cause strange effects on the
+ command line.
+
+* Remove vestiges of obsolete -l option that can cause a crash.
+
+======================================================================
+
Major changes between "less" versions 436 and 443
* Change search behavior such that when a search is given an explicit
Modified: user/hrs/ipv6/contrib/less/README
==============================================================================
--- user/hrs/ipv6/contrib/less/README Sat Jun 11 06:05:00 2011 (r222976)
+++ user/hrs/ipv6/contrib/less/README Sat Jun 11 06:56:26 2011 (r222977)
@@ -7,9 +7,9 @@
**************************************************************************
**************************************************************************
- Less, version 443
+ Less, version 444
- This is the distribution of less, version 443, released 09 Apr 2011.
+ This is the distribution of less, version 444, released 09 Jun 2011.
This program is part of the GNU project (http://www.gnu.org).
This program is free software. You may redistribute it and/or
Modified: user/hrs/ipv6/contrib/less/command.c
==============================================================================
--- user/hrs/ipv6/contrib/less/command.c Sat Jun 11 06:05:00 2011 (r222976)
+++ user/hrs/ipv6/contrib/less/command.c Sat Jun 11 06:56:26 2011 (r222977)
@@ -302,7 +302,7 @@ is_erase_char(c)
*/
static int
mca_opt_first_char(c)
- int c;
+ int c;
{
int flag = (optflag & ~OPT_NO_PROMPT);
if (flag == OPT_NO_TOGGLE)
@@ -846,6 +846,7 @@ ungetcc(c)
ug->ug_char = c;
ug->ug_next = ungot;
ungot = ug;
+ unget_end = 0;
}
/*
Modified: user/hrs/ipv6/contrib/less/funcs.h
==============================================================================
--- user/hrs/ipv6/contrib/less/funcs.h Sat Jun 11 06:05:00 2011 (r222976)
+++ user/hrs/ipv6/contrib/less/funcs.h Sat Jun 11 06:56:26 2011 (r222977)
@@ -194,7 +194,6 @@
public void unmark ();
public void opt_o ();
public void opt__O ();
- public void opt_l ();
public void opt_j ();
public void calc_jump_sline ();
public void opt_shift ();
Modified: user/hrs/ipv6/contrib/less/less.man
==============================================================================
--- user/hrs/ipv6/contrib/less/less.man Sat Jun 11 06:05:00 2011 (r222976)
+++ user/hrs/ipv6/contrib/less/less.man Sat Jun 11 06:56:26 2011 (r222977)
@@ -1156,7 +1156,7 @@ LESS(1)
next 8bcccbcc18b95.bb125.bb
If neither LESSCHARSET nor LESSCHARDEF is set, but any of the strings
- "UTF-8", "UTF8", "utf-8" or "utf8" is found in the LC_ALL, LC_TYPE or
+ "UTF-8", "UTF8", "utf-8" or "utf8" is found in the LC_ALL, LC_CTYPE or
LANG environment variables, then the default character set is utf-8.
If that string is not found, but your system supports the [4msetlocale[0m
@@ -1580,4 +1580,4 @@ LESS(1)
- Version 443: 09 Apr 2011 LESS(1)
+ Version 444: 09 Jun 2011 LESS(1)
Modified: user/hrs/ipv6/contrib/less/less.nro
==============================================================================
--- user/hrs/ipv6/contrib/less/less.nro Sat Jun 11 06:05:00 2011 (r222976)
+++ user/hrs/ipv6/contrib/less/less.nro Sat Jun 11 06:56:26 2011 (r222977)
@@ -1,4 +1,4 @@
-.TH LESS 1 "Version 443: 09 Apr 2011"
+.TH LESS 1 "Version 444: 09 Jun 2011"
.SH NAME
less \- opposite of more
.SH SYNOPSIS
@@ -1276,7 +1276,7 @@ to each of the possible values for LESSC
.PP
If neither LESSCHARSET nor LESSCHARDEF is set,
but any of the strings "UTF-8", "UTF8", "utf-8" or "utf8"
-is found in the LC_ALL, LC_TYPE or LANG
+is found in the LC_ALL, LC_CTYPE or LANG
environment variables, then the default character set is utf-8.
.PP
If that string is not found, but your system supports the
Modified: user/hrs/ipv6/contrib/less/lessecho.man
==============================================================================
--- user/hrs/ipv6/contrib/less/lessecho.man Sat Jun 11 06:05:00 2011 (r222976)
+++ user/hrs/ipv6/contrib/less/lessecho.man Sat Jun 11 06:56:26 2011 (r222977)
@@ -46,4 +46,4 @@ LESSECHO(1)
- Version 443: 09 Apr 2011 LESSECHO(1)
+ Version 444: 09 Jun 2011 LESSECHO(1)
Modified: user/hrs/ipv6/contrib/less/lessecho.nro
==============================================================================
--- user/hrs/ipv6/contrib/less/lessecho.nro Sat Jun 11 06:05:00 2011 (r222976)
+++ user/hrs/ipv6/contrib/less/lessecho.nro Sat Jun 11 06:56:26 2011 (r222977)
@@ -1,4 +1,4 @@
-.TH LESSECHO 1 "Version 443: 09 Apr 2011"
+.TH LESSECHO 1 "Version 444: 09 Jun 2011"
.SH NAME
lessecho \- expand metacharacters
.SH SYNOPSIS
Modified: user/hrs/ipv6/contrib/less/lesskey.man
==============================================================================
--- user/hrs/ipv6/contrib/less/lesskey.man Sat Jun 11 06:05:00 2011 (r222976)
+++ user/hrs/ipv6/contrib/less/lesskey.man Sat Jun 11 06:56:26 2011 (r222977)
@@ -354,4 +354,4 @@ LESSKEY(1)
- Version 443: 09 Apr 2011 LESSKEY(1)
+ Version 444: 09 Jun 2011 LESSKEY(1)
Modified: user/hrs/ipv6/contrib/less/lesskey.nro
==============================================================================
--- user/hrs/ipv6/contrib/less/lesskey.nro Sat Jun 11 06:05:00 2011 (r222976)
+++ user/hrs/ipv6/contrib/less/lesskey.nro Sat Jun 11 06:56:26 2011 (r222977)
@@ -1,4 +1,4 @@
-.TH LESSKEY 1 "Version 443: 09 Apr 2011"
+.TH LESSKEY 1 "Version 444: 09 Jun 2011"
.SH NAME
lesskey \- specify key bindings for less
.SH SYNOPSIS
Modified: user/hrs/ipv6/contrib/less/optfunc.c
==============================================================================
--- user/hrs/ipv6/contrib/less/optfunc.c Sat Jun 11 06:05:00 2011 (r222976)
+++ user/hrs/ipv6/contrib/less/optfunc.c Sat Jun 11 06:56:26 2011 (r222977)
@@ -132,34 +132,6 @@ opt__O(type, s)
#endif
/*
- * Handlers for -l option.
- */
- public void
-opt_l(type, s)
- int type;
- char *s;
-{
- int err;
- int n;
- char *t;
-
- switch (type)
- {
- case INIT:
- t = s;
- n = getnum(&t, "l", &err);
- if (err || n <= 0)
- {
- error("Line number is required after -l", NULL_PARG);
- return;
- }
- plusoption = TRUE;
- ungetsc(s);
- break;
- }
-}
-
-/*
* Handlers for -j option.
*/
public void
Modified: user/hrs/ipv6/contrib/less/opttbl.c
==============================================================================
--- user/hrs/ipv6/contrib/less/opttbl.c Sat Jun 11 06:05:00 2011 (r222976)
+++ user/hrs/ipv6/contrib/less/opttbl.c Sat Jun 11 06:56:26 2011 (r222977)
@@ -263,10 +263,6 @@ static struct loption option[] =
NULL
}
},
- { 'l', NULL,
- STRING|NO_TOGGLE|NO_QUERY, 0, NULL, opt_l,
- { NULL, NULL, NULL }
- },
{ 'L', &L__optname,
BOOL, OPT_ON, &use_lessopen, NULL,
{
Modified: user/hrs/ipv6/contrib/less/version.c
==============================================================================
--- user/hrs/ipv6/contrib/less/version.c Sat Jun 11 06:05:00 2011 (r222976)
+++ user/hrs/ipv6/contrib/less/version.c Sat Jun 11 06:56:26 2011 (r222977)
@@ -742,6 +742,7 @@ v441 1/21/11 Fix semi-infinite loop i
v442 3/2/11 Fix search bug.
Add ctrl-G line edit command.
v443 4/9/11 Fix Windows build.
+v444 6/8/11 Fix ungetc bug; remove vestiges of obsolete -l option.
*/
-char version[] = "443";
+char version[] = "444";
Modified: user/hrs/ipv6/games/fortune/datfiles/fortunes
==============================================================================
--- user/hrs/ipv6/games/fortune/datfiles/fortunes Sat Jun 11 06:05:00 2011 (r222976)
+++ user/hrs/ipv6/games/fortune/datfiles/fortunes Sat Jun 11 06:56:26 2011 (r222977)
@@ -2057,7 +2057,7 @@ promised me faithfully that you'd be bac
nine. It just can't take that long to play 18 holes of golf."
"Honey, wait," said Harry. "Let me explain. I know what I promised
you, but I have a very good reason for being late. Fred and I tee'd off
-right on time and everything was find for the first three holes. Then, on
+right on time and everything was fine for the first three holes. Then, on
the fourth tee Fred had a stroke. I ran back to the clubhouse but couldn't
find a doctor. And, by the time I got back to Fred, he was dead. So, for
the next 15 holes, it was hit the ball, drag Fred, hit the ball, drag Fred...
@@ -25523,7 +25523,9 @@ him, prussic acid could solve our popula
%
If everybody minded their own business, the world would go
around a deal faster.
- -- The Duchess, "Through the Looking Glass"
+ -- The Duchess; Lewis Carroll,
+ "Through the Looking-Glass,
+ and What Alice Found There" (1871)
%
If everything is coming your way then you're in the wrong lane.
%
@@ -42420,7 +42422,7 @@ in peoples' memories never really happen
Some of them want to use you,
Some of them want to be used by you,
...Everybody's looking for something.
- -- Eurythmics
+ -- Eurythmics, "Sweet Dreams (Are Made Of This)"
%
Some of us are becoming the men we wanted to marry.
-- Gloria Steinem
Modified: user/hrs/ipv6/gnu/usr.bin/Makefile
==============================================================================
--- user/hrs/ipv6/gnu/usr.bin/Makefile Sat Jun 11 06:05:00 2011 (r222976)
+++ user/hrs/ipv6/gnu/usr.bin/Makefile Sat Jun 11 06:56:26 2011 (r222977)
@@ -11,7 +11,7 @@ SUBDIR= ${_binutils} \
${_dtc} \
${_gdb} \
${_gperf} \
- ${_grep} \
+ grep \
${_groff} \
patch \
${_rcs} \
@@ -27,8 +27,6 @@ _groff= groff
.endif
.endif
-_grep= grep
-
.if ${MK_CVS} != "no"
_cvs= cvs
.endif
Modified: user/hrs/ipv6/lib/libstand/bswap.c
==============================================================================
--- user/hrs/ipv6/lib/libstand/bswap.c Sat Jun 11 06:05:00 2011 (r222976)
+++ user/hrs/ipv6/lib/libstand/bswap.c Sat Jun 11 06:56:26 2011 (r222977)
@@ -8,7 +8,7 @@ __FBSDID("$FreeBSD$");
#if defined(LIBC_SCCS) && !defined(lint)
static char *rcsid = "$NetBSD: bswap32.c,v 1.1 1997/10/09 15:42:33 bouyer Exp $";
-static char *rcsid = "$NetBSD: bswap64.c,v 1.1 1997/10/09 15:42:33 bouyer Exp $";
+static char *rcsid = "$NetBSD: bswap64.c,v 1.3 2009/03/16 05:59:21 cegger Exp $";
#endif
#include <sys/types.h>
@@ -30,12 +30,28 @@ bswap32(u_int32_t x)
u_int64_t
bswap64(u_int64_t x)
-{
- u_int32_t *p = (u_int32_t*)&x;
- u_int32_t t;
- t = bswap32(p[0]);
- p[0] = bswap32(p[1]);
- p[1] = t;
- return x;
-}
-
+{
+#ifdef _LP64
+ /*
+ * Assume we have wide enough registers to do it without touching
+ * memory.
+ */
+ return ( (x << 56) & 0xff00000000000000UL ) |
+ ( (x << 40) & 0x00ff000000000000UL ) |
+ ( (x << 24) & 0x0000ff0000000000UL ) |
+ ( (x << 8) & 0x000000ff00000000UL ) |
+ ( (x >> 8) & 0x00000000ff000000UL ) |
+ ( (x >> 24) & 0x0000000000ff0000UL ) |
+ ( (x >> 40) & 0x000000000000ff00UL ) |
+ ( (x >> 56) & 0x00000000000000ffUL );
+#else
+ /*
+ * Split the operation in two 32bit steps.
+ */
+ u_int32_t tl, th;
+
+ th = bswap32((u_int32_t)(x & 0x00000000ffffffffULL));
+ tl = bswap32((u_int32_t)((x >> 32) & 0x00000000ffffffffULL));
+ return ((u_int64_t)th << 32) | tl;
+#endif
+}
Modified: user/hrs/ipv6/sbin/fsck_ffs/suj.c
==============================================================================
--- user/hrs/ipv6/sbin/fsck_ffs/suj.c Sat Jun 11 06:05:00 2011 (r222976)
+++ user/hrs/ipv6/sbin/fsck_ffs/suj.c Sat Jun 11 06:56:26 2011 (r222977)
@@ -1604,7 +1604,7 @@ ino_trunc(ino_t ino, off_t size)
* uninitialized space later.
*/
off = blkoff(fs, size);
- if (off) {
+ if (off && DIP(ip, di_mode) != IFDIR) {
uint8_t *buf;
long clrsize;
@@ -1775,13 +1775,18 @@ cg_trunc(struct suj_cg *sc)
struct suj_ino *sino;
int i;
- for (i = 0; i < SUJ_HASHSIZE; i++)
- LIST_FOREACH(sino, &sc->sc_inohash[i], si_next)
+ for (i = 0; i < SUJ_HASHSIZE; i++) {
+ LIST_FOREACH(sino, &sc->sc_inohash[i], si_next) {
if (sino->si_trunc) {
ino_trunc(sino->si_ino,
sino->si_trunc->jt_size);
+ sino->si_blkadj = 0;
sino->si_trunc = NULL;
}
+ if (sino->si_blkadj)
+ ino_adjblks(sino);
+ }
+ }
}
/*
@@ -1791,7 +1796,6 @@ cg_trunc(struct suj_cg *sc)
static void
cg_check_blk(struct suj_cg *sc)
{
- struct suj_ino *sino;
struct suj_blk *sblk;
int i;
@@ -1799,15 +1803,6 @@ cg_check_blk(struct suj_cg *sc)
for (i = 0; i < SUJ_HASHSIZE; i++)
LIST_FOREACH(sblk, &sc->sc_blkhash[i], sb_next)
blk_check(sblk);
- /*
- * Now that we've freed blocks which are not referenced we
- * make a second pass over all inodes to adjust their block
- * counts.
- */
- for (i = 0; i < SUJ_HASHSIZE; i++)
- LIST_FOREACH(sino, &sc->sc_inohash[i], si_next)
- if (sino->si_blkadj)
- ino_adjblks(sino);
}
/*
@@ -1961,14 +1956,7 @@ ino_append(union jrec *rec)
"parent %d, diroff %jd\n",
refrec->jr_op, refrec->jr_ino, refrec->jr_nlink,
refrec->jr_parent, refrec->jr_diroff);
- /*
- * Lookup the ino and clear truncate if one is found. Partial
- * truncates are always done synchronously so if we discover
- * an operation that requires a lock the truncation has completed
- * and can be discarded.
- */
sino = ino_lookup(((struct jrefrec *)rec)->jr_ino, 1);
- sino->si_trunc = NULL;
sino->si_hasrecs = 1;
srec = errmalloc(sizeof(*srec));
srec->sr_rec = rec;
@@ -2174,9 +2162,7 @@ blk_build(struct jblkrec *blkrec)
struct suj_rec *srec;
struct suj_blk *sblk;
struct jblkrec *blkrn;
- struct suj_ino *sino;
ufs2_daddr_t blk;
- off_t foff;
int frag;
if (debug)
@@ -2185,17 +2171,6 @@ blk_build(struct jblkrec *blkrec)
blkrec->jb_op, blkrec->jb_blkno, blkrec->jb_frags,
blkrec->jb_oldfrags, blkrec->jb_ino, blkrec->jb_lbn);
- /*
- * Look up the inode and clear the truncate if any lbns after the
- * truncate lbn are freed or allocated.
- */
- sino = ino_lookup(blkrec->jb_ino, 0);
- if (sino && sino->si_trunc) {
- foff = lblktosize(fs, blkrec->jb_lbn);
- foff += lfragtosize(fs, blkrec->jb_frags);
- if (foff > sino->si_trunc->jt_size)
- sino->si_trunc = NULL;
- }
blk = blknum(fs, blkrec->jb_blkno);
frag = fragnum(fs, blkrec->jb_blkno);
sblk = blk_lookup(blk, 1);
@@ -2242,10 +2217,15 @@ ino_build_trunc(struct jtrncrec *rec)
struct suj_ino *sino;
if (debug)
- printf("ino_build_trunc: ino %d, size %jd\n",
- rec->jt_ino, rec->jt_size);
+ printf("ino_build_trunc: op %d ino %d, size %jd\n",
+ rec->jt_op, rec->jt_ino, rec->jt_size);
sino = ino_lookup(rec->jt_ino, 1);
- sino->si_trunc = rec;
+ if (rec->jt_op == JOP_SYNC) {
+ sino->si_trunc = NULL;
+ return;
+ }
+ if (sino->si_trunc == NULL || sino->si_trunc->jt_size > rec->jt_size)
+ sino->si_trunc = rec;
}
/*
Modified: user/hrs/ipv6/sbin/rtsol/Makefile
==============================================================================
--- user/hrs/ipv6/sbin/rtsol/Makefile Sat Jun 11 06:05:00 2011 (r222976)
+++ user/hrs/ipv6/sbin/rtsol/Makefile Sat Jun 11 06:56:26 2011 (r222977)
@@ -19,7 +19,7 @@ SRCDIR= ${.CURDIR}/../../usr.sbin/rtsold
.PATH: ${SRCDIR}
PROG= rtsol
-SRCS= rtsold.c rtsol.c if.c probe.c rtsock.c
+SRCS= rtsold.c rtsol.c if.c probe.c dump.c rtsock.c
NO_MAN=
WARNS?= 3
Modified: user/hrs/ipv6/share/skel/dot.shrc
==============================================================================
--- user/hrs/ipv6/share/skel/dot.shrc Sat Jun 11 06:05:00 2011 (r222976)
+++ user/hrs/ipv6/share/skel/dot.shrc Sat Jun 11 06:56:26 2011 (r222977)
@@ -44,4 +44,4 @@ alias g='egrep -i'
# esac
# search path for cd(1)
-# CDPATH=.:$HOME
+# CDPATH=:$HOME
Modified: user/hrs/ipv6/sys/Makefile
==============================================================================
--- user/hrs/ipv6/sys/Makefile Sat Jun 11 06:05:00 2011 (r222976)
+++ user/hrs/ipv6/sys/Makefile Sat Jun 11 06:56:26 2011 (r222977)
@@ -12,7 +12,7 @@ CSCOPEDIRS= boot bsm cam cddl compat con
geom gnu isa kern libkern modules net net80211 netatalk \
netgraph netinet netinet6 netipsec netipx netnatm netncp \
netsmb nfs nfsclient nfsserver nlm opencrypto \
- pci rpc security sys ufs vm xdr ${CSCOPE_ARCHDIR}
+ pci rpc security sys ufs vm xdr xen ${CSCOPE_ARCHDIR}
.if defined(ALL_ARCH)
CSCOPE_ARCHDIR ?= amd64 arm i386 ia64 mips pc98 powerpc sparc64 x86
.else
Modified: user/hrs/ipv6/sys/amd64/amd64/legacy.c
==============================================================================
--- user/hrs/ipv6/sys/amd64/amd64/legacy.c Sat Jun 11 06:05:00 2011 (r222976)
+++ user/hrs/ipv6/sys/amd64/amd64/legacy.c Sat Jun 11 06:56:26 2011 (r222977)
@@ -81,6 +81,7 @@ static device_method_t legacy_methods[]
DEVMETHOD(bus_read_ivar, legacy_read_ivar),
DEVMETHOD(bus_write_ivar, legacy_write_ivar),
DEVMETHOD(bus_alloc_resource, bus_generic_alloc_resource),
+ DEVMETHOD(bus_adjust_resource, bus_generic_adjust_resource),
DEVMETHOD(bus_release_resource, bus_generic_release_resource),
DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource),
Modified: user/hrs/ipv6/sys/cddl/compat/opensolaris/sys/kstat.h
==============================================================================
--- user/hrs/ipv6/sys/cddl/compat/opensolaris/sys/kstat.h Sat Jun 11 06:05:00 2011 (r222976)
+++ user/hrs/ipv6/sys/cddl/compat/opensolaris/sys/kstat.h Sat Jun 11 06:56:26 2011 (r222977)
@@ -58,7 +58,7 @@ typedef struct kstat_named {
} value;
} kstat_named_t;
-kstat_t *kstat_create(char *module, int instance, char *name, char *class,
+kstat_t *kstat_create(char *module, int instance, char *name, char *cls,
uchar_t type, ulong_t ndata, uchar_t flags);
void kstat_install(kstat_t *ksp);
void kstat_delete(kstat_t *ksp);
Modified: user/hrs/ipv6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h
==============================================================================
--- user/hrs/ipv6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h Sat Jun 11 06:05:00 2011 (r222976)
+++ user/hrs/ipv6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h Sat Jun 11 06:56:26 2011 (r222977)
@@ -37,8 +37,8 @@ extern "C" {
typedef struct arc_buf_hdr arc_buf_hdr_t;
typedef struct arc_buf arc_buf_t;
-typedef void arc_done_func_t(zio_t *zio, arc_buf_t *buf, void *private);
-typedef int arc_evict_func_t(void *private);
+typedef void arc_done_func_t(zio_t *zio, arc_buf_t *buf, void *priv);
+typedef int arc_evict_func_t(void *priv);
/* generic arc_done_func_t's which you can use */
arc_done_func_t arc_bcopy_func;
@@ -103,17 +103,17 @@ int arc_referenced(arc_buf_t *buf);
#endif
int arc_read(zio_t *pio, spa_t *spa, const blkptr_t *bp, arc_buf_t *pbuf,
- arc_done_func_t *done, void *private, int priority, int zio_flags,
+ arc_done_func_t *done, void *priv, int priority, int zio_flags,
uint32_t *arc_flags, const zbookmark_t *zb);
int arc_read_nolock(zio_t *pio, spa_t *spa, const blkptr_t *bp,
- arc_done_func_t *done, void *private, int priority, int flags,
+ arc_done_func_t *done, void *priv, int priority, int flags,
uint32_t *arc_flags, const zbookmark_t *zb);
zio_t *arc_write(zio_t *pio, spa_t *spa, uint64_t txg,
blkptr_t *bp, arc_buf_t *buf, boolean_t l2arc, const zio_prop_t *zp,
- arc_done_func_t *ready, arc_done_func_t *done, void *private,
+ arc_done_func_t *ready, arc_done_func_t *done, void *priv,
int priority, int zio_flags, const zbookmark_t *zb);
-void arc_set_callback(arc_buf_t *buf, arc_evict_func_t *func, void *private);
+void arc_set_callback(arc_buf_t *buf, arc_evict_func_t *func, void *priv);
int arc_buf_evict(arc_buf_t *buf);
void arc_flush(spa_t *spa);
Modified: user/hrs/ipv6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/ddt.h
==============================================================================
--- user/hrs/ipv6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/ddt.h Sat Jun 11 06:05:00 2011 (r222976)
+++ user/hrs/ipv6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/ddt.h Sat Jun 11 06:56:26 2011 (r222977)
@@ -169,15 +169,15 @@ typedef struct ddt_ops {
#define DDT_NAMELEN 80
extern void ddt_object_name(ddt_t *ddt, enum ddt_type type,
- enum ddt_class class, char *name);
+ enum ddt_class cls, char *name);
extern int ddt_object_walk(ddt_t *ddt, enum ddt_type type,
- enum ddt_class class, uint64_t *walk, ddt_entry_t *dde);
+ enum ddt_class cls, uint64_t *walk, ddt_entry_t *dde);
extern uint64_t ddt_object_count(ddt_t *ddt, enum ddt_type type,
- enum ddt_class class);
+ enum ddt_class cls);
extern int ddt_object_info(ddt_t *ddt, enum ddt_type type,
- enum ddt_class class, dmu_object_info_t *);
+ enum ddt_class cls, dmu_object_info_t *);
extern boolean_t ddt_object_exists(ddt_t *ddt, enum ddt_type type,
- enum ddt_class class);
+ enum ddt_class cls);
extern void ddt_bp_fill(const ddt_phys_t *ddp, blkptr_t *bp,
uint64_t txg);
@@ -235,7 +235,7 @@ extern void ddt_unload(spa_t *spa);
extern void ddt_sync(spa_t *spa, uint64_t txg);
extern int ddt_walk(spa_t *spa, ddt_bookmark_t *ddb, ddt_entry_t *dde);
extern int ddt_object_update(ddt_t *ddt, enum ddt_type type,
- enum ddt_class class, ddt_entry_t *dde, dmu_tx_t *tx);
+ enum ddt_class cls, ddt_entry_t *dde, dmu_tx_t *tx);
extern const ddt_ops_t ddt_zap_ops;
Modified: user/hrs/ipv6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h
==============================================================================
--- user/hrs/ipv6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h Sat Jun 11 06:05:00 2011 (r222976)
+++ user/hrs/ipv6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h Sat Jun 11 06:56:26 2011 (r222977)
@@ -126,10 +126,10 @@ void dsl_free(dsl_pool_t *dp, uint64_t t
void dsl_free_sync(zio_t *pio, dsl_pool_t *dp, uint64_t txg,
const blkptr_t *bpp);
int dsl_read(zio_t *pio, spa_t *spa, const blkptr_t *bpp, arc_buf_t *pbuf,
- arc_done_func_t *done, void *private, int priority, int zio_flags,
+ arc_done_func_t *done, void *priv, int priority, int zio_flags,
uint32_t *arc_flags, const zbookmark_t *zb);
int dsl_read_nolock(zio_t *pio, spa_t *spa, const blkptr_t *bpp,
- arc_done_func_t *done, void *private, int priority, int zio_flags,
+ arc_done_func_t *done, void *priv, int priority, int zio_flags,
uint32_t *arc_flags, const zbookmark_t *zb);
void dsl_pool_create_origin(dsl_pool_t *dp, dmu_tx_t *tx);
void dsl_pool_upgrade_clones(dsl_pool_t *dp, dmu_tx_t *tx);
Modified: user/hrs/ipv6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h
==============================================================================
--- user/hrs/ipv6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h Sat Jun 11 06:05:00 2011 (r222976)
+++ user/hrs/ipv6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h Sat Jun 11 06:56:26 2011 (r222977)
@@ -655,7 +655,7 @@ extern void spa_history_log_version(spa_
/* error handling */
struct zbookmark;
extern void spa_log_error(spa_t *spa, zio_t *zio);
-extern void zfs_ereport_post(const char *class, spa_t *spa, vdev_t *vd,
+extern void zfs_ereport_post(const char *cls, spa_t *spa, vdev_t *vd,
zio_t *zio, uint64_t stateoroffset, uint64_t length);
extern void zfs_post_remove(spa_t *spa, vdev_t *vd);
extern void zfs_post_state_change(spa_t *spa, vdev_t *vd);
Modified: user/hrs/ipv6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h
==============================================================================
--- user/hrs/ipv6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h Sat Jun 11 06:05:00 2011 (r222976)
+++ user/hrs/ipv6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h Sat Jun 11 06:56:26 2011 (r222977)
@@ -115,6 +115,87 @@ typedef enum drr_headertype {
/*
* zfs ioctl command structure
*/
+struct drr_begin {
+ uint64_t drr_magic;
+ uint64_t drr_versioninfo; /* was drr_version */
+ uint64_t drr_creation_time;
+ dmu_objset_type_t drr_type;
+ uint32_t drr_flags;
+ uint64_t drr_toguid;
+ uint64_t drr_fromguid;
+ char drr_toname[MAXNAMELEN];
+};
+
+struct drr_end {
+ zio_cksum_t drr_checksum;
+ uint64_t drr_toguid;
+};
+
+struct drr_object {
+ uint64_t drr_object;
+ dmu_object_type_t drr_type;
+ dmu_object_type_t drr_bonustype;
+ uint32_t drr_blksz;
+ uint32_t drr_bonuslen;
+ uint8_t drr_checksumtype;
+ uint8_t drr_compress;
+ uint8_t drr_pad[6];
+ uint64_t drr_toguid;
+ /* bonus content follows */
+};
+
+struct drr_freeobjects {
+ uint64_t drr_firstobj;
+ uint64_t drr_numobjs;
+ uint64_t drr_toguid;
+};
+
+struct drr_write {
+ uint64_t drr_object;
+ dmu_object_type_t drr_type;
+ uint32_t drr_pad;
+ uint64_t drr_offset;
+ uint64_t drr_length;
+ uint64_t drr_toguid;
+ uint8_t drr_checksumtype;
+ uint8_t drr_checksumflags;
+ uint8_t drr_pad2[6];
+ ddt_key_t drr_key; /* deduplication key */
+ /* content follows */
+};
+
+struct drr_free {
+ uint64_t drr_object;
+ uint64_t drr_offset;
+ uint64_t drr_length;
+ uint64_t drr_toguid;
+};
+
+struct drr_write_byref {
+ /* where to put the data */
+ uint64_t drr_object;
+ uint64_t drr_offset;
+ uint64_t drr_length;
+ uint64_t drr_toguid;
+ /* where to find the prior copy of the data */
+ uint64_t drr_refguid;
+ uint64_t drr_refobject;
+ uint64_t drr_refoffset;
+ /* properties of the data */
+ uint8_t drr_checksumtype;
+ uint8_t drr_checksumflags;
+ uint8_t drr_pad2[6];
+ ddt_key_t drr_key; /* deduplication key */
+};
+
+struct drr_spill {
+ uint64_t drr_object;
+ uint64_t drr_length;
+ uint64_t drr_toguid;
+ uint64_t drr_pad[4]; /* needed for crypto */
+ /* spill data follows */
+};
+
typedef struct dmu_replay_record {
enum {
DRR_BEGIN, DRR_OBJECT, DRR_FREEOBJECTS,
@@ -123,79 +204,14 @@ typedef struct dmu_replay_record {
} drr_type;
uint32_t drr_payloadlen;
union {
- struct drr_begin {
- uint64_t drr_magic;
- uint64_t drr_versioninfo; /* was drr_version */
- uint64_t drr_creation_time;
- dmu_objset_type_t drr_type;
- uint32_t drr_flags;
- uint64_t drr_toguid;
- uint64_t drr_fromguid;
- char drr_toname[MAXNAMELEN];
- } drr_begin;
- struct drr_end {
- zio_cksum_t drr_checksum;
- uint64_t drr_toguid;
- } drr_end;
- struct drr_object {
- uint64_t drr_object;
- dmu_object_type_t drr_type;
- dmu_object_type_t drr_bonustype;
- uint32_t drr_blksz;
- uint32_t drr_bonuslen;
- uint8_t drr_checksumtype;
- uint8_t drr_compress;
- uint8_t drr_pad[6];
- uint64_t drr_toguid;
- /* bonus content follows */
- } drr_object;
- struct drr_freeobjects {
- uint64_t drr_firstobj;
- uint64_t drr_numobjs;
- uint64_t drr_toguid;
- } drr_freeobjects;
- struct drr_write {
- uint64_t drr_object;
- dmu_object_type_t drr_type;
- uint32_t drr_pad;
- uint64_t drr_offset;
- uint64_t drr_length;
- uint64_t drr_toguid;
- uint8_t drr_checksumtype;
- uint8_t drr_checksumflags;
- uint8_t drr_pad2[6];
- ddt_key_t drr_key; /* deduplication key */
- /* content follows */
- } drr_write;
- struct drr_free {
- uint64_t drr_object;
- uint64_t drr_offset;
- uint64_t drr_length;
- uint64_t drr_toguid;
- } drr_free;
- struct drr_write_byref {
- /* where to put the data */
- uint64_t drr_object;
- uint64_t drr_offset;
- uint64_t drr_length;
- uint64_t drr_toguid;
- /* where to find the prior copy of the data */
- uint64_t drr_refguid;
- uint64_t drr_refobject;
- uint64_t drr_refoffset;
- /* properties of the data */
- uint8_t drr_checksumtype;
- uint8_t drr_checksumflags;
- uint8_t drr_pad2[6];
- ddt_key_t drr_key; /* deduplication key */
- } drr_write_byref;
- struct drr_spill {
- uint64_t drr_object;
- uint64_t drr_length;
- uint64_t drr_toguid;
- uint64_t drr_pad[4]; /* needed for crypto */
- /* spill data follows */
- } drr_spill;
+ struct drr_begin drr_begin;
+ struct drr_end drr_end;
+ struct drr_object drr_object;
+ struct drr_freeobjects drr_freeobjects;
+ struct drr_write drr_write;
+ struct drr_free drr_free;
+ struct drr_write_byref drr_write_byref;
+ struct drr_spill drr_spill;
} drr_u;
} dmu_replay_record_t;
Modified: user/hrs/ipv6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h
==============================================================================
--- user/hrs/ipv6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h Sat Jun 11 06:05:00 2011 (r222976)
+++ user/hrs/ipv6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h Sat Jun 11 06:56:26 2011 (r222977)
@@ -426,22 +426,22 @@ struct zio {
};
extern zio_t *zio_null(zio_t *pio, spa_t *spa, vdev_t *vd,
- zio_done_func_t *done, void *private, enum zio_flag flags);
+ zio_done_func_t *done, void *priv, enum zio_flag flags);
extern zio_t *zio_root(spa_t *spa,
- zio_done_func_t *done, void *private, enum zio_flag flags);
+ zio_done_func_t *done, void *priv, enum zio_flag flags);
extern zio_t *zio_read(zio_t *pio, spa_t *spa, const blkptr_t *bp, void *data,
- uint64_t size, zio_done_func_t *done, void *private,
+ uint64_t size, zio_done_func_t *done, void *priv,
int priority, enum zio_flag flags, const zbookmark_t *zb);
extern zio_t *zio_write(zio_t *pio, spa_t *spa, uint64_t txg, blkptr_t *bp,
void *data, uint64_t size, const zio_prop_t *zp,
- zio_done_func_t *ready, zio_done_func_t *done, void *private,
+ zio_done_func_t *ready, zio_done_func_t *done, void *priv,
int priority, enum zio_flag flags, const zbookmark_t *zb);
extern zio_t *zio_rewrite(zio_t *pio, spa_t *spa, uint64_t txg, blkptr_t *bp,
- void *data, uint64_t size, zio_done_func_t *done, void *private,
+ void *data, uint64_t size, zio_done_func_t *done, void *priv,
int priority, enum zio_flag flags, zbookmark_t *zb);
extern void zio_write_override(zio_t *zio, blkptr_t *bp, int copies);
@@ -450,19 +450,20 @@ extern void zio_free(spa_t *spa, uint64_
extern zio_t *zio_claim(zio_t *pio, spa_t *spa, uint64_t txg,
const blkptr_t *bp,
- zio_done_func_t *done, void *private, enum zio_flag flags);
+ zio_done_func_t *done, void *priv, enum zio_flag flags);
extern zio_t *zio_ioctl(zio_t *pio, spa_t *spa, vdev_t *vd, int cmd,
- zio_done_func_t *done, void *private, int priority, enum zio_flag flags);
+ zio_done_func_t *done, void *priv, int priority,
+ enum zio_flag flags);
extern zio_t *zio_read_phys(zio_t *pio, vdev_t *vd, uint64_t offset,
uint64_t size, void *data, int checksum,
- zio_done_func_t *done, void *private, int priority, enum zio_flag flags,
+ zio_done_func_t *done, void *priv, int priority, enum zio_flag flags,
boolean_t labels);
extern zio_t *zio_write_phys(zio_t *pio, vdev_t *vd, uint64_t offset,
uint64_t size, void *data, int checksum,
- zio_done_func_t *done, void *private, int priority, enum zio_flag flags,
+ zio_done_func_t *done, void *priv, int priority, enum zio_flag flags,
boolean_t labels);
extern zio_t *zio_free_sync(zio_t *pio, spa_t *spa, uint64_t txg,
@@ -493,11 +494,11 @@ extern void zio_resubmit_stage_async(voi
extern zio_t *zio_vdev_child_io(zio_t *zio, blkptr_t *bp, vdev_t *vd,
uint64_t offset, void *data, uint64_t size, int type, int priority,
- enum zio_flag flags, zio_done_func_t *done, void *private);
+ enum zio_flag flags, zio_done_func_t *done, void *priv);
extern zio_t *zio_vdev_delegated_io(vdev_t *vd, uint64_t offset,
void *data, uint64_t size, int type, int priority,
- enum zio_flag flags, zio_done_func_t *done, void *private);
+ enum zio_flag flags, zio_done_func_t *done, void *priv);
extern void zio_vdev_io_bypass(zio_t *zio);
extern void zio_vdev_io_reissue(zio_t *zio);
Modified: user/hrs/ipv6/sys/conf/Makefile.powerpc
==============================================================================
--- user/hrs/ipv6/sys/conf/Makefile.powerpc Sat Jun 11 06:05:00 2011 (r222976)
+++ user/hrs/ipv6/sys/conf/Makefile.powerpc Sat Jun 11 06:56:26 2011 (r222977)
@@ -35,7 +35,7 @@ LDSCRIPT_NAME?= ldscript.${MACHINE_ARCH}
INCLUDES+= -I$S/contrib/libfdt
-CFLAGS+= -msoft-float
+CFLAGS+= -msoft-float -Wa,-many
DDB_ENABLED!= grep DDB opt_ddb.h || true
.if !empty(DDB_ENABLED)
Modified: user/hrs/ipv6/sys/conf/files
==============================================================================
--- user/hrs/ipv6/sys/conf/files Sat Jun 11 06:05:00 2011 (r222976)
+++ user/hrs/ipv6/sys/conf/files Sat Jun 11 06:56:26 2011 (r222977)
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-user
mailing list