CVS commit: src/sbin/raidctl

2021-08-01 Thread Greg Oster
Module Name:src
Committed By:   oster
Date:   Sun Aug  1 20:26:53 UTC 2021

Modified Files:
src/sbin/raidctl: raidctl.c

Log Message:
Move case 'l' to be in sorted order.  No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 src/sbin/raidctl/raidctl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sbin/raidctl

2021-05-27 Thread Thomas Klausner
Module Name:src
Committed By:   wiz
Date:   Thu May 27 07:03:27 UTC 2021

Modified Files:
src/sbin/raidctl: raidctl.8

Log Message:
Avoid using Pq.

In this case, the parentheses were wrong when a line was extended.


To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/sbin/raidctl/raidctl.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sbin/raidctl

2021-05-26 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Wed May 26 08:23:18 UTC 2021

Modified Files:
src/sbin/raidctl: raidctl.8

Log Message:
update the list of platforms supporting loading kernels from raid.
expand the HISTORY section to include notable RF moments in netbsd.
bump date.


To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/sbin/raidctl/raidctl.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sbin/raidctl

2020-09-12 Thread Michael van Elst
Module Name:src
Committed By:   mlelstv
Date:   Sun Sep 13 06:04:53 UTC 2020

Modified Files:
src/sbin/raidctl: raidctl.c

Log Message:
Allow components to be specified by wedge name.


To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/sbin/raidctl/raidctl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sbin/raidctl

2020-09-05 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sun Sep  6 05:31:46 UTC 2020

Modified Files:
src/sbin/raidctl: rf_configure.c

Log Message:
avoid trying to printf() a NULL as %s.  fixes likely bug.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sbin/raidctl/rf_configure.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sbin/raidctl

2019-02-06 Thread Greg Oster
Module Name:src
Committed By:   oster
Date:   Wed Feb  6 22:38:10 UTC 2019

Modified Files:
src/sbin/raidctl: raidctl.c

Log Message:
Correct printed IOCTL name that was incorrect since rev 1.5.


To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/sbin/raidctl/raidctl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sbin/raidctl

2019-02-04 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Mon Feb  4 09:31:22 UTC 2019

Modified Files:
src/sbin/raidctl: raidctl.c

Log Message:
- add the string length as an explicit parameter to get_time_string()
- remove casts when the same type is used on both sides
- expand hours_buffer[] to fit the range of hours in an 'int'
- add a work around for the sprintf() truncation checker that fails
  to detect that 'minutes' and 'seconds' have a small range


To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/sbin/raidctl/raidctl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sbin/raidctl

2018-03-24 Thread Takeshi Nakayama
Module Name:src
Committed By:   nakayama
Date:   Sat Mar 24 19:41:35 UTC 2018

Modified Files:
src/sbin/raidctl: raidctl.c

Log Message:
Follow the ioctl arg changes of RAIDFRAME_GET_COMPONENT_LABEL and
RAIDFRAME_CHECK_*_STATUS_EXT.

This should fix strange raidctl -s outputs reported in
current-users ML.


To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/sbin/raidctl/raidctl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sbin/raidctl

2017-11-21 Thread Robert Elz
Module Name:src
Committed By:   kre
Date:   Wed Nov 22 00:31:31 UTC 2017

Modified Files:
src/sbin/raidctl: rf_configure.c

Log Message:
Several more cleanups:
1. Don't force use of "for" when "while" works better.
2. No need to check c != '\0' when we also check (c == ' ' || c == '\t')
3. Use the size of the buffer we're using, rather than a different one
   (not really a concern, they're the same size)
4. Don't use fscanf() to read file data, use fgets() & sscanf().
5. After using a pointer as a char *, validate alignment before switching
   to int * (can only fail if kernel #define gets set stupidly)   Or #6...
6. Validate sparemap file name isn't too long for assigned space.
7. recognise that strlen() returns size_t - don't shove it into an int.
8. On out of mem, be more clear which allocation failed in warning msg.

ATF tests all pass.   But I don't think they use sparemap files.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sbin/raidctl/rf_configure.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sbin/raidctl

2017-11-21 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue Nov 21 16:31:37 UTC 2017

Modified Files:
src/sbin/raidctl: rf_configure.c

Log Message:
Avoid needless pointer calisthenics: &foo[0] -> foo


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sbin/raidctl/rf_configure.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sbin/raidctl

2017-11-21 Thread Robert Elz
Module Name:src
Committed By:   kre
Date:   Tue Nov 21 16:19:31 UTC 2017

Modified Files:
src/sbin/raidctl: rf_configure.c

Log Message:
With char bug[SIZE]  using sizeof(bug[0]) is kind of boring, use
sizeof(bug) instead...


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sbin/raidctl/rf_configure.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sbin/raidctl

2017-11-20 Thread Robert Elz
Module Name:src
Committed By:   kre
Date:   Mon Nov 20 22:16:23 UTC 2017

Modified Files:
src/sbin/raidctl: rf_configure.c

Log Message:
White space and comment formatting.   NFC.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sbin/raidctl/rf_configure.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sbin/raidctl

2017-11-20 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon Nov 20 19:10:45 UTC 2017

Modified Files:
src/sbin/raidctl: rf_configure.c rf_configure.h

Log Message:
stop using magic constants
wrap long lines
use warn{,x}
make static
knf


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sbin/raidctl/rf_configure.c
cvs rdiff -u -r1.1 -r1.2 src/sbin/raidctl/rf_configure.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sbin/raidctl

2017-11-20 Thread Frank Kardel
Module Name:src
Committed By:   kardel
Date:   Mon Nov 20 18:37:56 UTC 2017

Modified Files:
src/sbin/raidctl: raidctl.8 rf_configure.c

Log Message:
support NAME= syntax for disks and spares


To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 src/sbin/raidctl/raidctl.8
cvs rdiff -u -r1.26 -r1.27 src/sbin/raidctl/rf_configure.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sbin/raidctl

2017-01-10 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue Jan 10 20:47:05 UTC 2017

Modified Files:
src/sbin/raidctl: raidctl_hostops.c

Log Message:
need  for fstat()


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sbin/raidctl/raidctl_hostops.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sbin/raidctl

2016-03-09 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Mar  9 19:53:32 UTC 2016

Modified Files:
src/sbin/raidctl: rf_configure.c

Log Message:
PR/50921: David Binderman: Fix memory leak


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sbin/raidctl/rf_configure.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sbin/raidctl

2016-01-06 Thread Thomas Klausner
Module Name:src
Committed By:   wiz
Date:   Wed Jan  6 22:57:44 UTC 2016

Modified Files:
src/sbin/raidctl: raidctl.8 raidctl.c

Log Message:
Use standard sort order for options.

Add -U to usage.


To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/sbin/raidctl/raidctl.8
cvs rdiff -u -r1.64 -r1.65 src/sbin/raidctl/raidctl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sbin/raidctl

2016-01-06 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Jan  6 17:41:36 UTC 2016

Modified Files:
src/sbin/raidctl: raidctl.8 raidctl.c

Log Message:
Access to the SET_LAST_UNIT ioctl.


To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/sbin/raidctl/raidctl.8
cvs rdiff -u -r1.63 -r1.64 src/sbin/raidctl/raidctl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sbin/raidctl

2015-09-08 Thread Christoph Badura
Module Name:src
Committed By:   bad
Date:   Tue Sep  8 08:59:09 UTC 2015

Modified Files:
src/sbin/raidctl: raidctl.c

Log Message:
Rename argument of rf_output_devname() from devname to name to avoid a
warning about shadowing a global symbol when compiled by buildrump.sh.
Discussed with mrg.


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sbin/raidctl/raidctl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sbin/raidctl

2015-07-20 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Tue Jul 21 05:54:44 UTC 2015

Modified Files:
src/sbin/raidctl: raidctl.c

Log Message:
convert "component*" into "absent" for "START disks" part of the
output from "raidctl -G".  now this actually works when fed back
into raidctl -[cC].


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/sbin/raidctl/raidctl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sbin/raidctl

2015-06-30 Thread Thomas Klausner
Module Name:src
Committed By:   wiz
Date:   Tue Jun 30 22:16:12 UTC 2015

Modified Files:
src/sbin/raidctl: raidctl.8

Log Message:
Bump date for previous. Add whitespace.
Fix some mandoc warnings.


To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/sbin/raidctl/raidctl.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sbin/raidctl

2015-06-30 Thread Stephen Borrill
Module Name:src
Committed By:   sborrill
Date:   Tue Jun 30 17:18:14 UTC 2015

Modified Files:
src/sbin/raidctl: raidctl.8

Log Message:
Clarify that what was previously known as -A root is now -A forceroot, not
-A softroot and that -A root can still be used for historical reasons.


To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/sbin/raidctl/raidctl.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sbin/raidctl

2015-06-30 Thread Stephen Borrill
Module Name:src
Committed By:   sborrill
Date:   Tue Jun 30 17:02:14 UTC 2015

Modified Files:
src/sbin/raidctl: raidctl.c

Log Message:
Compare correct length string for force option to -A


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sbin/raidctl/raidctl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sbin/raidctl

2015-06-25 Thread Antti Kantee
Module Name:src
Committed By:   pooka
Date:   Fri Jun 26 01:16:54 UTC 2015

Modified Files:
src/sbin/raidctl: raidctl.c

Log Message:
&stars[offset] -> stars+offset.  It's shorter!

Coincidentally, the change also works around a gcc 5.1 bug which causes
a segmentation fault when trying to compile the longer version (guess
the compiler got exhausted, or something).
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66345


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sbin/raidctl/raidctl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sbin/raidctl

2015-05-27 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed May 27 17:55:23 UTC 2015

Modified Files:
src/sbin/raidctl: raidctl.c

Log Message:
use strtou


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/sbin/raidctl/raidctl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sbin/raidctl

2015-05-27 Thread Emmanuel Dreyfus
Module Name:src
Committed By:   manu
Date:   Wed May 27 15:31:15 UTC 2015

Modified Files:
src/sbin/raidctl: raidctl.c

Log Message:
Better sanity check numbers given to raidctl(8)

Replace atoi(3) by strtol(3), and check that numbers are valid,
positive, and in int32_t range. The previous lack of check could
silently lead to the same serial being set to all RAID volumes
for instance because given numbers were bigger than INT_MAX. The
consequence is in an awful mess when RAIDframe would mix volumes...


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sbin/raidctl/raidctl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sbin/raidctl

2014-04-03 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Thu Apr  3 18:54:10 UTC 2014

Modified Files:
src/sbin/raidctl: raidctl.8 raidctl.c

Log Message:
Add the ability to "softroot" mount (i.e. mount root only when the raid
set contains the boot device), as opposed to "hardroot" (the previous
default which forces the raid to be root no matter what).


To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/sbin/raidctl/raidctl.8
cvs rdiff -u -r1.56 -r1.57 src/sbin/raidctl/raidctl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sbin/raidctl

2013-09-19 Thread Matthias Scheler
Module Name:src
Committed By:   tron
Date:   Fri Sep 20 06:43:57 UTC 2013

Modified Files:
src/sbin/raidctl: raidctl.8

Log Message:
Note that NetBSD/amd64 can boot of RAID volumes.


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sbin/raidctl/raidctl.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sbin/raidctl

2012-03-23 Thread Nicolas Joly
Module Name:src
Committed By:   njoly
Date:   Fri Mar 23 18:28:13 UTC 2012

Modified Files:
src/sbin/raidctl: raidctl.8

Log Message:
Remove unexpected newline between Em macro and text.


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/sbin/raidctl/raidctl.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sbin/raidctl

2011-10-12 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Oct 12 16:45:37 UTC 2011

Modified Files:
src/sbin/raidctl: raidctl.c

Log Message:
PR/45456: Tetsuya Isaki: Don't mix stdio and write.


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sbin/raidctl/raidctl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sbin/raidctl

2011-09-28 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Wed Sep 28 10:29:42 UTC 2011

Modified Files:
src/sbin/raidctl: raidctl.c

Log Message:
print the serial number as an unsigned number.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sbin/raidctl/raidctl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sbin/raidctl

2011-08-02 Thread Thomas Klausner
Module Name:src
Committed By:   wiz
Date:   Tue Aug  2 10:28:00 UTC 2011

Modified Files:
src/sbin/raidctl: raidctl.8

Log Message:
New sentence, new line.


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sbin/raidctl/raidctl.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sbin/raidctl

2011-07-28 Thread Brian Buhrow
Module Name:src
Committed By:   buhrow
Date:   Thu Jul 28 18:25:22 UTC 2011

Modified Files:
src/sbin/raidctl: raidctl.8

Log Message:
Document the need for zeroing out the first 64 blocks of a replacement
component in a failed RAID set in order to avoid potentially configuring
RAId 1 sets with erroneous values taken from random extent data in the
replacement component partitions.


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/sbin/raidctl/raidctl.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sbin/raidctl

2011-02-09 Thread Antti Kantee
Module Name:src
Committed By:   pooka
Date:   Wed Feb  9 11:22:49 UTC 2011

Modified Files:
src/sbin/raidctl: prog_ops.h raidctl.c raidctl_hostops.c
raidctl_rumpops.c

Log Message:
Exterminate a bug I created in 2009.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sbin/raidctl/prog_ops.h \
src/sbin/raidctl/raidctl_hostops.c src/sbin/raidctl/raidctl_rumpops.c
cvs rdiff -u -r1.50 -r1.51 src/sbin/raidctl/raidctl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sbin/raidctl

2010-12-15 Thread Antti Kantee
Module Name:src
Committed By:   pooka
Date:   Wed Dec 15 18:37:55 UTC 2010

Modified Files:
src/sbin/raidctl: Makefile raidctl.c
Added Files:
src/sbin/raidctl: prog_ops.h raidctl_hostops.c raidctl_rumpops.c

Log Message:
Use RUMPPRG.

ok Greg Oster


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sbin/raidctl/Makefile
cvs rdiff -u -r0 -r1.1 src/sbin/raidctl/prog_ops.h \
src/sbin/raidctl/raidctl_hostops.c src/sbin/raidctl/raidctl_rumpops.c
cvs rdiff -u -r1.49 -r1.50 src/sbin/raidctl/raidctl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sbin/raidctl

2010-11-08 Thread Antti Kantee
Module Name:src
Committed By:   pooka
Date:   Mon Nov  8 12:42:35 UTC 2010

Modified Files:
src/sbin/raidctl: Makefile raidctl.c

Log Message:
Update RUMP_ACTION to use rumpclient.

The server must of course have some disks configured.  Let's say
we have this simple server with disks as a few sparse host files:

main()
{
rump_init();
rump_pub_etfs_register("/disk1", "./disk1.img", RUMP_ETFS_BLK);
rump_pub_etfs_register("/disk2", "./disk2.img", RUMP_ETFS_BLK);
rump_pub_etfs_register("/disk3", "./disk3.img", RUMP_ETFS_BLK);
rump_pub_etfs_register("/disk4", "./disk4.img", RUMP_ETFS_BLK);
pause();
}

And we run the server:

mainbus0 (root)
Kernelized RAIDframe activated
/disk1: hostpath ./disk1.img (97 GB)
/disk2: hostpath ./disk2.img (97 GB)
/disk3: hostpath ./disk3.img (97 GB)
/disk4: hostpath ./disk4.img (97 GB)

We can then configure the raid against the server:

> ./raidctl -c theraid.conf raid0

And lo, we have evidence of a level1 raid in the server dmesg:

raid0: RAID Level 1
raid0: Components: /disk1 /disk2 /disk3 /disk4
raid0: Total Sectors: 409599744 (19 MB)

yea, i initialized it already in a previous run:

> ./raidctl -S raid0
Reconstruction is 100% complete.
Parity Re-write is 100% complete.
Copyback is 100% complete.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sbin/raidctl/Makefile
cvs rdiff -u -r1.48 -r1.49 src/sbin/raidctl/raidctl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sbin/raidctl

2010-03-15 Thread Jed Davis
Module Name:src
Committed By:   jld
Date:   Tue Mar 16 03:23:47 UTC 2010

Modified Files:
src/sbin/raidctl: raidctl.c

Log Message:
Give a more polite message for `raidctl -m` on a non-parity RAID set.


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sbin/raidctl/raidctl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sbin/raidctl

2010-03-13 Thread Iain Hibbert
Module Name:src
Committed By:   plunky
Date:   Sat Mar 13 13:45:05 UTC 2010

Modified Files:
src/sbin/raidctl: raidctl.c

Log Message:
fix sign-compare issue


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sbin/raidctl/raidctl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sbin/raidctl

2010-03-12 Thread Jed Davis
Module Name:src
Committed By:   jld
Date:   Sat Mar 13 07:21:38 UTC 2010

Modified Files:
src/sbin/raidctl: raidctl.c

Log Message:
Exclude parity map regions that don't actually exist from the dirty region count
in `raidctl -m`.  Makes for less confusing output during `raidctl -i`.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sbin/raidctl/raidctl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.