*: fix Unicode damage
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
1 parent
c9e11ef570
commit
a21eaf440d
3 files changed
+10
-10
No files matched your search
@@ -53,7 +53,7 @@
|
|||||||
* New implementation contributed by Richard Henderson <rth@tamu.edu>
|
* New implementation contributed by Richard Henderson <rth@tamu.edu>
|
||||||
* Based on original work by Bjorn Ekwall <bj0rn@blox.se>
|
* Based on original work by Bjorn Ekwall <bj0rn@blox.se>
|
||||||
* Restructured (and partly rewritten) by:
|
* Restructured (and partly rewritten) by:
|
||||||
* Björn Ekwall <bj0rn@blox.se> February 1999
|
* Björn Ekwall <bj0rn@blox.se> February 1999
|
||||||
*
|
*
|
||||||
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
|
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
|
||||||
*/
|
*/
|
||||||
|
|||||||
+1
-1
@@ -86,7 +86,7 @@ static unsigned long get_netmask(unsigned long ipaddr)
|
|||||||
# if ENABLE_FEATURE_IPCALC_FANCY
|
# if ENABLE_FEATURE_IPCALC_FANCY
|
||||||
"prefix\0" No_argument "p" // prefix from IP[/prefix] [netmask]
|
"prefix\0" No_argument "p" // prefix from IP[/prefix] [netmask]
|
||||||
"hostname\0" No_argument "h" // hostname from IP
|
"hostname\0" No_argument "h" // hostname from IP
|
||||||
"silent\0" No_argument "s" // don’t ever display error messages
|
"silent\0" No_argument "s" // don't ever display error messages
|
||||||
# endif
|
# endif
|
||||||
;
|
;
|
||||||
# define GETOPT32 getopt32long
|
# define GETOPT32 getopt32long
|
||||||
|
|||||||
@@ -1222,11 +1222,11 @@ static int test_net_to_pty_data_integrity(void)
|
|||||||
expected_data = xmalloc(TESTDATA_SIZE);
|
expected_data = xmalloc(TESTDATA_SIZE);
|
||||||
|
|
||||||
/* Process input_data simulating net_to_pty transformations:
|
/* Process input_data simulating net_to_pty transformations:
|
||||||
* - IAC IAC → single IAC
|
* - IAC IAC -> single IAC
|
||||||
* - IAC SB TELOPT_NAWS [4 bytes] IAC SE → stripped
|
* - IAC SB TELOPT_NAWS [4 bytes] IAC SE -> stripped
|
||||||
* - Other IAC sequences → stripped
|
* - Other IAC sequences -> stripped
|
||||||
* - \r\n → \r (skip the \n)
|
* - \r\n -> \r (skip the \n)
|
||||||
* - \r\0 → \r (skip the \0)
|
* - \r\0 -> \r (skip the \0)
|
||||||
*/
|
*/
|
||||||
memset(input_data + input_size, 0, 64);
|
memset(input_data + input_size, 0, 64);
|
||||||
expected_size = 0;
|
expected_size = 0;
|
||||||
@@ -1235,7 +1235,7 @@ static int test_net_to_pty_data_integrity(void)
|
|||||||
/* Tail of 64 extra zero bytes allows to safely read beyond the end */
|
/* Tail of 64 extra zero bytes allows to safely read beyond the end */
|
||||||
if (input_data[i] == IAC) {
|
if (input_data[i] == IAC) {
|
||||||
if (input_data[i + 1] == IAC) {
|
if (input_data[i + 1] == IAC) {
|
||||||
/* IAC IAC → single IAC */
|
/* IAC IAC -> single IAC */
|
||||||
expected_data[expected_size++] = IAC;
|
expected_data[expected_size++] = IAC;
|
||||||
i += 2;
|
i += 2;
|
||||||
continue;
|
continue;
|
||||||
@@ -1450,7 +1450,7 @@ static int test_pty_to_net_data_integrity(void)
|
|||||||
input_data = xzalloc(TESTDATA_SIZE);
|
input_data = xzalloc(TESTDATA_SIZE);
|
||||||
|
|
||||||
/* Generate random data - this time we want lots of 0xFF (IAC) bytes
|
/* Generate random data - this time we want lots of 0xFF (IAC) bytes
|
||||||
* to test IAC escaping (IAC → IAC IAC)
|
* to test IAC escaping (IAC -> IAC IAC)
|
||||||
*/
|
*/
|
||||||
randbits = 0;
|
randbits = 0;
|
||||||
for (i = 0; i < TESTDATA_SIZE;) {
|
for (i = 0; i < TESTDATA_SIZE;) {
|
||||||
@@ -1483,7 +1483,7 @@ static int test_pty_to_net_data_integrity(void)
|
|||||||
expected_data = xmalloc(TESTDATA_SIZE * 2);
|
expected_data = xmalloc(TESTDATA_SIZE * 2);
|
||||||
|
|
||||||
/* Process input_data simulating pty_to_net transformations:
|
/* Process input_data simulating pty_to_net transformations:
|
||||||
* - IAC (0xFF) → IAC IAC (doubled)
|
* - IAC (0xFF) -> IAC IAC (doubled)
|
||||||
* - All other bytes pass through unchanged
|
* - All other bytes pass through unchanged
|
||||||
*/
|
*/
|
||||||
expected_size = 0;
|
expected_size = 0;
|
||||||
|
|||||||
Reference in new issue
Block a user