build_dentry_tree() fix error paths

[wimlib] / src / wim.c

diff --git a/src/wim.c b/src/wim.c
index 5d5c8fefb3a0dcfa6c0261216b02a0a95ed19f3b..557cda9c498da09adabfb3daac514396a06cac91 100644 (file)
--- a/src/wim.c
+++ b/src/wim.c
@@ -24,16 +24,20 @@
  * along with wimlib; if not, see http://www.gnu.org/licenses/.
  */
 
-#include "wimlib_internal.h"
-#include "io.h"
-#include "lookup_table.h"
-#include "xml.h"
+#include "config.h"
 #include <stdlib.h>
+#include <stdarg.h>
 
 #ifdef WITH_NTFS_3G
 #include <ntfs-3g/volume.h>
 #endif
 
+#include "wimlib_internal.h"
+#include "io.h"
+#include "lookup_table.h"
+#include "xml.h"
+
+
 static int print_metadata(WIMStruct *w)
 {
        print_security_data(wim_security_data(w));
@@ -205,7 +209,6 @@ int wimlib_select_image(WIMStruct *w, int image)
                        destroy_image_metadata(imd, NULL);
                        imd->root_dentry = NULL;
                        imd->security_data = NULL;
-                       imd->lgt = NULL;
                }
        }
 
@@ -259,7 +262,8 @@ WIMLIBAPI int wimlib_resolve_image(WIMStruct *w, const char *image_name_or_num)
        if (!image_name_or_num)
                return WIM_NO_IMAGE;
 
-       if (strcmp(image_name_or_num, "all") == 0)
+       if (strcmp(image_name_or_num, "all") == 0
+           || strcmp(image_name_or_num, "*") == 0)
                return WIM_ALL_IMAGES;
        image = strtol(image_name_or_num, &p, 10);
        if (p != image_name_or_num && *p == '\0') {
@@ -331,7 +335,7 @@ WIMLIBAPI int wimlib_print_metadata(WIMStruct *w, int image)
        if (!w)
                return WIMLIB_ERR_INVALID_PARAM;
        if (w->hdr.part_number != 1) {
-               ERROR("We cannot show the metadata from part %hu of a %hu-part split WIM",
+               ERROR("We cannot show the metadata from part %hu of a %hu-part split WIM.",
                       w->hdr.part_number, w->hdr.total_parts);
                ERROR("Select the first part of the split WIM to see the metadata.");
                return WIMLIB_ERR_SPLIT_UNSUPPORTED;