[src/trunk]: src/sbin/newfs_msdos We don't need getdiskinfo() for makefs() si...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9773aefea354
branches:  trunk
changeset: 784283:9773aefea354
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Jan 23 22:48:18 2013 +0000

description:
We don't need getdiskinfo() for makefs() since we always deal with an image.

diffstat:

 sbin/newfs_msdos/mkfs_msdos.c |  11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diffs (37 lines):

diff -r 8a4161967575 -r 9773aefea354 sbin/newfs_msdos/mkfs_msdos.c
--- a/sbin/newfs_msdos/mkfs_msdos.c     Wed Jan 23 22:47:18 2013 +0000
+++ b/sbin/newfs_msdos/mkfs_msdos.c     Wed Jan 23 22:48:18 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mkfs_msdos.c,v 1.2 2013/01/23 15:29:15 christos Exp $  */
+/*     $NetBSD: mkfs_msdos.c,v 1.3 2013/01/23 22:48:18 christos Exp $  */
 
 /*
  * Copyright (c) 1998 Robert Nordier
@@ -33,7 +33,7 @@
 static const char rcsid[] =
   "$FreeBSD: src/sbin/newfs_msdos/newfs_msdos.c,v 1.15 2000/10/10 01:49:37 wollman Exp $";
 #else
-__RCSID("$NetBSD: mkfs_msdos.c,v 1.2 2013/01/23 15:29:15 christos Exp $");
+__RCSID("$NetBSD: mkfs_msdos.c,v 1.3 2013/01/23 22:48:18 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -804,12 +804,17 @@
 
     maxpartitions = getmaxpartitions();
 
+    // XXX: Does not work with wedges
     if (s2 && *s2 >= 'a' && *s2 <= 'a' + maxpartitions - 1) {
        part = *s2++ - 'a';
     }
     if (((part != -1) && ((!iflag && part != -1) || !bpb->bsec)) ||
        !bpb->bps || !bpb->spt || !bpb->hds) {
-       if (create || getdiskinfo(fname, fd, NULL, &geo, &dkw) == -1) {
+       if (create
+#ifndef MAKEFS
+       || getdiskinfo(fname, fd, NULL, &geo, &dkw) == -1
+#endif
+       ) {
            struct stat st;
 
            if (fstat(fd, &st) == -1) {