Skip to content

N
nx-libs
Commit d122d754 authored by Thomas Klausner's avatar Thomas Klausner Committed by Ulrich Sibiller
Browse files
Options

Stop truncating source to destination length if it is larger.

It seems useless to do that since the code tests for both source length and destination to be non-zero. This fixes a cut'n'paste problem in xterm where the paste length was limited to 1024 (BUFSIZ) in button.c. Signed-off-by: 's avatarAlan Coopersmith <alan.coopersmith@oracle.com> Backported-to-NX-by: 's avatarUlrich Sibiller <uli42@gmx.de>
parent 88edf808
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 28 deletions
nx-X11/lib/X11/lcGenConv.c
View file @ d122d754
......@@ -764,9 +764,6 @@ mbstowcs_org(
return( 0 );
}
if (*from_left > *to_left)
*from_left = *to_left;
while (*from_left && *to_left) {
ch = *inbufptr++;
......@@ -921,9 +918,6 @@ wcstombs_org(
int defstr_len = strlen(default_string);
if (*from_left > *to_left)
*from_left = *to_left;
while (*from_left && *to_left) {
wc = *inbufptr++;
......@@ -1080,9 +1074,6 @@ wcstocts(
int from_size = *from_left;
char *ext_seg_len = NULL;
if (*from_left > *to_left)
*from_left = *to_left;
while (*from_left && *to_left) {
wc = *inbufptr++;
......@@ -1272,9 +1263,6 @@ ctstowcs(
return( 0 );
}
if (*from_left > *to_left)
*from_left = *to_left;
while (*from_left && *to_left) {
ch = *inbufptr++;
......@@ -1666,9 +1654,6 @@ mbstostr(
return( 0 );
}
if (*from_left > *to_left)
*from_left = *to_left;
while (*from_left && *to_left) {
ch = *inbufptr++;
......@@ -1956,10 +1941,6 @@ wcstostr(
const char *default_string = XLC_PUBLIC(lcd, default_string);
int defstr_len = strlen(default_string);
if (*from_left > *to_left)
*from_left = *to_left;
while (*from_left && *to_left) {
wc = *inbufptr++;
......@@ -2114,9 +2095,6 @@ wctocs(
char *outbufptr = *to;
int from_size = *from_left;
if (*from_left > *to_left)
*from_left = *to_left;
if (*from_left && *to_left) {
wc = *inbufptr++;
......@@ -2427,9 +2405,6 @@ strtombs(
char *outbufptr = *to;
int from_size = *from_left;
if (*from_left > *to_left)
*from_left = *to_left;
while (*from_left && *to_left) {
ch = *inbufptr++;
......@@ -2537,9 +2512,6 @@ strtowcs(
wchar_t *outbufptr = (wchar_t *)*to;
int from_size = *from_left;
if (*from_left > *to_left)
*from_left = *to_left;
while (*from_left && *to_left) {
ch = *inbufptr++;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment