summaryrefslogtreecommitdiff
path: root/system/man-db/man-db-2.8.5-iconv.patch
diff options
context:
space:
mode:
Diffstat (limited to 'system/man-db/man-db-2.8.5-iconv.patch')
-rw-r--r--system/man-db/man-db-2.8.5-iconv.patch22
1 files changed, 9 insertions, 13 deletions
diff --git a/system/man-db/man-db-2.8.5-iconv.patch b/system/man-db/man-db-2.8.5-iconv.patch
index 8c006fd9c..c2232920d 100644
--- a/system/man-db/man-db-2.8.5-iconv.patch
+++ b/system/man-db/man-db-2.8.5-iconv.patch
@@ -1,6 +1,6 @@
--- man-db-2.8.5/src/man.c 2018-06-18 22:44:35.672743065 -0500
+++ man-db-2.8.5/src/man.c 2018-06-18 22:46:35.032624890 -0500
-@@ -1569,15 +1569,13 @@
+@@ -1516,15 +1516,13 @@
{
debug ("add_output_iconv: source %s, target %s\n", source, target);
if (source && target && !STREQ (source, target)) {
@@ -19,23 +19,19 @@
--- man-db-2.8.5/src/manconv.c
+++ man-db-2.8.5/src/manconv.c
-@@ -106,10 +106,9 @@ static int try_iconv (pipeline *p, const char *try_from_code, const char *to,
- static char *utf8 = NULL, *output = NULL;
- size_t utf8left = 0;
+@@ -111,6 +111,5 @@ static int try_iconv (pipeline *p, const char *try_from_code, const char *to,
iconv_t cd_utf8, cd = NULL;
-- int to_utf8 = STREQ (try_to_code, "UTF-8") ||
-- STRNEQ (try_to_code, "UTF-8//", 7);
+- bool to_utf8 = STREQ (try_to_code, "UTF-8") ||
+- STRNEQ (try_to_code, "UTF-8//", 7);
- const char *utf8_target = last ? "UTF-8//IGNORE" : "UTF-8";
-- int ignore_errors = (strstr (try_to_code, "//IGNORE") != NULL);;
-+ int to_utf8 = STREQ (try_to_code, "UTF-8");
+- bool ignore_errors = (strstr (try_to_code, "//IGNORE") != NULL);
++ bool to_utf8 = STREQ (try_to_code, "UTF-8");
+ const char *utf8_target = "UTF-8";
-+ int ignore_errors = 0;
++ bool ignore_errors = 0;
int ret = 0;
-
- debug ("trying encoding %s -> %s\n", try_from_code, try_to_code);
--- man-db-2.8.5/src/manconv_client.c
+++ man-db-2.8.5/src/manconv_client.c
-@@ -105,7 +105,7 @@ void add_manconv (pipeline *p, const char *source, const char *target)
+@@ -102,7 +102,7 @@ void add_manconv (pipeline *p, const char *source, const char *target)
codes->from[2] = NULL;
name = appendstr (name, "UTF-8:", source, (void *) 0);
}
@@ -58,7 +54,7 @@
debug_level = 1;
--- man-db-2.8.5/src/whatis.c
+++ man-db-2.8.5/src/whatis.c
-@@ -974,7 +974,7 @@ int main (int argc, char *argv[])
+@@ -945,7 +945,7 @@ int main (int argc, char *argv[])
display_seen = hashtable_create (&null_hashtable_free);
#ifdef HAVE_ICONV