mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-23 04:46:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix show directory and file names in other that system encoding symbolsets (with error of recoding).

Browse Source 
Old behaviour: enrties not show, new behaviour: entries show, but marked as broken files if
recoding impossible
This commit is contained in:
Slava Zanko 2009-04-20 13:09:59 +03:00
parent 26f0e58810
commit df3926d1c4
2 changed files with 111 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/strutil.c
View File

@ -101,15 +101,19 @@ static int
_str_convert (GIConv coder, char *string, int size, GString * buffer) _str_convert (GIConv coder, char *string, int size, GString * buffer)
{ {
int state; int state;
gchar *tmp_buff; gchar *tmp_buff = NULL;
gssize left; gssize left;
gsize bytes_read, bytes_written; gsize bytes_read, bytes_written;
GError *error = NULL; GError *error = NULL;
errno = 0; errno = 0;
if (string == NULL || buffer == NULL)
return ESTR_FAILURE;
if (used_class.is_valid_string (string)) if (! used_class.is_valid_string (string))
{ {
return ESTR_FAILURE;
}
state = 0; state = 0;
if (size < 0) if (size < 0)
{ {
@ -121,6 +125,7 @@ _str_convert (GIConv coder, char *string, int size, GString * buffer)
if (left < size) if (left < size)
size = left; size = left;
} }
left = size; left = size;
if (coder == (GIConv) (-1)) if (coder == (GIConv) (-1))
@ -135,7 +140,6 @@ _str_convert (GIConv coder, char *string, int size, GString * buffer)
coder, coder,
&bytes_read, &bytes_read,
&bytes_written, &error); &bytes_written, &error);
if (error) if (error)
{ {
switch (error->code) switch (error->code)
@ -146,22 +150,26 @@ _str_convert (GIConv coder, char *string, int size, GString * buffer)
g_string_append (buffer, tmp_buff); g_string_append (buffer, tmp_buff);
g_free (tmp_buff); g_free (tmp_buff);
g_error_free (error); g_error_free (error);
return ESTR_PROBLEM; error = NULL;
return ESTR_FAILURE;
break; break;
case G_CONVERT_ERROR_ILLEGAL_SEQUENCE: case G_CONVERT_ERROR_ILLEGAL_SEQUENCE:
/* Invalid byte sequence in conversion input. */ /* Invalid byte sequence in conversion input. */
if (tmp_buff){
g_string_append (buffer, tmp_buff); g_string_append (buffer, tmp_buff);
g_string_append (buffer, "?");
g_free (tmp_buff); g_free (tmp_buff);
}
if (bytes_read < left) if (bytes_read < left)
{ {
string += bytes_read + 1; string += bytes_read + 1;
size -= (bytes_read + 1); size -= (bytes_read + 1);
left -= (bytes_read + 1); left -= (bytes_read + 1);
g_string_append_c (buffer, *(string-1));
} }
else else
{ {
g_error_free (error); g_error_free (error);
error = NULL;
return ESTR_PROBLEM; return ESTR_PROBLEM;
} }
state = ESTR_PROBLEM; state = ESTR_PROBLEM;
@ -169,6 +177,7 @@ _str_convert (GIConv coder, char *string, int size, GString * buffer)
case G_CONVERT_ERROR_PARTIAL_INPUT: case G_CONVERT_ERROR_PARTIAL_INPUT:
/* Partial character sequence at end of input. */ /* Partial character sequence at end of input. */
g_error_free (error); g_error_free (error);
error = NULL;
g_string_append (buffer, tmp_buff); g_string_append (buffer, tmp_buff);
g_free (tmp_buff); g_free (tmp_buff);
if (bytes_read < left) if (bytes_read < left)
@ -185,25 +194,41 @@ _str_convert (GIConv coder, char *string, int size, GString * buffer)
case G_CONVERT_ERROR_FAILED: /* Conversion failed for some reason. */ case G_CONVERT_ERROR_FAILED: /* Conversion failed for some reason. */
default: default:
g_error_free (error); g_error_free (error);
if (tmp_buff) error = NULL;
if (tmp_buff){
g_free (tmp_buff); g_free (tmp_buff);
tmp_buff = NULL;
}
return ESTR_FAILURE; return ESTR_FAILURE;
} }
g_error_free (error); g_error_free (error);
error = NULL;
} }
else else
{ {
if (tmp_buff != NULL)
{
if (*tmp_buff){
g_string_append (buffer, tmp_buff); g_string_append (buffer, tmp_buff);
g_free (tmp_buff); g_free (tmp_buff);
string += bytes_read; string += bytes_read;
left -= bytes_read; left -= bytes_read;
} }
} else
{
g_free (tmp_buff);
g_string_append (buffer, string);
return state; return state;
} }
}
else else
return ESTR_FAILURE; {
g_string_append (buffer, string);
return ESTR_PROBLEM;
}
}
}
return state;
} }
int int
@ -233,7 +258,7 @@ str_vfs_convert_from (GIConv coder, char *string, GString * buffer)
if (coder == str_cnv_not_convert) if (coder == str_cnv_not_convert)
{ {
g_string_append (buffer, string); g_string_append (buffer, (string)?string:"");
result = 0; result = 0;
} }
else else

4
vfs/vfs.c
View File

@ -750,13 +750,13 @@ mc_readdir (DIR *dirp)
vfs = vfs_op (handle); vfs = vfs_op (handle);
dirinfo = vfs_info (handle); dirinfo = vfs_info (handle);
if (vfs->readdir) { if (vfs->readdir) {
do { // do {
entry = (*vfs->readdir) (dirinfo->info); entry = (*vfs->readdir) (dirinfo->info);
if (entry == NULL) return NULL; if (entry == NULL) return NULL;
g_string_set_size(vfs_str_buffer,0); g_string_set_size(vfs_str_buffer,0);
state = str_vfs_convert_from (dirinfo->converter, state = str_vfs_convert_from (dirinfo->converter,
entry->d_name, vfs_str_buffer); entry->d_name, vfs_str_buffer);
} while (state != 0); // } while (state != 0);
memcpy (&result, entry, sizeof (struct dirent)); memcpy (&result, entry, sizeof (struct dirent));
g_strlcpy (result.d_name, vfs_str_buffer->str, NAME_MAX + 1); g_strlcpy (result.d_name, vfs_str_buffer->str, NAME_MAX + 1);
result.d_reclen = strlen (result.d_name); result.d_reclen = strlen (result.d_name);