On 03/02/13 13:50, Heiko Hund wrote: > Currently openvpn exits when reading configuration from a file > that has an UTF-8 byte order mark (EF BB BF) at its start. > > While it is useless to put a BOM into UTF-8 encoded files, the > Unicode standard [1] permits it (on page 36): > > "Use of a BOM is neither required nor recommended for UTF-8, > but may be encountered in contexts where UTF-8 data is converted > from other encoding forms that use a BOM or where the BOM is > used as a UTF-8 signature." > > Notepad.exe, the default text editor on Windows, always puts the BOM > into UTF-8 encoded files when saving them. Others may do as well. > > Just ignoring the UTF-8 BOM will make config files with UTF-8 BOM > readable. > > [1] http://www.unicode.org/versions/Unicode5.0.0/ch02.pdf > > Signed-off-by: Heiko Hund <heiko.h...@sophos.com> > --- > src/openvpn/options.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/src/openvpn/options.c b/src/openvpn/options.c > index 8ca41a3..c52b699 100644 > --- a/src/openvpn/options.c > +++ b/src/openvpn/options.c > @@ -3773,7 +3773,11 @@ read_config_file (struct options *options, > { > CLEAR (p); > ++line_num; > - if (parse_line (line, p, SIZE (p), file, line_num, msglevel, > &options->gc)) > + /* Ignore UTF-8 BOM at start of stream */ > + int offset = 0; > + if (line_num == 1 && strncmp (line, "\xEF\xBB\xBF", 3) == 0) > + offset = 3;
Lets try again without word-wrap .... Some compilers will complain with int offset being declared "down" here. Moving it up to before the CLEAR (p); line is probably going to work better ... -- kind regards, David Sommerseth
signature.asc
Description: OpenPGP digital signature
