Report directory tree scan errors

[wimlib] / src / ntfs-3g_capture.c

diff --git a/src/ntfs-3g_capture.c b/src/ntfs-3g_capture.c
index 5bc9563e862557f005bb79093aabfcf67753afe7..6255f09a5ac6521efd002130224ca4776b4eba6e 100644 (file)
--- a/src/ntfs-3g_capture.c
+++ b/src/ntfs-3g_capture.c
@@ -8,20 +8,18 @@
 /*
  * Copyright (C) 2012, 2013, 2014 Eric Biggers
  *
 /*
  * Copyright (C) 2012, 2013, 2014 Eric Biggers
  *

- * This file is part of wimlib, a library for working with WIM files.
+ * This file is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.

  *
  *

- * wimlib is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 3 of the License, or (at your option)
- * any later version.
- *
- * wimlib is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more

  * details.
  *
  * details.
  *

- * You should have received a copy of the GNU General Public License
- * along with wimlib; if not, see http://www.gnu.org/licenses/.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this file; if not, see http://www.gnu.org/licenses/.

  */
 
 #ifdef HAVE_CONFIG_H
  */
 
 #ifdef HAVE_CONFIG_H


@@ -706,10 +704,12 @@ out_progress:
        else
                ret = do_capture_progress(params, WIMLIB_SCAN_DENTRY_OK, inode);
 out:
        else
                ret = do_capture_progress(params, WIMLIB_SCAN_DENTRY_OK, inode);
 out:

-       if (ret == 0)
-               *root_ret = root;
-       else
+       if (unlikely(ret)) {

                free_dentry_tree(root, params->lookup_table);
                free_dentry_tree(root, params->lookup_table);

+               root = NULL;
+               ret = report_capture_error(params, ret, path);
+       }
+       *root_ret = root;

        return ret;
 }
 
        return ret;
 }