[src/trunk]: src/usr.sbin/makefs fix recursion error handling. top level dire...

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

details:   https://anonhg.NetBSD.org/src/rev/48b99c0506d6
branches:  trunk
changeset: 784407:48b99c0506d6
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Jan 27 22:53:03 2013 +0000

description:
fix recursion error handling. top level directory works.

diffstat:

 usr.sbin/makefs/msdos.c |  24 +++++++++++++++---------
 1 files changed, 15 insertions(+), 9 deletions(-)

diffs (51 lines):

diff -r 2c07ff856a8d -r 48b99c0506d6 usr.sbin/makefs/msdos.c
--- a/usr.sbin/makefs/msdos.c   Sun Jan 27 22:52:38 2013 +0000
+++ b/usr.sbin/makefs/msdos.c   Sun Jan 27 22:53:03 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: msdos.c,v 1.8 2013/01/27 20:05:46 christos Exp $       */
+/*     $NetBSD: msdos.c,v 1.9 2013/01/27 22:53:03 christos Exp $       */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
 
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: msdos.c,v 1.8 2013/01/27 20:05:46 christos Exp $");
+__RCSID("$NetBSD: msdos.c,v 1.9 2013/01/27 22:53:03 christos Exp $");
 #endif /* !__lint */
 
 #include <sys/param.h>
@@ -224,19 +224,25 @@
 
                if (cur->child) {
                        struct denode *de;
-                       if ((de = msdosfs_mkdire(pbuf, dir, cur)) == NULL)
-                               err(1, "msdosfs_mkdire");
-                       if (!msdos_populate_dir(pbuf, de, cur->child, cur,
-                           fsopts))
-                               err(1, "populate_dir");
+                       if ((de = msdosfs_mkdire(pbuf, dir, cur)) == NULL) {
+                               warn("msdosfs_mkdire %s", pbuf);
+                               return -1;
+                       }
+                       if (msdos_populate_dir(pbuf, de, cur->child, cur,
+                           fsopts) == -1) {
+                               warn("msdos_populate_dir %s", pbuf);
+                               return -1;
+                       }
                        continue;
                } else if (!S_ISREG(cur->type)) {
                        warnx("skipping non-regular file %s/%s", cur->path,
                            cur->name);
                        continue;
                }
-               if (msdosfs_mkfile(pbuf, dir, cur) == NULL)
-                       err(1, "msdosfs_mkfile %s", pbuf);
+               if (msdosfs_mkfile(pbuf, dir, cur) == NULL) {
+                       warn("msdosfs_mkfile %s", pbuf);
+                       return -1;
+               }
        }
        return 0;
 }