Module Name: src
Committed By: christos
Date: Mon Sep 29 20:28:57 UTC 2014
Modified Files:
src/sbin/gpt: add.c backup.c biosboot.c create.c destroy.c gpt.c
label.c map.c migrate.c recover.c remove.c resize.c resizedisk.c
restore.c set.c show.c type.c unset.c
Log Message:
minor toolification: need libprop...
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sbin/gpt/add.c
cvs rdiff -u -r1.3 -r1.4 src/sbin/gpt/backup.c src/sbin/gpt/restore.c
cvs rdiff -u -r1.9 -r1.10 src/sbin/gpt/biosboot.c
cvs rdiff -u -r1.7 -r1.8 src/sbin/gpt/create.c
cvs rdiff -u -r1.4 -r1.5 src/sbin/gpt/destroy.c src/sbin/gpt/recover.c
cvs rdiff -u -r1.30 -r1.31 src/sbin/gpt/gpt.c
cvs rdiff -u -r1.15 -r1.16 src/sbin/gpt/label.c src/sbin/gpt/show.c
cvs rdiff -u -r1.6 -r1.7 src/sbin/gpt/map.c
cvs rdiff -u -r1.14 -r1.15 src/sbin/gpt/migrate.c
cvs rdiff -u -r1.13 -r1.14 src/sbin/gpt/remove.c
cvs rdiff -u -r1.8 -r1.9 src/sbin/gpt/resize.c
cvs rdiff -u -r1.2 -r1.3 src/sbin/gpt/resizedisk.c src/sbin/gpt/set.c \
src/sbin/gpt/type.c src/sbin/gpt/unset.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/gpt/add.c
diff -u src/sbin/gpt/add.c:1.24 src/sbin/gpt/add.c:1.25
--- src/sbin/gpt/add.c:1.24 Mon Dec 9 20:05:00 2013
+++ src/sbin/gpt/add.c Mon Sep 29 16:28:57 2014
@@ -24,12 +24,16 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
#include <sys/cdefs.h>
#ifdef __FBSDID
__FBSDID("$FreeBSD: src/sbin/gpt/add.c,v 1.14 2006/06/22 22:05:28 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: add.c,v 1.24 2013/12/10 01:05:00 jnemeth Exp $");
+__RCSID("$NetBSD: add.c,v 1.25 2014/09/29 20:28:57 christos Exp $");
#endif
#include <sys/types.h>
Index: src/sbin/gpt/backup.c
diff -u src/sbin/gpt/backup.c:1.3 src/sbin/gpt/backup.c:1.4
--- src/sbin/gpt/backup.c:1.3 Wed Sep 10 06:49:44 2014
+++ src/sbin/gpt/backup.c Mon Sep 29 16:28:57 2014
@@ -24,12 +24,16 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
#include <sys/cdefs.h>
#ifdef __FBSDID
__FBSDID("$FreeBSD: src/sbin/gpt/show.c,v 1.14 2006/06/22 22:22:32 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: backup.c,v 1.3 2014/09/10 10:49:44 jnemeth Exp $");
+__RCSID("$NetBSD: backup.c,v 1.4 2014/09/29 20:28:57 christos Exp $");
#endif
#include <sys/bootblock.h>
Index: src/sbin/gpt/restore.c
diff -u src/sbin/gpt/restore.c:1.3 src/sbin/gpt/restore.c:1.4
--- src/sbin/gpt/restore.c:1.3 Fri Sep 26 04:56:34 2014
+++ src/sbin/gpt/restore.c Mon Sep 29 16:28:57 2014
@@ -24,12 +24,16 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
#include <sys/cdefs.h>
#ifdef __FBSDID
__FBSDID("$FreeBSD: src/sbin/gpt/create.c,v 1.11 2005/08/31 01:47:19 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: restore.c,v 1.3 2014/09/26 08:56:34 jnemeth Exp $");
+__RCSID("$NetBSD: restore.c,v 1.4 2014/09/29 20:28:57 christos Exp $");
#endif
#include <sys/types.h>
Index: src/sbin/gpt/biosboot.c
diff -u src/sbin/gpt/biosboot.c:1.9 src/sbin/gpt/biosboot.c:1.10
--- src/sbin/gpt/biosboot.c:1.9 Mon Sep 29 01:56:43 2014
+++ src/sbin/gpt/biosboot.c Mon Sep 29 16:28:57 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: biosboot.c,v 1.9 2014/09/29 05:56:43 jnemeth Exp $ */
+/* $NetBSD: biosboot.c,v 1.10 2014/09/29 20:28:57 christos Exp $ */
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -31,9 +31,13 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
#include <sys/cdefs.h>
#ifdef __RCSID
-__RCSID("$NetBSD: biosboot.c,v 1.9 2014/09/29 05:56:43 jnemeth Exp $");
+__RCSID("$NetBSD: biosboot.c,v 1.10 2014/09/29 20:28:57 christos Exp $");
#endif
#include <sys/stat.h>
Index: src/sbin/gpt/create.c
diff -u src/sbin/gpt/create.c:1.7 src/sbin/gpt/create.c:1.8
--- src/sbin/gpt/create.c:1.7 Wed Dec 4 15:15:51 2013
+++ src/sbin/gpt/create.c Mon Sep 29 16:28:57 2014
@@ -24,12 +24,16 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
#include <sys/cdefs.h>
#ifdef __FBSDID
__FBSDID("$FreeBSD: src/sbin/gpt/create.c,v 1.11 2005/08/31 01:47:19 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: create.c,v 1.7 2013/12/04 20:15:51 jakllsch Exp $");
+__RCSID("$NetBSD: create.c,v 1.8 2014/09/29 20:28:57 christos Exp $");
#endif
#include <sys/types.h>
@@ -99,7 +103,7 @@ create(int fd)
return;
}
mbr = gpt_read(fd, 0LL, 1);
- bzero(mbr, sizeof(*mbr));
+ memset(mbr, 0, sizeof(*mbr));
mbr->mbr_sig = htole16(MBR_SIG);
mbr->mbr_part[0].part_shd = 0x00;
mbr->mbr_part[0].part_ssect = 0x02;
Index: src/sbin/gpt/destroy.c
diff -u src/sbin/gpt/destroy.c:1.4 src/sbin/gpt/destroy.c:1.5
--- src/sbin/gpt/destroy.c:1.4 Sat Aug 27 13:38:16 2011
+++ src/sbin/gpt/destroy.c Mon Sep 29 16:28:57 2014
@@ -24,12 +24,16 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
#include <sys/cdefs.h>
#ifdef __FBSDID
__FBSDID("$FreeBSD: src/sbin/gpt/destroy.c,v 1.6 2005/08/31 01:47:19 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: destroy.c,v 1.4 2011/08/27 17:38:16 joerg Exp $");
+__RCSID("$NetBSD: destroy.c,v 1.5 2014/09/29 20:28:57 christos Exp $");
#endif
#include <sys/types.h>
Index: src/sbin/gpt/recover.c
diff -u src/sbin/gpt/recover.c:1.4 src/sbin/gpt/recover.c:1.5
--- src/sbin/gpt/recover.c:1.4 Sat Aug 27 13:38:16 2011
+++ src/sbin/gpt/recover.c Mon Sep 29 16:28:57 2014
@@ -24,12 +24,16 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
#include <sys/cdefs.h>
#ifdef __FBSDID
__FBSDID("$FreeBSD: src/sbin/gpt/recover.c,v 1.8 2005/08/31 01:47:19 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: recover.c,v 1.4 2011/08/27 17:38:16 joerg Exp $");
+__RCSID("$NetBSD: recover.c,v 1.5 2014/09/29 20:28:57 christos Exp $");
#endif
#include <sys/types.h>
Index: src/sbin/gpt/gpt.c
diff -u src/sbin/gpt/gpt.c:1.30 src/sbin/gpt/gpt.c:1.31
--- src/sbin/gpt/gpt.c:1.30 Sun Sep 28 04:14:51 2014
+++ src/sbin/gpt/gpt.c Mon Sep 29 16:28:57 2014
@@ -26,12 +26,16 @@
* CRC32 code derived from work by Gary S. Brown.
*/
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
#include <sys/cdefs.h>
#ifdef __FBSDID
__FBSDID("$FreeBSD: src/sbin/gpt/gpt.c,v 1.16 2006/07/07 02:44:23 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: gpt.c,v 1.30 2014/09/28 08:14:51 jnemeth Exp $");
+__RCSID("$NetBSD: gpt.c,v 1.31 2014/09/29 20:28:57 christos Exp $");
#endif
#include <sys/param.h>
Index: src/sbin/gpt/label.c
diff -u src/sbin/gpt/label.c:1.15 src/sbin/gpt/label.c:1.16
--- src/sbin/gpt/label.c:1.15 Mon Sep 29 01:56:43 2014
+++ src/sbin/gpt/label.c Mon Sep 29 16:28:57 2014
@@ -24,12 +24,16 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
#include <sys/cdefs.h>
#ifdef __FBSDID
__FBSDID("$FreeBSD: src/sbin/gpt/label.c,v 1.3 2006/10/04 18:20:25 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: label.c,v 1.15 2014/09/29 05:56:43 jnemeth Exp $");
+__RCSID("$NetBSD: label.c,v 1.16 2014/09/29 20:28:57 christos Exp $");
#endif
#include <sys/types.h>
Index: src/sbin/gpt/show.c
diff -u src/sbin/gpt/show.c:1.15 src/sbin/gpt/show.c:1.16
--- src/sbin/gpt/show.c:1.15 Tue Dec 17 22:20:09 2013
+++ src/sbin/gpt/show.c Mon Sep 29 16:28:57 2014
@@ -24,12 +24,16 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
#include <sys/cdefs.h>
#ifdef __FBSDID
__FBSDID("$FreeBSD: src/sbin/gpt/show.c,v 1.14 2006/06/22 22:22:32 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: show.c,v 1.15 2013/12/18 03:20:09 jnemeth Exp $");
+__RCSID("$NetBSD: show.c,v 1.16 2014/09/29 20:28:57 christos Exp $");
#endif
#include <sys/types.h>
@@ -223,7 +227,10 @@ show_one(void)
map_t *m;
struct gpt_ent *ent;
const char *s1;
- char *s2, human_num[5];
+ char *s2;
+#ifdef HN_AUTOSCALE
+ char *human_num[5];
+#endif
for (m = map_first(); m != NULL; m = m->map_next)
if (entry == m->map_index)
@@ -236,6 +243,7 @@ show_one(void)
ent = m->map_data;
printf("Details for index %d:\n", entry);
+#ifdef HN_AUTOSCALE
if (humanize_number(human_num, 5, (int64_t)(m->map_start * secsz),
"", HN_AUTOSCALE, HN_NOSPACE|HN_B) < 0)
human_num[0] = '\0';
@@ -243,13 +251,16 @@ show_one(void)
printf("Start: %llu (%s)\n", (long long)m->map_start,
human_num);
else
+#endif
printf("Start: %llu\n", (long long)m->map_start);
+#ifdef HN_AUTOSCALE
if (humanize_number(human_num, 5, (int64_t)(m->map_size * secsz),
"", HN_AUTOSCALE, HN_NOSPACE|HN_B) < 0)
human_num[0] = '\0';
if (human_num[0] != '\0')
printf("Size: %llu (%s)\n", (long long)m->map_size, human_num);
else
+#endif
printf("Size: %llu\n", (long long)m->map_size);
le_uuid_dec(ent->ent_type, &type);
Index: src/sbin/gpt/map.c
diff -u src/sbin/gpt/map.c:1.6 src/sbin/gpt/map.c:1.7
--- src/sbin/gpt/map.c:1.6 Wed Nov 27 15:40:48 2013
+++ src/sbin/gpt/map.c Mon Sep 29 16:28:57 2014
@@ -24,12 +24,16 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
#include <sys/cdefs.h>
#ifdef __FBSDID
__FBSDID("$FreeBSD: src/sbin/gpt/map.c,v 1.6 2005/08/31 01:47:19 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: map.c,v 1.6 2013/11/27 20:40:48 christos Exp $");
+__RCSID("$NetBSD: map.c,v 1.7 2014/09/29 20:28:57 christos Exp $");
#endif
#include <sys/types.h>
Index: src/sbin/gpt/migrate.c
diff -u src/sbin/gpt/migrate.c:1.14 src/sbin/gpt/migrate.c:1.15
--- src/sbin/gpt/migrate.c:1.14 Wed Dec 4 15:15:51 2013
+++ src/sbin/gpt/migrate.c Mon Sep 29 16:28:57 2014
@@ -24,12 +24,16 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
#include <sys/cdefs.h>
#ifdef __FBSDID
__FBSDID("$FreeBSD: src/sbin/gpt/migrate.c,v 1.16 2005/09/01 02:42:52 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: migrate.c,v 1.14 2013/12/04 20:15:51 jakllsch Exp $");
+__RCSID("$NetBSD: migrate.c,v 1.15 2014/09/29 20:28:57 christos Exp $");
#endif
#include <sys/types.h>
@@ -50,6 +54,7 @@ __RCSID("$NetBSD: migrate.c,v 1.14 2013/
/*
* Allow compilation on platforms that do not have a BSD label.
* The values are valid for amd64, i386 and ia64 disklabels.
+ * XXX: use disklabel_params from disklabel.c
*/
#ifndef LABELOFFSET
#define LABELOFFSET 0
@@ -57,6 +62,9 @@ __RCSID("$NetBSD: migrate.c,v 1.14 2013/
#ifndef LABELSECTOR
#define LABELSECTOR 1
#endif
+#ifndef RAW_PART
+#define RAW_PART 3
+#endif
/* FreeBSD filesystem types that don't match corresponding NetBSD types */
#define FREEBSD_FS_VINUM 14
Index: src/sbin/gpt/remove.c
diff -u src/sbin/gpt/remove.c:1.13 src/sbin/gpt/remove.c:1.14
--- src/sbin/gpt/remove.c:1.13 Mon Sep 29 01:56:43 2014
+++ src/sbin/gpt/remove.c Mon Sep 29 16:28:57 2014
@@ -24,12 +24,16 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
#include <sys/cdefs.h>
#ifdef __FBSDID
__FBSDID("$FreeBSD: src/sbin/gpt/remove.c,v 1.10 2006/10/04 18:20:25 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: remove.c,v 1.13 2014/09/29 05:56:43 jnemeth Exp $");
+__RCSID("$NetBSD: remove.c,v 1.14 2014/09/29 20:28:57 christos Exp $");
#endif
#include <sys/types.h>
Index: src/sbin/gpt/resize.c
diff -u src/sbin/gpt/resize.c:1.8 src/sbin/gpt/resize.c:1.9
--- src/sbin/gpt/resize.c:1.8 Mon Dec 9 20:05:00 2013
+++ src/sbin/gpt/resize.c Mon Sep 29 16:28:57 2014
@@ -24,12 +24,16 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
#include <sys/cdefs.h>
#ifdef __FBSDID
__FBSDID("$FreeBSD: src/sbin/gpt/add.c,v 1.14 2006/06/22 22:05:28 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: resize.c,v 1.8 2013/12/10 01:05:00 jnemeth Exp $");
+__RCSID("$NetBSD: resize.c,v 1.9 2014/09/29 20:28:57 christos Exp $");
#endif
#include <sys/types.h>
Index: src/sbin/gpt/resizedisk.c
diff -u src/sbin/gpt/resizedisk.c:1.2 src/sbin/gpt/resizedisk.c:1.3
--- src/sbin/gpt/resizedisk.c:1.2 Tue Sep 23 09:48:04 2014
+++ src/sbin/gpt/resizedisk.c Mon Sep 29 16:28:57 2014
@@ -24,12 +24,16 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
#include <sys/cdefs.h>
#ifdef __FBSDID
__FBSDID("$FreeBSD: src/sbin/gpt/add.c,v 1.14 2006/06/22 22:05:28 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: resizedisk.c,v 1.2 2014/09/23 13:48:04 msaitoh Exp $");
+__RCSID("$NetBSD: resizedisk.c,v 1.3 2014/09/29 20:28:57 christos Exp $");
#endif
#include <sys/bootblock.h>
Index: src/sbin/gpt/set.c
diff -u src/sbin/gpt/set.c:1.2 src/sbin/gpt/set.c:1.3
--- src/sbin/gpt/set.c:1.2 Mon Dec 9 20:05:00 2013
+++ src/sbin/gpt/set.c Mon Sep 29 16:28:57 2014
@@ -24,12 +24,16 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
#include <sys/cdefs.h>
#ifdef __FBSDID
__FBSDID("$FreeBSD: src/sbin/gpt/add.c,v 1.14 2006/06/22 22:05:28 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: set.c,v 1.2 2013/12/10 01:05:00 jnemeth Exp $");
+__RCSID("$NetBSD: set.c,v 1.3 2014/09/29 20:28:57 christos Exp $");
#endif
#include <sys/types.h>
Index: src/sbin/gpt/type.c
diff -u src/sbin/gpt/type.c:1.2 src/sbin/gpt/type.c:1.3
--- src/sbin/gpt/type.c:1.2 Mon Sep 29 01:56:43 2014
+++ src/sbin/gpt/type.c Mon Sep 29 16:28:57 2014
@@ -24,12 +24,16 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
#include <sys/cdefs.h>
#ifdef __FBSDID
__FBSDID("$FreeBSD: src/sbin/gpt/remove.c,v 1.10 2006/10/04 18:20:25 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: type.c,v 1.2 2014/09/29 05:56:43 jnemeth Exp $");
+__RCSID("$NetBSD: type.c,v 1.3 2014/09/29 20:28:57 christos Exp $");
#endif
#include <sys/types.h>
Index: src/sbin/gpt/unset.c
diff -u src/sbin/gpt/unset.c:1.2 src/sbin/gpt/unset.c:1.3
--- src/sbin/gpt/unset.c:1.2 Mon Dec 9 20:05:00 2013
+++ src/sbin/gpt/unset.c Mon Sep 29 16:28:57 2014
@@ -24,12 +24,16 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
#include <sys/cdefs.h>
#ifdef __FBSDID
__FBSDID("$FreeBSD: src/sbin/gpt/add.c,v 1.14 2006/06/22 22:05:28 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: unset.c,v 1.2 2013/12/10 01:05:00 jnemeth Exp $");
+__RCSID("$NetBSD: unset.c,v 1.3 2014/09/29 20:28:57 christos Exp $");
#endif
#include <sys/types.h>
