From: Joerg Sonnenberger <joerg.sonnenberger@gmail.com>
Date: Mon, 12 May 2008 12:14:05 +0000 (-0400)
Subject: Fix ae_strtofflags. It was using the wchar constants.
X-Git-Tag: v2.6.0~247
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5954fe3bce1deffbfeb8b83237868a20b0b19998;p=thirdparty%2Flibarchive.git

Fix ae_strtofflags. It was using the wchar constants.

SVN-Revision: 45
---

diff --git a/libarchive/archive_entry.c b/libarchive/archive_entry.c
index 228f91ac6..210685af2 100644
--- a/libarchive/archive_entry.c
+++ b/libarchive/archive_entry.c
@@ -1930,13 +1930,13 @@ ae_strtofflags(const char *s, unsigned long *setp, unsigned long *clrp)
 		while (*end != '\0'  &&  *end != '\t'  &&
 		    *end != ' '  &&  *end != ',')
 			end++;
-		for (flag = flags; flag->wname != NULL; flag++) {
-			if (memcmp(start, flag->wname, end - start) == 0) {
+		for (flag = flags; flag->name != NULL; flag++) {
+			if (memcmp(start, flag->name, end - start) == 0) {
 				/* Matched "noXXXX", so reverse the sense. */
 				clear |= flag->set;
 				set |= flag->clear;
 				break;
-			} else if (memcmp(start, flag->wname + 2, end - start)
+			} else if (memcmp(start, flag->name + 2, end - start)
 			    == 0) {
 				/* Matched "XXXX", so don't reverse. */
 				set |= flag->set;
@@ -1945,7 +1945,7 @@ ae_strtofflags(const char *s, unsigned long *setp, unsigned long *clrp)
 			}
 		}
 		/* Ignore unknown flag names. */
-		if (flag->wname == NULL  &&  failed == NULL)
+		if (flag->name == NULL  &&  failed == NULL)
 			failed = start;
 
 		/* Find start of next token. */