 @@ -1,14 +1,14 @@
-.\" $NetBSD: newfs_udf.8,v 1.9 2013/06/29 20:41:47 reinoud Exp $
+.\" $NetBSD: newfs_udf.8,v 1.10 2013/07/02 14:59:01 reinoud Exp $
 .\"
 .\" Copyright (c) 2008 Reinoud Zandijk
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 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.
 @@ -16,80 +16,84 @@
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS
 .\" OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 .\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY
 .\" DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
 .\" GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 .\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
 .\" IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"
-.Dd June 29, 2013
+.Dd July 2, 2013
 .Dt NEWFS_UDF 8
 .Os
 .Sh NAME
 .Nm newfs_udf
 .Nd construct a new UDF file system
 .Sh SYNOPSIS
 .Nm
 .Op Fl cFM
 .Op Fl L Ar loglabel
 .Op Fl P Ar discid
 .Op Fl p Ar percentage
-.Op Fl S Ar setlabel
+.Op Fl S Ar sectorsize
 .Op Fl s Ar size
 .Op Fl t Ar gmtoff
 .Op Fl V Ar max_udf
 .Op Fl v Ar min_udf
 .Ar special
 .Sh DESCRIPTION
 The
 .Nm
 utility creates an UDF file system on device
 .Ar special
 suitable for the media currently inserted.
 .Pp
 The options are as follow:
 .Bl -tag -width indent
 .It Fl c
 Perform a crude surface check first to weed out disc faults on rewritable
 media.
 .It Fl F
-Force file system construction on non-empty recordable media.
+Force file system construction on non-empty recordable media or create an
 image file.
 .It Fl L Ar loglabel
 Set the disc logical label to the specified
 .Ar loglabel .
 .It Fl M
 Disable metadata partition creation when selected UDF version or media dictates
 this.
 For strict conformance and interchange, don't disable this unless
 its causing problems.
 .It Fl P Ar discid
 Set the physical disc label to the specified
 .Ar discid .
 Prepend
 .Ar discid
 with volsetname separated with a ':' if wanted.
 For strict conformance and interchange, don't set this manually.
 .It Fl p Ar percentage
 Percentage of partition to be initially reserved for metadata on the Metadata
 partition.
 It defaults to 20 %.
-.It Fl S Ar setlabel
+.It Fl S Ar sectorsize
-Set the disc set label to the specified
+Set the sectorsize for image files.
 .Ar setlabel .
 For strict conformance and interchange, don't set this manually.
 .It Fl s Ar size
-Ignored for now.
+For image files, set the file size to the humanized size
 .Ar size .
 .It Fl t Ar gmtoff
 Use the specified
 .Ar gmtoff
 as gmt time offset for recording times on the disc.
 .It Fl V Ar max_udf
 Select
 .Ar max_udf
 as the maximum UDF version to be supported.
 For UDF version 2.50, use
 .Dq 0x250
 or
 .Dq 2.50 .
 .It Fl v Ar min_udf
 @@ -113,45 +117,65 @@ or
 .Pa /dev/rcd0c .
 .Pp
 Some rewritable optical media needs to be formatted first before it can be
 used by UDF.
 This can be done using
 .Xr mmcformat 8 .
 .Pp
 The default UDF version is version 2.01.
 .Sh EXAMPLES
 Create a file system, using the specified names on the device
 .Pa /dev/rcd0d
 with the default UDF version :
 .Bd -literal -offset indent
-newfs_udf -S "Encyclopedia" -L "volume 2" -P "copy-nr-1" /dev/rcd0d
+newfs_udf -P "Encyclopedia:copy-nr-1" -L "volume 2" /dev/rcd0d
 .Ed
 .Pp
 Create a 4.8 GiB sparse file and configure it using
 .Xr vnconfig 8
 to be a 2048 sector size disc and create a new UDF file system on
 .Pa /dev/rvnd0d
+:
 .Bd -literal -offset indent
 dd if=/dev/zero of=bigdisk.2048.udf seek=9999999 count=1
 vnconfig -c vnd0 bigdisk.2048.udf 2048/1/1/1
 newfs_udf -L bigdisk /dev/rvnd0d
 .Ed
 .Pp
 Create a 2 GiB file and create a new UDF file system on it using the default
 byte sector size :
 .Bd -literal -offset indent
 newfs_udf -L bigdisk2 -F -s 2G bigdisk2.iso
 .Ed
 .Pp
 Create a 200 MiB file and create a new UDF file system on it using a sector size
 of 2048 :
 .Bd -literal -offset indent
 newfs_udf -L bigdisk2 -F -s 200M -S 2048 bigdisk3.iso
 .Ed
 .Pp
 Create a new UDF file system on the inserted USB stick using its
-.Dq native
+native sectorsize of 512 :
 sectorsize of 512 :
 .Bd -literal -offset indent
 newfs_udf -L "My USB stick" /dev/rsd0d
 .Ed
 .Sh BUGS
 The
 .Ar P
 and the
 .Ar S
 arguments have changed meaning. The meaning of
 .Ar S
 has been merged into
 .Ar P since NetBSD 6.1.
 .Sh SEE ALSO
 .Xr disktab 5 ,
 .Xr disklabel 8 ,
 .Xr mmcformat 8 ,
 .Xr newfs 8
 .Sh HISTORY
 The
 .Nm
 command first appeared in
 .Nx 5.0 .
 .Sh AUTHORS
 .An Reinoud Zandijk Aq reinoud@NetBSD.org

 @@ -1,17 +1,17 @@
-/* $NetBSD: newfs_udf.c,v 1.12 2011/05/26 07:59:08 reinoud Exp $ */
+/* $NetBSD: newfs_udf.c,v 1.13 2013/07/02 14:59:01 reinoud Exp $ */
 /*
- * Copyright (c) 2006, 2008 Reinoud Zandijk
+ * Copyright (c) 2006, 2008, 2013 Reinoud Zandijk
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 @@ -85,26 +85,27 @@ int udf_do_newfs(void);
 #define APP_VERSION_SUB		3
 #define IMPL_NAME		"*NetBSD userland UDF"
 /* global variables describing disc and format requests */
 int	 fd;				/* device: file descriptor */
 char	*dev;				/* device: name		   */
 struct mmc_discinfo mmc_discinfo;	/* device: disc info	   */
 char	*format_str;			/* format: string representation */
 int	 format_flags;			/* format: attribute flags	 */
 int	 media_accesstype;		/* derived from current mmc cap  */
 int	 check_surface;			/* for rewritables               */
 int	 imagefile_secsize;		/* for files			 */
 int	 wrtrack_skew;
 int	 meta_perc = UDF_META_PERC;
 float	 meta_fract = (float) UDF_META_PERC / 100.0;
 /* shared structure between udf_create.c users */
 struct udf_create_context context;
 struct udf_disclayout     layout;
 /* queue for temporary storage of sectors to be written out */
 struct wrsect {
 @@ -273,73 +274,88 @@ udf_dump_discinfo(struct mmc_discinfo *d
 	printf("\n");
 	printf("\tlast_possible_lba  %d\n", di->last_possible_lba);
 	printf("\n");
+}
 #else
 #define udf_dump_discinfo(a);
 #endif
 /* --------------------------------------------------------------------- */
 static int
 udf_update_discinfo(struct mmc_discinfo *di)
+{
 	struct stat st;
 	struct disklabel  disklab;
 	struct partition *dp;
-	struct stat st;
+	off_t size, sectors, secsize;
 	int partnr, error;
 	memset(di, 0, sizeof(struct mmc_discinfo));
 	/* check if we're on a MMC capable device, i.e. CD/DVD */
 	error = ioctl(fd, MMCGETDISCINFO, di);
 	if (error == 0)
 		return 0;
-	/*
+	/* (re)fstat the file */
 	 * disc partition support; note we can't use DIOCGPART in userland so
 	 * get disc label and use the stat info to get the partition number.
 	 */
 	if (ioctl(fd, DIOCGDINFO, &disklab) == -1) {
 		/* failed to get disclabel! */
 		perror("disklabel");
 		return errno;
 	/* get disk partition it refers to */
 	fstat(fd, &st);
 	partnr = DISKPART(st.st_rdev);
-	dp = &disklab.d_partitions[partnr];
+	if (S_ISREG(st.st_mode)) {
 		/* file support; we pick the minimum sector size allowed */
 		size = st.st_size;
 		secsize = imagefile_secsize;
 		sectors = size / secsize;
 	} else {
 		/*
 		 * disc partition support; note we can't use DIOCGPART in userland so
 		 * get disc label and use the stat info to get the partition number.
 		 */
 		if (ioctl(fd, DIOCGDINFO, &disklab) == -1) {
 			/* failed to get disclabel! */
 			perror("disklabel");
 			return errno;
+		}
 		/* get disk partition it refers to */
 		fstat(fd, &st);
 		partnr = DISKPART(st.st_rdev);
 		dp = &disklab.d_partitions[partnr];
 		/* TODO problem with last_possible_lba on resizable VND; request */
 		if (dp->p_size == 0) {
 			perror("faulty disklabel partition returned, check label\n");
 			return EIO;
+		}
 		sectors = dp->p_size;
 		secsize = disklab.d_secsize;
+	}
 	/* set up a disc info profile for partitions */
 	di->mmc_profile		= 0x01;	/* disc type */
 	di->mmc_class		= MMC_CLASS_DISC;
 	di->disc_state		= MMC_STATE_CLOSED;
 	di->last_session_state	= MMC_STATE_CLOSED;
 	di->bg_format_state	= MMC_BGFSTATE_COMPLETED;
 	di->link_block_penalty	= 0;
 	di->mmc_cur     = MMC_CAP_RECORDABLE | MMC_CAP_REWRITABLE |
 		MMC_CAP_ZEROLINKBLK | MMC_CAP_HW_DEFECTFREE;
 	di->mmc_cap    = di->mmc_cur;
 	di->disc_flags = MMC_DFLAGS_UNRESTRICTED;
-	/* TODO problem with last_possible_lba on resizable VND; request */
+	di->last_possible_lba = sectors - 1;
-	if (dp->p_size == 0) {
+	di->sector_size       = secsize;
 		perror("faulty disklabel partition returned, check label\n");
 		return EIO;
 	di->last_possible_lba = dp->p_size - 1;
 	di->sector_size       = disklab.d_secsize;
 	di->num_sessions = 1;
 	di->num_tracks   = 1;
 	di->first_track  = 1;
 	di->first_track_last_session = di->last_track_last_session = 1;
 	return 0;
+}
 static int
 udf_update_trackinfo(struct mmc_discinfo *di, struct mmc_trackinfo *ti)
 @@ -1427,50 +1443,53 @@ a_udf_version(const char *s, const char
 	uint32_t version;
 	if (parse_udfversion(s, &version))
 		errx(1, "unknown %s id %s; specify as hex or float", id_type, s);
 	return version;
+}
 /* --------------------------------------------------------------------- */
 static void
 usage(void)
+{
 	(void)fprintf(stderr, "Usage: %s [-cFM] [-L loglabel] "
-	    "[-P discid] [-S setlabel] [-s size] [-p perc] "
+	    "[-P discid] [-S sectorsize] [-s size] [-p perc] "
 	    "[-t gmtoff] [-v min_udf] [-V max_udf] special\n", getprogname());
 	exit(EXIT_FAILURE);
+}
 int
 main(int argc, char **argv)
+{
 	struct tm *tm;
 	struct stat st;
 	time_t now;
-	char  scrap[255];
+	off_t setsize;
 	char  scrap[255], *colon;
 	int ch, req_enable, req_disable, force;
 	int error;
 	setprogname(argv[0]);
 	/* initialise */
 	format_str    = strdup("");
 	req_enable    = req_disable = 0;
 	format_flags  = FORMAT_INVALID;
 	force         = 0;
 	check_surface = 0;
 	setsize       = 0;
 	imagefile_secsize = 512;	/* minimum allowed sector size */
 	srandom((unsigned long) time(NULL));
 	udf_init_create_context();
 	context.app_name  = APP_NAME;
 	context.impl_name = IMPL_NAME;
 	context.app_version_main = APP_VERSION_MAIN;
 	context.app_version_sub  = APP_VERSION_SUB;
 	/* minimum and maximum UDF versions we advise */
 	context.min_udf = 0x201;
 	context.max_udf = 0x201;
 	/* use user's time zone as default */
 @@ -1502,75 +1521,126 @@ main(int argc, char **argv)
 			meta_fract = (float) meta_perc/100.0;
 			break;
 		case 'v' :
 			context.min_udf = a_udf_version(optarg, "min_udf");
 			if (context.min_udf > context.max_udf)
 				context.max_udf = context.min_udf;
 			break;
 		case 'V' :
 			context.max_udf = a_udf_version(optarg, "max_udf");
 			if (context.min_udf > context.max_udf)
 				context.min_udf = context.max_udf;
 			break;
 		case 'P' :
 			/* check if there is a ':' in the name */
 			if ((colon = strstr(optarg, ":"))) {
 				if (context.volset_name)
 					free(context.volset_name);
 				*colon = 0;
 				context.volset_name = strdup(optarg);
 				optarg = colon+1;
+			}
 			if (context.primary_name)
 				free(context.primary_name);
 			if ((strstr(optarg, ":"))) {
 				perror("primary name can't have ':' in its name");
 				return EXIT_FAILURE;
+			}
 			context.primary_name = strdup(optarg);
 			break;
 		case 's' :
-			/* TODO size argument; recordable emulation */
+			/* support for files, set file size */
 			/* XXX support for formatting recordables on vnd/file? */
 			if (dehumanize_number(optarg, &setsize) < 0) {
 				perror("can't parse size argument");
 				return EXIT_FAILURE;
+			}
 			setsize = MAX(0, setsize);
 			break;
 		case 'S' :
-			if (context.volset_name) free(context.volset_name);
+			imagefile_secsize = a_num(optarg, "secsize");
-			context.volset_name = strdup(optarg);
+			imagefile_secsize = MAX(512, imagefile_secsize);
 			break;
 		case 't' :
 			/* time zone overide */
 			context.gmtoff = a_num(optarg, "gmtoff");
 			break;
 		default  :
 			usage();
 			/* NOTREACHED */
+		}
+	}
 	if (optind + 1 != argc)
 		usage();
 	/* get device and directory specifier */
 	dev = argv[optind];
 	/* open device */
 	if ((fd = open(dev, O_RDWR, 0)) == -1) {
-		perror("can't open device");
+		/* check if we need to create a file */
-		return EXIT_FAILURE;
+		fd = open(dev, O_RDONLY, 0);
 		if (fd > 0) {
 			perror("device is there but can't be opened for read/write");
 			return EXIT_FAILURE;
+		}
 		if (!force) {
 			perror("can't open device");
 			return EXIT_FAILURE;
+		}
 		if (setsize == 0) {
 			perror("need to create image file but no size specified");
 			return EXIT_FAILURE;
+		}
 		/* need to create a file */
 		fd = open(dev, O_RDWR | O_CREAT | O_TRUNC, 0777);
 		if (fd == -1) {
 			perror("can't create image file");
 			return EXIT_FAILURE;
+		}
+	}
 	/* stat the device */
 	if (fstat(fd, &st) != 0) {
 		perror("can't stat the device");
 		close(fd);
 		return EXIT_FAILURE;
+	}
 	if (S_ISREG(st.st_mode)) {
 		if (setsize == 0)
 			setsize = st.st_size;
 		/* sanitise arguments */
 		imagefile_secsize &= ~511;
 		setsize &= ~(imagefile_secsize-1);
 		if (ftruncate(fd, setsize)) {
 			perror("can't resize file");
 			return EXIT_FAILURE;
+		}
+	}
 	/* formatting can only be done on raw devices */
-	if (!S_ISCHR(st.st_mode)) {
+	if (!S_ISREG(st.st_mode) && !S_ISCHR(st.st_mode)) {
 		printf("%s is not a raw device\n", dev);
 		close(fd);
 		return EXIT_FAILURE;
+	}
 	/* just in case something went wrong, synchronise the drive's cache */
 	udf_synchronise_caches();
-	/* get disc information */
+	/* get 'disc' information */
 	error = udf_update_discinfo(&mmc_discinfo);
 	if (error) {
 		perror("can't retrieve discinfo");
 		close(fd);
 		return EXIT_FAILURE;
+	}
 	/* derive disc identifiers when not specified and check given */
 	error = udf_proces_names();
 	if (error) {
 		/* error message has been printed */
 		close(fd);
 		return EXIT_FAILURE;