X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fextract.c;fp=src%2Fextract.c;h=f59cffb55347acc014da0feb0aad58f42d2150b8;hb=5c135518e2911d965834f21e16b5024b6b77cb14;hp=b59e22352f81f6078e8fc224a4df322817b12628;hpb=4fb86d6254e7be4da455fa9da0f1032621bb3c96;p=wimlib

diff --git a/src/extract.c b/src/extract.c
index b59e2235..f59cffb5 100644
--- a/src/extract.c
+++ b/src/extract.c
@@ -6,7 +6,7 @@
  */
 
 /*
- * Copyright (C) 2012-2016 Eric Biggers
+ * Copyright (C) 2012-2017 Eric Biggers
  *
  * 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
@@ -1365,18 +1365,19 @@ do_feature_check(const struct wim_features *required_features,
 			required_features->security_descriptors);
 
 	/* Standard UNIX metadata */
-	if ((extract_flags & WIMLIB_EXTRACT_FLAG_UNIX_DATA) &&
-	    required_features->unix_data && !supported_features->unix_data)
-	{
-		ERROR("Requested UNIX metadata extraction, but extraction "
-		      "backend does not support it!");
-		return WIMLIB_ERR_UNSUPPORTED;
-	}
 	if (required_features->unix_data &&
-	    !(extract_flags & WIMLIB_EXTRACT_FLAG_UNIX_DATA))
+	    (!supported_features->unix_data ||
+	     !(extract_flags & WIMLIB_EXTRACT_FLAG_UNIX_DATA)))
 	{
-		WARNING("Ignoring UNIX metadata (uid/gid/mode/rdev) of %lu files",
-			required_features->unix_data);
+		if (extract_flags & WIMLIB_EXTRACT_FLAG_UNIX_DATA) {
+			ERROR("Requested UNIX metadata extraction, but "
+			      "extraction backend does not support it!");
+			return WIMLIB_ERR_UNSUPPORTED;
+		}
+		WARNING("Ignoring UNIX metadata (uid/gid/mode/rdev) of %lu files%"TS,
+			required_features->unix_data,
+			(supported_features->unix_data ?
+			 T("\n          (use --unix-data mode to extract these)") : T("")));
 	}
 
 	/* Linux-style extended attributes */
@@ -1384,8 +1385,10 @@ do_feature_check(const struct wim_features *required_features,
 	    (!supported_features->linux_xattrs ||
 	     !(extract_flags & WIMLIB_EXTRACT_FLAG_UNIX_DATA)))
 	{
-		WARNING("Ignoring Linux-style extended attributes of %lu files",
-			required_features->linux_xattrs);
+		WARNING("Ignoring Linux-style extended attributes of %lu files%"TS,
+			required_features->linux_xattrs,
+			(supported_features->linux_xattrs ?
+			 T("\n          (use --unix-data mode to extract these)") : T("")));
 	}
 
 	/* Object IDs.  */