libfilezilla 0.24.1 Solaris fixes

[Thomas Klausner]

I'm not using Solaris myself, but a Solaris user of pkgsrc reported two problems with compiling libfilezilla: struct sigaction needs "struct" in front, and wcsnrtombs needs to be prefixed with "std::".

The attached patches fix the issues.

Thanks.

[Thomas Klausner]

Please ignore the patch for lib/string.cpp; I did more testing and it breaks the build on NetBSD.
The other patch still looks valid to me.

[Thomas Klausner]

I have replaced the lib/string.cpp patch with one that limits the change to Solaris.

[Tim Kosse]

The patch to socket.cpp has been applied.

The patch to string.cpp seems wrong. Instead, could you please try if #including wchar.h works?

[Thomas Klausner]

Thanks for applying the patch.

I can't test myself, but I asked someone else who can and they reported:

Doesn't help, it's already being included via this path:

string.cpp: In function 'std::string fz::to_string(const wstring_view&)':
string.cpp:362:17: error: 'wcsnrtombs' was not declared in this scope; did you mean 'std::wcsnrtombs'?

362 | size_t len = wcsnrtombs(nullptr, &in_p, inlen, 0, &ps);

| ^{~
| std::wcsnrtombs}

In file included from /usr/include/wchar.h:31,

from /opt/local/gcc9/include/c++/9.3.0/cwchar:44,
from /opt/local/gcc9/include/c++/9.3.0/bits/postypes.h:40,
from /opt/local/gcc9/include/c++/9.3.0/bits/char_traits.h:40,
from /opt/local/gcc9/include/c++/9.3.0/string:40,
from /opt/local/gcc9/include/c++/9.3.0/stdexcept:39,
from /opt/local/gcc9/include/c++/9.3.0/array:39,
from /opt/local/gcc9/include/c++/9.3.0/tuple:39,
from /opt/local/gcc9/include/c++/9.3.0/functional:54,
from /opt/local/gcc9/include/c++/9.3.0/pstl/glue_algorithm_defs.h:13,
from /opt/local/gcc9/include/c++/9.3.0/algorithm:71,
from libfilezilla/string.hpp:6,
from string.cpp:1:

/usr/include/iso/wchar_iso.h:310:15: note: 'std::wcsnrtombs' declared here

310 | extern size_t wcsnrtombs(char *_RESTRICT_KYWD, const wchar_t _RESTRICT_KYWD,

| ^~

[Tim Kosse]

Something else must be amiss then. According to ​https://docs.oracle.com/cd/E88353_01/html/E37843/wcsnrtombs-3c.html wcsnrtombs is declared if wchar.h is included.

Is it hidden behind some obscure #ifdef?

[Thomas Klausner]

Their reply:

It is declared, it isn't hidden (see the "declared here"), it's just that
it's under namespace std, which is why when I change it to std:: it works.

[Tim Kosse]

wchar.h is a C-header, C does not have namespaces. wcsnrtombs is defined in POSIX.1-2008 to be declared through wchar.h. Solaris claims to support POSIX.1-2008.

The C++ standard does not specify std::wcsnrtombs. The C++ standard further notes under [namespace.std] the following about any non-standard extensions to the std namespace:

Unless otherwise specified, the behavior of a C++ program is undefined if it adds declarations or definitions to namespace std or to a namespace within namespace std.
[...a long list of exceptions not applicable in the context of this ticket...]

Please file a bug report against Solaris to have wcsnrtombs added in accordance to POSIX.1-2008 and another bug report to have the offensive std::wcsnrtombs declaration removed.

[Thomas Klausner]

Can I ask you to reconsider?

Assuming your argument is correct, this does not help existing users/versions of Solaris. The workaround in the patch is limited to Solaris, so it does not affect other operating systems, and it's a small change.