X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Futil.c;h=8f4e0c0be53756db28ef2974d43de4b1f08b8b3e;hp=985d11b875c90352233d73ecbd9f1bdcc918bdd0;hb=1dde5fb0d809f2f5e032e4d5241d1cb15ff3eb65;hpb=cfc2cfc859a047e24d002aa149f73d45d4979d24

diff --git a/src/util.c b/src/util.c
index 985d11b8..8f4e0c0b 100644
--- a/src/util.c
+++ b/src/util.c
@@ -127,6 +127,8 @@ static const char *error_strings[] = {
 		= "Tried to add an image with a name that is already in use",
 	[WIMLIB_ERR_INTEGRITY] 
 		= "The WIM failed an integrity check",
+	[WIMLIB_ERR_INVALID_CAPTURE_CONFIG]
+		= "The capture configuration string was invalid",
 	[WIMLIB_ERR_INVALID_CHUNK_SIZE] 
 		= "The WIM is compressed but does not have a chunk "
 			"size of 32768",
@@ -165,8 +167,6 @@ static const char *error_strings[] = {
 			"identify a WIM file",
 	[WIMLIB_ERR_NO_FILENAME] 
 		= "The WIM is not identified with a filename",
-	[WIMLIB_ERR_NOT_ROOT]
-		= "Root privileges are required for this operation",
 	[WIMLIB_ERR_NTFS_3G]
 		= "NTFS-3g encountered an error (check errno)",
 	[WIMLIB_ERR_OPEN] 
@@ -267,7 +267,7 @@ static iconv_t cd_utf16_to_utf8 = (iconv_t)(-1);
 /* Converts a string in the UTF-16 encoding to a newly allocated string in the
  * UTF-8 encoding.  */
 char *utf16_to_utf8(const char *utf16_str, size_t utf16_len,
-				size_t *utf8_len_ret)
+		    size_t *utf8_len_ret)
 {
 	if (cd_utf16_to_utf8 == (iconv_t)(-1)) {
 		cd_utf16_to_utf8 = iconv_open("UTF-8", "UTF-16LE");
@@ -429,8 +429,13 @@ const char *path_basename(const char *path)
 	p--;
 
 	/* Trailing slashes. */
-	while ((p != path - 1) && *p == '/')
+	while (1) {
+		if (p == path - 1)
+			return "";
+		if (*p != '/')
+			break;
 		p--;
+	}
 
 	while ((p != path - 1) && *p != '/')
 		p--;