File fortune-no-recode.patch of Package fortune

Overview Repositories Revisions Requests Users Attributes Meta

File fortune-no-recode.patch of Package fortune (Revision c602aaa67dc7ec3c5cec3009bac61cfa)

Currently displaying revision c602aaa67dc7ec3c5cec3009bac61cfa , Show latest

From: Jan Engelhardt <jengelh@inai.de>
Date: 2018-01-09 18:59:13.664773029 +0100

No fortunes except ONE actually uses non-ASCII characters, which is substituted
in short order. This allows dropping the entire librecode use, and we do not
even need to convert it to iconv, though that's likewise trivial.

Index: fortune-mod/fortune/fortune.c
===================================================================
--- fortune-mod.orig/fortune/fortune.c
+++ fortune-mod/fortune/fortune.c
@@ -118,7 +118,6 @@ static char rcsid[] = "$NetBSD: fortune.
 #include        <errno.h>
 #include        <locale.h>
 #include        <langinfo.h>
-#include        <recode.h>
 
 
 #ifdef HAVE_REGEX_H
@@ -215,9 +214,6 @@ static regex_t Re_pat;
 #define NO_REGEX
 #endif /* POSIX_REGEX */
 
-static RECODE_REQUEST request;
-static RECODE_OUTER outer;
-
 int add_dir(register FILEDESC *);
 
 static unsigned long my_random(unsigned long base)
@@ -1598,14 +1594,7 @@ static void matches_in_list(FILEDESC * l
                 *sp = '\0';
                 nchar = (int)(sp - Fortbuf);
 
-                if (fp->utf8_charset)
-                {
-                    output = recode_string (request, (const char *)Fortbuf);
-                }
-                else
-                {
                     output = (char *)Fortbuf;
-                }
                 /* Should maybe rot13 Fortbuf -allover */
 
                 if(fp->tbl.str_flags & STR_ROTATED)
@@ -1634,8 +1623,6 @@ static void matches_in_list(FILEDESC * l
                     printf("%c\n", fp->tbl.str_delim);
                 }
 
-                if (fp->utf8_charset)
-                  free (output);
 
                 sp = Fortbuf;
             }
@@ -1683,13 +1670,6 @@ static void display(FILEDESC * fp)
                     *p = 'a' + (ch - 'a' + 13) % 26;
             }
         }
-        if(fp->utf8_charset) {
-            char *output;
-            output = recode_string (request, (const char *)line);
-            fputs(output, stdout);
-            free(output);
-        }
-        else
             fputs((char *)line, stdout);
     }
     fflush(stdout);
@@ -1746,8 +1726,6 @@ static void free_desc(FILEDESC *ptr)
 
 int main(int ac, char *av[])
 {
-    const char *ctype;
-    char *crequest;
     int exit_code = 0;
 
     env_lang=getenv("LC_ALL");
@@ -1757,24 +1735,8 @@ int main(int ac, char *av[])
 
     getargs(ac, av);
 
-    outer = recode_new_outer(true);
-    request = recode_new_request (outer);
 
     setlocale(LC_ALL,"");
-    ctype = nl_langinfo(CODESET);
-    if (!ctype || !*ctype)
-    {
-        ctype = "C";
-    }
-    else if(strcmp(ctype,"ANSI_X3.4-1968") == 0)
-    {
-        ctype="ISO-8859-1";
-    }
-
-    crequest = malloc(strlen(ctype) + 7 + 1);
-    sprintf(crequest, "UTF-8..%s", ctype);
-    recode_scan_request (request, crequest);
-    free(crequest);
 
 #ifndef NO_REGEX
     if (Match)
@@ -1811,9 +1773,6 @@ int main(int ac, char *av[])
         }
     }
 cleanup:
-    recode_delete_request(request);
-    recode_delete_outer(outer);
-
     /* Free the File_list */
     free_desc(File_list);
     free(Fortbuf);
Index: fortune-mod/CMakeLists.txt
===================================================================
--- fortune-mod.orig/CMakeLists.txt
+++ fortune-mod/CMakeLists.txt
@@ -96,11 +96,7 @@ SHLOMIF_ADD_COMMON_C_FLAGS()
 SHLOMIF_FINALIZE_FLAGS()
 
 INCLUDE(CheckIncludeFile)
-SET(_r "stdbool.h" "stdio.h" "recode.h")
-CHECK_INCLUDE_FILES("${_r}" HAVE_RECODE_H)
-IF (NOT "${HAVE_RECODE_H}")
-    MESSAGE(FATAL_ERROR "Cannot find recode.h anywhere - please install lib recode")
-ENDIF ()
+SET(_r "stdbool.h" "stdio.h")
 
 # So it can find config.h
 INCLUDE_DIRECTORIES(BEFORE "${CMAKE_CURRENT_BINARY_DIR}")
@@ -156,7 +152,7 @@ ADD_CUSTOM_TARGET(
 INSTALL_RENAME_MAN("strfile.man" "1" "strfile" "util")
 INSTALL_RENAME_MAN("fortune.6" "6" "fortune" "fortune")
 
-TARGET_LINK_LIBRARIES("fortune" "recode")
+TARGET_LINK_LIBRARIES("fortune")
 INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/util")
 
 ADD_DEFINITIONS("-DLOCOFFDIR=\"${LOCALODIR}\"")

Places

File fortune-no-recode.patch of Package fortune (Revision c602aaa67dc7ec3c5cec3009bac61cfa)

Places