From owner-svn-src-head@FreeBSD.ORG  Wed Nov 26 21:05:04 2008
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 840BB106564A;
	Wed, 26 Nov 2008 21:05:04 +0000 (UTC)
	(envelope-from luigi@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6CF3F8FC1B;
	Wed, 26 Nov 2008 21:05:04 +0000 (UTC)
	(envelope-from luigi@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mAQL54WR066234;
	Wed, 26 Nov 2008 21:05:04 GMT (envelope-from luigi@svn.freebsd.org)
Received: (from luigi@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mAQL54ko066233;
	Wed, 26 Nov 2008 21:05:04 GMT (envelope-from luigi@svn.freebsd.org)
Message-Id: <200811262105.mAQL54ko066233@svn.freebsd.org>
From: Luigi Rizzo <luigi@FreeBSD.org>
Date: Wed, 26 Nov 2008 21:05:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r185345 - head/sbin/newfs_msdos
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Nov 2008 21:05:04 -0000

Author: luigi
Date: Wed Nov 26 21:05:03 2008
New Revision: 185345
URL: http://svn.freebsd.org/changeset/base/185345

Log:
  Create a fake geometry (16 heads, 64 sectors) when dealing with
  a plain file and a geometry is not explicitly supplied through
  command line or disktab entry.
  
  This way you can a FAT image on a file as simply as this:
  
  	newfs_msdos ./some/file
  
  (right now you need a much longer command
  
  	newfs_msdos -h 32 -u 64 -S 512 -s $total_blocks -o 0 ./some/file
  
  Will be merged after 7.1 and 6.4 are released.
  See also the related PR which suggests a similar change.
  
  PR:		bin/121182
  MFC after:	4 weeks

Modified:
  head/sbin/newfs_msdos/newfs_msdos.c

Modified: head/sbin/newfs_msdos/newfs_msdos.c
==============================================================================
--- head/sbin/newfs_msdos/newfs_msdos.c	Wed Nov 26 20:52:26 2008	(r185344)
+++ head/sbin/newfs_msdos/newfs_msdos.c	Wed Nov 26 21:05:03 2008	(r185345)
@@ -725,9 +725,20 @@ getdiskinfo(int fd, const char *fname, c
 
     /* Maybe it's a floppy drive */
     if (lp == NULL) {
-	if (ioctl(fd, DIOCGMEDIASIZE, &ms) == -1)
-	    errx(1, "Cannot get disk size, %s", strerror(errno));
-	if (ioctl(fd, FD_GTYPE, &type) != -1) {
+	if (ioctl(fd, DIOCGMEDIASIZE, &ms) == -1) {
+	    struct stat st;
+
+	    bzero(&st, sizeof(st));
+	    if (fstat(fd, &st))
+		err(1, "Cannot get disk size");
+	    /* create a fake geometry for a file image */
+	    ms = st.st_size;
+	    dlp.d_secsize = 512;
+	    dlp.d_nsectors = 64;
+	    dlp.d_ntracks = 32;
+	    dlp.d_secperunit = ms / dlp.d_secsize;
+	    lp = &dlp;
+	} else if (ioctl(fd, FD_GTYPE, &type) != -1) {
 	    dlp.d_secsize = 128 << type.secsize;
 	    dlp.d_nsectors = type.sectrac;
 	    dlp.d_ntracks = type.heads;