Module Name: src
Committed By: reinoud
Date: Tue Aug 6 13:15:30 UTC 2013
Modified Files:
src/sbin/newfs_udf: newfs_udf.c newfs_udf.h udf_create.c
src/usr.sbin/makefs: udf.c
Log Message:
Switch back program version to the version of the newfs_udf/makefs code.
While here, visit the 80 columns police :)
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sbin/newfs_udf/newfs_udf.c
cvs rdiff -u -r1.3 -r1.4 src/sbin/newfs_udf/newfs_udf.h
cvs rdiff -u -r1.21 -r1.22 src/sbin/newfs_udf/udf_create.c
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/makefs/udf.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/newfs_udf/newfs_udf.c
diff -u src/sbin/newfs_udf/newfs_udf.c:1.16 src/sbin/newfs_udf/newfs_udf.c:1.17
--- src/sbin/newfs_udf/newfs_udf.c:1.16 Tue Aug 6 12:49:13 2013
+++ src/sbin/newfs_udf/newfs_udf.c Tue Aug 6 13:15:30 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: newfs_udf.c,v 1.16 2013/08/06 12:49:13 reinoud Exp $ */
+/* $NetBSD: newfs_udf.c,v 1.17 2013/08/06 13:15:30 reinoud Exp $ */
/*
* Copyright (c) 2006, 2008, 2013 Reinoud Zandijk
@@ -674,10 +674,10 @@ main(int argc, char **argv)
srandom((unsigned long) time(NULL));
udf_init_create_context();
- context.app_name = APP_NAME;
- context.impl_name = IMPL_NAME;
+ context.app_name = "*NetBSD newfs";
context.app_version_main = APP_VERSION_MAIN;
context.app_version_sub = APP_VERSION_SUB;
+ context.impl_name = IMPL_NAME;
/* minimum and maximum UDF versions we advise */
context.min_udf = 0x201;
Index: src/sbin/newfs_udf/newfs_udf.h
diff -u src/sbin/newfs_udf/newfs_udf.h:1.3 src/sbin/newfs_udf/newfs_udf.h:1.4
--- src/sbin/newfs_udf/newfs_udf.h:1.3 Mon Aug 5 20:52:08 2013
+++ src/sbin/newfs_udf/newfs_udf.h Tue Aug 6 13:15:30 2013
@@ -32,21 +32,20 @@
#define UDF_META_PERC 20 /* picked */
/* Identifying myself */
-#define APP_NAME "*NetBSD newfs"
#define APP_VERSION_MAIN 0
-#define APP_VERSION_SUB 4
+#define APP_VERSION_SUB 5
#define IMPL_NAME "*NetBSD userland UDF"
/* global variables describing disc and format requests */
-extern int fd; /* device: file descriptor */
-extern char *dev; /* device: name */
-extern struct mmc_discinfo mmc_discinfo; /* device: disc info */
-
-extern char *format_str; /* format: string representation */
-extern int format_flags; /* format: attribute flags */
-extern int media_accesstype; /* derived from current mmc cap */
-extern int check_surface; /* for rewritables */
+extern int fd; /* device: file descriptor */
+extern char *dev; /* device: name */
+extern struct mmc_discinfo mmc_discinfo;/* device: disc info */
+
+extern char *format_str; /* format: string representation */
+extern int format_flags; /* format: attribute flags */
+extern int media_accesstype; /* derived from current mmc cap */
+extern int check_surface; /* for rewritables */
extern int wrtrack_skew;
extern int meta_perc;
Index: src/sbin/newfs_udf/udf_create.c
diff -u src/sbin/newfs_udf/udf_create.c:1.21 src/sbin/newfs_udf/udf_create.c:1.22
--- src/sbin/newfs_udf/udf_create.c:1.21 Tue Aug 6 12:49:13 2013
+++ src/sbin/newfs_udf/udf_create.c Tue Aug 6 13:15:30 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_create.c,v 1.21 2013/08/06 12:49:13 reinoud Exp $ */
+/* $NetBSD: udf_create.c,v 1.22 2013/08/06 13:15:30 reinoud Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -30,7 +30,7 @@
#endif
#include <sys/cdefs.h>
-__RCSID("$NetBSD: udf_create.c,v 1.21 2013/08/06 12:49:13 reinoud Exp $");
+__RCSID("$NetBSD: udf_create.c,v 1.22 2013/08/06 13:15:30 reinoud Exp $");
#include <stdio.h>
#include <stdlib.h>
@@ -77,16 +77,11 @@ udf_init_create_context(void)
context.volset_name = NULL;
context.fileset_name = NULL;
-#ifdef __NetBSD_Version__
- context.app_name = "*NetBSD newfs";
- context.app_version_main = __NetBSD_Version__ / 100000000;
- context.app_version_sub = (__NetBSD_Version__ / 1000000) % 100;
-#else
- context.app_name = "*NetBSD makefs";
+ /* most basic identification */
+ context.app_name = "*NetBSD";
context.app_version_main = 0;
context.app_version_sub = 0;
-#endif
- context.impl_name = "*NetBSD kernel UDF";
+ context.impl_name = "*NetBSD";
context.vds_seq = 0; /* first one starts with zero */
Index: src/usr.sbin/makefs/udf.c
diff -u src/usr.sbin/makefs/udf.c:1.9 src/usr.sbin/makefs/udf.c:1.10
--- src/usr.sbin/makefs/udf.c:1.9 Tue Aug 6 12:47:21 2013
+++ src/usr.sbin/makefs/udf.c Tue Aug 6 13:15:30 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: udf.c,v 1.9 2013/08/06 12:47:21 reinoud Exp $ */
+/* $NetBSD: udf.c,v 1.10 2013/08/06 13:15:30 reinoud Exp $ */
/*
* Copyright (c) 2006, 2008, 2013 Reinoud Zandijk
@@ -30,7 +30,7 @@
#endif
#include <sys/cdefs.h>
-__RCSID("$NetBSD: udf.c,v 1.9 2013/08/06 12:47:21 reinoud Exp $");
+__RCSID("$NetBSD: udf.c,v 1.10 2013/08/06 13:15:30 reinoud Exp $");
#include <stdio.h>
#include <stdlib.h>
@@ -58,6 +58,8 @@ __RCSID("$NetBSD: udf.c,v 1.9 2013/08/06
#include "udf_write.h"
#include "newfs_udf.h"
+#undef APP_NAME
+#define APP_NAME "*NetBSD makefs"
/*
* Note: due to the setup of the newfs code, the current state of the program
@@ -314,10 +316,10 @@ udf_prep_opts(fsinfo_t *fsopts)
mmc_profile = 0x01; /* 'disc'/file */
udf_init_create_context();
- context.app_name = APP_NAME;
- context.impl_name = IMPL_NAME;
+ context.app_name = "*NetBSD makefs";
context.app_version_main = APP_VERSION_MAIN;
context.app_version_sub = APP_VERSION_SUB;
+ context.impl_name = IMPL_NAME;
/* minimum and maximum UDF versions we advise */
context.min_udf = 0x102;
