Skip to content

Commit

Permalink
Merge #10708 'remove DYNAMIC_ICONV'
Browse files Browse the repository at this point in the history 
closes #3457
  • Loading branch information
@justinmk
justinmk committed Aug 9, 2019
2 parents 47b7b47 + d6f15cc commit 8a56bd9
Show file tree
Hide file tree
Showing 10 changed files with 84 additions and 290 deletions.
7 changes: 0 additions & 7 deletions config/CMakeLists.txt
View file
Expand Up @@ -20,13 +20,6 @@ endif()
check_symbol_exists(_NSGetEnviron crt_externs.h HAVE__NSGETENVIRON)

# Headers
if(ICONV_INCLUDE_DIR)
list(APPEND CMAKE_REQUIRED_INCLUDES "${ICONV_INCLUDE_DIR}")
endif()
check_include_files(iconv.h HAVE_ICONV_H)
if(ICONV_INCLUDE_DIR)
list(REMOVE_ITEM CMAKE_REQUIRED_INCLUDES "${ICONV_INCLUDE_DIR}")
endif()
check_include_files(langinfo.h HAVE_LANGINFO_H)
check_include_files(locale.h HAVE_LOCALE_H)
check_include_files(pwd.h HAVE_PWD_H)
Expand Down
1 change: 0 additions & 1 deletion config/config.h.in
View file
Expand Up @@ -22,7 +22,6 @@
#cmakedefine HAVE_GETPWNAM
#cmakedefine HAVE_GETPWUID
#cmakedefine HAVE_ICONV
#cmakedefine HAVE_ICONV_H
#cmakedefine HAVE_LANGINFO_H
#cmakedefine HAVE_LOCALE_H
#cmakedefine HAVE_NL_LANGINFO_CODESET
Expand Down
6 changes: 1 addition & 5 deletions src/nvim/eval.c
View file
Expand Up @@ -11259,7 +11259,7 @@ static void f_has(typval_T *argvars, typval_T *rettv, FunPtr fptr)
"fork",
#endif
"gettext",
#if defined(HAVE_ICONV_H) && defined(USE_ICONV)
#if defined(HAVE_ICONV)
"iconv",
#endif
"insert_expand",
Expand Down Expand Up @@ -11372,10 +11372,6 @@ static void f_has(typval_T *argvars, typval_T *rettv, FunPtr fptr)
n = stdout_isatty;
} else if (STRICMP(name, "multi_byte_encoding") == 0) {
n = has_mbyte != 0;
#if defined(USE_ICONV) && defined(DYNAMIC_ICONV)
} else if (STRICMP(name, "iconv") == 0) {
n = iconv_enabled(false);
#endif
} else if (STRICMP(name, "syntax_items") == 0) {
n = syntax_present(curwin);
#ifdef UNIX
Expand Down
120 changes: 63 additions & 57 deletions src/nvim/fileio.c
View file
Expand Up @@ -163,22 +163,22 @@ typedef struct AutoPatCmd {
* Structure to pass arguments from buf_write() to buf_write_bytes().
*/
struct bw_info {
int bw_fd; /* file descriptor */
char_u *bw_buf; /* buffer with data to be written */
int bw_len; /* length of data */
int bw_fd; // file descriptor
char_u *bw_buf; // buffer with data to be written
int bw_len; // length of data
#ifdef HAS_BW_FLAGS
int bw_flags; /* FIO_ flags */
int bw_flags; // FIO_ flags
#endif
char_u bw_rest[CONV_RESTLEN]; /* not converted bytes */
int bw_restlen; /* nr of bytes in bw_rest[] */
int bw_first; /* first write call */
char_u *bw_conv_buf; /* buffer for writing converted chars */
int bw_conv_buflen; /* size of bw_conv_buf */
int bw_conv_error; /* set for conversion error */
linenr_T bw_conv_error_lnum; /* first line with error or zero */
linenr_T bw_start_lnum; /* line number at start of buffer */
# ifdef USE_ICONV
iconv_t bw_iconv_fd; /* descriptor for iconv() or -1 */
char_u bw_rest[CONV_RESTLEN]; // not converted bytes
int bw_restlen; // nr of bytes in bw_rest[]
int bw_first; // first write call
char_u *bw_conv_buf; // buffer for writing converted chars
int bw_conv_buflen; // size of bw_conv_buf
int bw_conv_error; // set for conversion error
linenr_T bw_conv_error_lnum; // first line with error or zero
linenr_T bw_start_lnum; // line number at start of buffer
# ifdef HAVE_ICONV
iconv_t bw_iconv_fd; // descriptor for iconv() or -1
# endif
};

Expand Down Expand Up @@ -327,10 +327,10 @@ readfile(
char_u *fenc_next = NULL; // next item in 'fencs' or NULL
bool advance_fenc = false;
long real_size = 0;
# ifdef USE_ICONV
iconv_t iconv_fd = (iconv_t)-1; /* descriptor for iconv() or -1 */
int did_iconv = FALSE; /* TRUE when iconv() failed and trying
'charconvert' next */
# ifdef HAVE_ICONV
iconv_t iconv_fd = (iconv_t)-1; // descriptor for iconv() or -1
int did_iconv = false; // TRUE when iconv() failed and trying
// 'charconvert' next
# endif
int converted = FALSE; /* TRUE if conversion done */
int notconverted = FALSE; /* TRUE if conversion wanted but it
Expand Down Expand Up @@ -841,7 +841,7 @@ readfile(
fileformat = EOL_UNKNOWN; /* detect from file */
}

# ifdef USE_ICONV
# ifdef HAVE_ICONV
if (iconv_fd != (iconv_t)-1) {
/* aborted conversion with iconv(), close the descriptor */
iconv_close(iconv_fd);
Expand Down Expand Up @@ -908,15 +908,14 @@ readfile(



# ifdef USE_ICONV
/*
* Try using iconv() if we can't convert internally.
*/
# ifdef HAVE_ICONV
// Try using iconv() if we can't convert internally.
if (fio_flags == 0
&& !did_iconv
)
) {
iconv_fd = (iconv_t)my_iconv_open(
enc_utf8 ? (char_u *)"utf-8" : p_enc, fenc);
}
# endif

/*
Expand All @@ -925,12 +924,12 @@ readfile(
*/
if (fio_flags == 0 && !read_stdin && !read_buffer && *p_ccv != NUL
&& !read_fifo
# ifdef USE_ICONV
# ifdef HAVE_ICONV
&& iconv_fd == (iconv_t)-1
# endif
) {
# ifdef USE_ICONV
did_iconv = FALSE;
# ifdef HAVE_ICONV
did_iconv = false;
# endif
/* Skip conversion when it's already done (retry for wrong
* "fileformat"). */
Expand All @@ -950,7 +949,7 @@ readfile(
}
} else {
if (fio_flags == 0
# ifdef USE_ICONV
# ifdef HAVE_ICONV
&& iconv_fd == (iconv_t)-1
# endif
) {
Expand Down Expand Up @@ -1023,20 +1022,23 @@ readfile(
* ucs-4 to utf-8: 4 bytes become up to 6 bytes, size must be
* multiple of 4 */
real_size = (int)size;
# ifdef USE_ICONV
if (iconv_fd != (iconv_t)-1)
# ifdef HAVE_ICONV
if (iconv_fd != (iconv_t)-1) {
size = size / ICONV_MULT;
else
} else {
# endif
if (fio_flags & FIO_LATIN1)
if (fio_flags & FIO_LATIN1) {
size = size / 2;
else if (fio_flags & (FIO_UCS2 | FIO_UTF16))
} else if (fio_flags & (FIO_UCS2 | FIO_UTF16)) {
size = (size * 2 / 3) & ~1;
else if (fio_flags & FIO_UCS4)
} else if (fio_flags & FIO_UCS4) {
size = (size * 2 / 3) & ~3;
else if (fio_flags == FIO_UCSBOM)
size = size / ICONV_MULT; /* worst case */

} else if (fio_flags == FIO_UCSBOM) {
size = size / ICONV_MULT; // worst case
}
# ifdef HAVE_ICONV
}
# endif
if (conv_restlen > 0) {
// Insert unconverted bytes from previous line.
memmove(ptr, conv_rest, conv_restlen); // -V614
Expand Down Expand Up @@ -1112,7 +1114,7 @@ readfile(

/* When we did a conversion report an error. */
if (fio_flags != 0
# ifdef USE_ICONV
# ifdef HAVE_ICONV
|| iconv_fd != (iconv_t)-1
# endif
) {
Expand All @@ -1135,7 +1137,7 @@ readfile(
* leave the UTF8 checking code to do it, as it
* works slightly differently. */
if (bad_char_behavior != BAD_KEEP && (fio_flags != 0
# ifdef USE_ICONV
# ifdef HAVE_ICONV
|| iconv_fd != (iconv_t)-1
# endif
)) {
Expand All @@ -1144,8 +1146,8 @@ readfile(
--conv_restlen;
}
}
fio_flags = 0; /* don't convert this */
# ifdef USE_ICONV
fio_flags = 0; // don't convert this
# ifdef HAVE_ICONV
if (iconv_fd != (iconv_t)-1) {
iconv_close(iconv_fd);
iconv_fd = (iconv_t)-1;
Expand Down Expand Up @@ -1216,7 +1218,7 @@ readfile(
if (size <= 0)
break;

# ifdef USE_ICONV
# ifdef HAVE_ICONV
if (iconv_fd != (iconv_t)-1) {
/*
* Attempt conversion of the read bytes to 'encoding' using
Expand Down Expand Up @@ -1474,10 +1476,11 @@ readfile(
* file is more likely than a conversion error. */
if (can_retry && !incomplete_tail)
break;
# ifdef USE_ICONV
/* When we did a conversion report an error. */
if (iconv_fd != (iconv_t)-1 && conv_error == 0)
# ifdef HAVE_ICONV
// When we did a conversion report an error.
if (iconv_fd != (iconv_t)-1 && conv_error == 0) {
conv_error = readfile_linenr(linecnt, ptr, p);
}
# endif
/* Remember the first linenr with an illegal byte */
if (conv_error == 0 && illegal_byte == 0)
Expand All @@ -1497,15 +1500,18 @@ readfile(
if (p < ptr + size && !incomplete_tail) {
/* Detected a UTF-8 error. */
rewind_retry:
/* Retry reading with another conversion. */
# ifdef USE_ICONV
if (*p_ccv != NUL && iconv_fd != (iconv_t)-1)
/* iconv() failed, try 'charconvert' */
did_iconv = TRUE;
else
// Retry reading with another conversion.
# ifdef HAVE_ICONV
if (*p_ccv != NUL && iconv_fd != (iconv_t)-1) {
// iconv() failed, try 'charconvert'
did_iconv = true;
} else {
# endif
// use next item from 'fileencodings'
advance_fenc = true;
# ifdef HAVE_ICONV
}
# endif
file_rewind = true;
goto retry;
}
Expand Down Expand Up @@ -1710,7 +1716,7 @@ readfile(
}
if (fenc_alloced)
xfree(fenc);
# ifdef USE_ICONV
# ifdef HAVE_ICONV
if (iconv_fd != (iconv_t)-1) {
iconv_close(iconv_fd);
# ifndef __clang_analyzer__
Expand Down Expand Up @@ -2294,7 +2300,7 @@ buf_write(
write_info.bw_conv_error = FALSE;
write_info.bw_conv_error_lnum = 0;
write_info.bw_restlen = 0;
# ifdef USE_ICONV
# ifdef HAVE_ICONV
write_info.bw_iconv_fd = (iconv_t)-1;
# endif

Expand Down Expand Up @@ -3015,7 +3021,7 @@ buf_write(


if (converted && wb_flags == 0) {
# ifdef USE_ICONV
# ifdef HAVE_ICONV
// Use iconv() conversion when conversion is needed and it's not done
// internally.
write_info.bw_iconv_fd = (iconv_t)my_iconv_open(fenc,
Expand Down Expand Up @@ -3045,7 +3051,7 @@ buf_write(
}
}
if (converted && wb_flags == 0
# ifdef USE_ICONV
# ifdef HAVE_ICONV
&& write_info.bw_iconv_fd == (iconv_t)-1
# endif
&& wfname == fname
Expand Down Expand Up @@ -3573,7 +3579,7 @@ buf_write(
xfree(buffer);
xfree(fenc_tofree);
xfree(write_info.bw_conv_buf);
# ifdef USE_ICONV
# ifdef HAVE_ICONV
if (write_info.bw_iconv_fd != (iconv_t)-1) {
iconv_close(write_info.bw_iconv_fd);
write_info.bw_iconv_fd = (iconv_t)-1;
Expand Down Expand Up @@ -3948,7 +3954,7 @@ static int buf_write_bytes(struct bw_info *ip)
}
}

# ifdef USE_ICONV
# ifdef HAVE_ICONV
if (ip->bw_iconv_fd != (iconv_t)-1) {
const char *from;
size_t fromlen;
Expand Down
10 changes: 0 additions & 10 deletions src/nvim/globals.h
View file
Expand Up @@ -655,16 +655,6 @@ EXTERN int inhibit_delete_count INIT(= 0);
/// Encoding used when 'fencs' is set to "default"
EXTERN char_u *fenc_default INIT(= NULL);

# if defined(USE_ICONV) && defined(DYNAMIC_ICONV)
/* Pointers to functions and variables to be loaded at runtime */
EXTERN size_t (*iconv)(iconv_t cd, const char **inbuf, size_t *inbytesleft,
char **outbuf, size_t *outbytesleft);
EXTERN iconv_t (*iconv_open)(const char *tocode, const char *fromcode);
EXTERN int (*iconv_close)(iconv_t cd);
EXTERN int (*iconvctl)(iconv_t cd, int request, void *argument);
EXTERN int* (*iconv_errno)(void);
# endif

/// "State" is the main state of Vim.
/// There are other variables that modify the state:
/// Visual_mode: When State is NORMAL or INSERT.
Expand Down
46 changes: 7 additions & 39 deletions src/nvim/iconv.h
View file
@@ -1,52 +1,20 @@
#ifndef NVIM_ICONV_H
#define NVIM_ICONV_H

// iconv can be linked at compile-time as well as loaded at runtime. In the
// latter case, some function pointers need to be initialized after loading
// the library (see `iconv_enabled()` in mbyte.c). These function pointers
// are stored in globals.h. Since globals.h includes iconv.h to get the
// definition of USE_ICONV, we can't include it from iconv.h. One way to
// solve this conundrum would be perhaps to let cmake decide the value of
// USE_ICONV, or to put the USE_ICONV definition in config.h.in directly. As
// it stands, globals.h needs to be included alongside iconv.h.

#include "auto/config.h"

// Use iconv() when it's available, either by linking to the library at
// compile time or by loading it at runtime.
#if (defined(HAVE_ICONV_H) && defined(HAVE_ICONV)) || defined(DYNAMIC_ICONV)
# define USE_ICONV
#endif

// If we don't have the actual iconv header files present but USE_ICONV was
// defined, we provide a type shim (pull in errno.h and define iconv_t).
// This enables us to still load and use iconv dynamically at runtime.
#ifdef USE_ICONV
#ifdef HAVE_ICONV
# include <errno.h>
# ifdef HAVE_ICONV_H
# include <iconv.h>
# else
typedef void *iconv_t;
# endif
#endif
# include <iconv.h>

// define some missing constants if necessary
# ifdef USE_ICONV
# ifndef EILSEQ
# define EILSEQ 123
# endif
# ifdef DYNAMIC_ICONV
// on win32 iconv.dll is dynamically loaded
# define ICONV_ERRNO (*iconv_errno())
# define ICONV_E2BIG 7
# define ICONV_EINVAL 22
# define ICONV_EILSEQ 42
# else
# define ICONV_ERRNO errno
# define ICONV_E2BIG E2BIG
# define ICONV_EINVAL EINVAL
# define ICONV_EILSEQ EILSEQ
# endif
# endif
# define ICONV_ERRNO errno
# define ICONV_E2BIG E2BIG
# define ICONV_EINVAL EINVAL
# define ICONV_EILSEQ EILSEQ
#endif

#endif // NVIM_ICONV_H
3 changes: 0 additions & 3 deletions src/nvim/main.c
View file
Expand Up @@ -664,9 +664,6 @@ void getout(int exitval)
ui_call_set_title(cstr_as_string((char *)p_titleold));
}

#if defined(USE_ICONV) && defined(DYNAMIC_ICONV)
iconv_end();
#endif
cs_end();
if (garbage_collect_at_exit) {
garbage_collect(false);
Expand Down

0 comments on commit 8a56bd9

Please sign in to comment.