summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sbin/fdisk/Makefile7
-rw-r--r--sbin/fdisk/cmd.c7
-rw-r--r--sbin/fdisk/cmd.h7
-rw-r--r--sbin/fdisk/disk.c7
-rw-r--r--sbin/fdisk/disk.h7
-rw-r--r--sbin/fdisk/fdisk.87
-rw-r--r--sbin/fdisk/fdisk.c7
-rw-r--r--sbin/fdisk/mbr.c7
-rw-r--r--sbin/fdisk/mbr.h7
-rw-r--r--sbin/fdisk/mbrcode.h7
-rw-r--r--sbin/fdisk/misc.c7
-rw-r--r--sbin/fdisk/misc.h7
-rw-r--r--sbin/fdisk/part.c7
-rw-r--r--sbin/fdisk/part.h7
-rw-r--r--sbin/fdisk/user.c7
-rw-r--r--sbin/fdisk/user.h7
16 files changed, 16 insertions, 96 deletions
diff --git a/sbin/fdisk/Makefile b/sbin/fdisk/Makefile
index ec766ba8989..a02206cbf77 100644
--- a/sbin/fdisk/Makefile
+++ b/sbin/fdisk/Makefile
@@ -1,5 +1,5 @@
#
-# $OpenBSD: Makefile,v 1.20 2002/06/26 18:34:26 wcobb Exp $
+# $OpenBSD: Makefile,v 1.21 2003/06/03 01:13:19 weingart Exp $
#
# Copyright (c) 1997 Tobias Weingartner
# All rights reserved.
@@ -12,11 +12,6 @@
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by Tobias Weingartner.
-# 4. The name of the author may not be used to endorse or promote products
-# derived from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff --git a/sbin/fdisk/cmd.c b/sbin/fdisk/cmd.c
index d43209b2224..f345e9656bb 100644
--- a/sbin/fdisk/cmd.c
+++ b/sbin/fdisk/cmd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd.c,v 1.31 2002/01/24 04:40:03 mickey Exp $ */
+/* $OpenBSD: cmd.c,v 1.32 2003/06/03 01:13:19 weingart Exp $ */
/*
* Copyright (c) 1997 Tobias Weingartner
@@ -12,11 +12,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by Tobias Weingartner.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff --git a/sbin/fdisk/cmd.h b/sbin/fdisk/cmd.h
index 48dd0e64b27..05e7088fe38 100644
--- a/sbin/fdisk/cmd.h
+++ b/sbin/fdisk/cmd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd.h,v 1.7 2002/02/16 21:27:34 millert Exp $ */
+/* $OpenBSD: cmd.h,v 1.8 2003/06/03 01:13:19 weingart Exp $ */
/*
* Copyright (c) 1997 Tobias Weingartner
@@ -12,11 +12,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by Tobias Weingartner.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff --git a/sbin/fdisk/disk.c b/sbin/fdisk/disk.c
index 86fce510a27..4f86810f7c8 100644
--- a/sbin/fdisk/disk.c
+++ b/sbin/fdisk/disk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disk.c,v 1.16 2002/07/11 21:23:28 deraadt Exp $ */
+/* $OpenBSD: disk.c,v 1.17 2003/06/03 01:13:19 weingart Exp $ */
/*
* Copyright (c) 1997, 2001 Tobias Weingartner
@@ -12,11 +12,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by Tobias Weingartner.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff --git a/sbin/fdisk/disk.h b/sbin/fdisk/disk.h
index 161fd8075cb..8fe1b2d5e1f 100644
--- a/sbin/fdisk/disk.h
+++ b/sbin/fdisk/disk.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: disk.h,v 1.6 2002/02/16 21:27:34 millert Exp $ */
+/* $OpenBSD: disk.h,v 1.7 2003/06/03 01:13:19 weingart Exp $ */
/*
* Copyright (c) 1997 Tobias Weingartner
@@ -12,11 +12,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by Tobias Weingartner.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff --git a/sbin/fdisk/fdisk.8 b/sbin/fdisk/fdisk.8
index b1348ad6742..c8615a5b12c 100644
--- a/sbin/fdisk/fdisk.8
+++ b/sbin/fdisk/fdisk.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: fdisk.8,v 1.39 2003/01/31 21:54:40 jmc Exp $
+.\" $OpenBSD: fdisk.8,v 1.40 2003/06/03 01:13:19 weingart Exp $
.\"
.\" Copyright (c) 1997 Tobias Weingartner
.\" All rights reserved.
@@ -11,11 +11,6 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by Tobias Weingartner.
-.\" 4. The name of the author may not be used to endorse or promote products
-.\" derived from this software without specific prior written permission.
.\"
.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff --git a/sbin/fdisk/fdisk.c b/sbin/fdisk/fdisk.c
index 14275889ea3..37d51aa02a7 100644
--- a/sbin/fdisk/fdisk.c
+++ b/sbin/fdisk/fdisk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fdisk.c,v 1.34 2001/12/15 02:12:26 kjell Exp $ */
+/* $OpenBSD: fdisk.c,v 1.35 2003/06/03 01:13:19 weingart Exp $ */
/*
* Copyright (c) 1997 Tobias Weingartner
@@ -12,11 +12,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by Tobias Weingartner.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff --git a/sbin/fdisk/mbr.c b/sbin/fdisk/mbr.c
index bb432e320bc..1449fd99e62 100644
--- a/sbin/fdisk/mbr.c
+++ b/sbin/fdisk/mbr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mbr.c,v 1.16 2002/06/09 08:13:05 todd Exp $ */
+/* $OpenBSD: mbr.c,v 1.17 2003/06/03 01:13:19 weingart Exp $ */
/*
* Copyright (c) 1997 Tobias Weingartner
@@ -12,11 +12,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by Tobias Weingartner.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff --git a/sbin/fdisk/mbr.h b/sbin/fdisk/mbr.h
index 1ba4f243cd3..87d92da98e0 100644
--- a/sbin/fdisk/mbr.h
+++ b/sbin/fdisk/mbr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: mbr.h,v 1.10 2002/02/16 21:27:34 millert Exp $ */
+/* $OpenBSD: mbr.h,v 1.11 2003/06/03 01:13:19 weingart Exp $ */
/*
* Copyright (c) 1997 Tobias Weingartner
@@ -12,11 +12,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by Tobias Weingartner.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff --git a/sbin/fdisk/mbrcode.h b/sbin/fdisk/mbrcode.h
index cdf72f971d1..7a9e7420505 100644
--- a/sbin/fdisk/mbrcode.h
+++ b/sbin/fdisk/mbrcode.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: mbrcode.h,v 1.1 2001/06/23 01:56:02 kjell Exp $ */
+/* $OpenBSD: mbrcode.h,v 1.2 2003/06/03 01:13:19 weingart Exp $ */
/*
* Copyright (c) 2000 Tobias Weingartner
* All rights reserved.
@@ -11,11 +11,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by Tobias Weingartner.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff --git a/sbin/fdisk/misc.c b/sbin/fdisk/misc.c
index b8a2578644f..5ed9c2a2da7 100644
--- a/sbin/fdisk/misc.c
+++ b/sbin/fdisk/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.11 2002/04/20 00:58:32 espie Exp $ */
+/* $OpenBSD: misc.c,v 1.12 2003/06/03 01:13:19 weingart Exp $ */
/*
* Copyright (c) 1997 Tobias Weingartner
@@ -12,11 +12,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by Tobias Weingartner.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff --git a/sbin/fdisk/misc.h b/sbin/fdisk/misc.h
index 8f1ea15cc5c..428e07e9248 100644
--- a/sbin/fdisk/misc.h
+++ b/sbin/fdisk/misc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.h,v 1.8 2002/02/17 19:42:27 millert Exp $ */
+/* $OpenBSD: misc.h,v 1.9 2003/06/03 01:13:19 weingart Exp $ */
/*
* Copyright (c) 1997 Tobias Weingartner
@@ -12,11 +12,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by Tobias Weingartner.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff --git a/sbin/fdisk/part.c b/sbin/fdisk/part.c
index 841e0d477a5..b2163faa91e 100644
--- a/sbin/fdisk/part.c
+++ b/sbin/fdisk/part.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: part.c,v 1.32 2003/04/19 18:42:14 avsm Exp $ */
+/* $OpenBSD: part.c,v 1.33 2003/06/03 01:13:19 weingart Exp $ */
/*
* Copyright (c) 1997 Tobias Weingartner
@@ -12,11 +12,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by Tobias Weingartner.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff --git a/sbin/fdisk/part.h b/sbin/fdisk/part.h
index d9a56b2c69d..af200a14102 100644
--- a/sbin/fdisk/part.h
+++ b/sbin/fdisk/part.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: part.h,v 1.10 2002/02/16 21:27:34 millert Exp $ */
+/* $OpenBSD: part.h,v 1.11 2003/06/03 01:13:19 weingart Exp $ */
/*
* Copyright (c) 1997 Tobias Weingartner
@@ -12,11 +12,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by Tobias Weingartner.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff --git a/sbin/fdisk/user.c b/sbin/fdisk/user.c
index a9e597ce340..63cc38932e6 100644
--- a/sbin/fdisk/user.c
+++ b/sbin/fdisk/user.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: user.c,v 1.19 2002/05/22 08:21:02 deraadt Exp $ */
+/* $OpenBSD: user.c,v 1.20 2003/06/03 01:13:19 weingart Exp $ */
/*
* Copyright (c) 1997 Tobias Weingartner
@@ -12,11 +12,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by Tobias Weingartner.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff --git a/sbin/fdisk/user.h b/sbin/fdisk/user.h
index 96c624ded05..92d42efde74 100644
--- a/sbin/fdisk/user.h
+++ b/sbin/fdisk/user.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: user.h,v 1.6 2002/02/16 21:27:34 millert Exp $ */
+/* $OpenBSD: user.h,v 1.7 2003/06/03 01:13:19 weingart Exp $ */
/*
* Copyright (c) 1997 Tobias Weingartner
@@ -12,11 +12,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by Tobias Weingartner.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES