mirrors/rufus
1
0
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2025-05-17 16:44:27 -04:00
Code Issues Projects Releases Packages Wiki Activity

[loc] set log messages to use English locale

Browse source 
* This is done to ensure I can understand logs that are sent to me,
  even when a non English locale is used.
* Closes #188.
This commit is contained in:
Pete Batard 2013-12-19 23:56:40 +00:00
parent f3cf32f8d8
commit 18c9df18b5
14 changed files with 225 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

54
src/parser.c
View file

@ -353,31 +353,60 @@ out:
* Parse a locale section in a localization file (UTF-8, no BOM)
* NB: this call is reentrant for the "base" command support
*/
char* get_loc_data_file(const char* filename, long offset, long end_offset, int start_line)
BOOL get_loc_data_file(const char* filename, loc_cmd* lcmd)
{
size_t bufsize = 1024;
static FILE* fd = NULL;
char *ret = NULL, *buf = NULL;
char *buf = NULL;
size_t i = 0;
int r = 0, line_nr_incr = 1;
int c = 0, eol_char = 0;
int old_loc_line_nr;
BOOL eol = FALSE, escape_sequence = FALSE, reentrant = (fd != NULL);
long cur_offset = -1;
int start_line, old_loc_line_nr;
BOOL ret = FALSE, eol = FALSE, escape_sequence = FALSE, reentrant = (fd != NULL);
long offset, cur_offset = -1, end_offset;
// The default locale is always the first one
loc_cmd* default_locale = list_entry(locale_list.next, loc_cmd, list);
if (reentrant) {
// Called, from a 'b' command - no need to reopen the file,
// just save the current offset and current line number
cur_offset = ftell(fd);
old_loc_line_nr = loc_line_nr;
} else {
// We keep a default message table populated with the en-US messages.
// Ensure that it got properly initialized first.
if ((msg_table == NULL) && (lcmd != NULL)) {
uprintf("localization: default message table has not been populated!");
return FALSE;
} else if ((msg_table != NULL) && (lcmd == NULL)) {
uprintf("localization: default message table has already been populated!");
return FALSE;
}
if (!reentrant) {
if ((filename == NULL) || (filename[0] == 0))
return NULL;
return FALSE;
if (lcmd == default_locale) {
// The default locale has already been populated => nothing to do
msg_table = default_msg_table;
return TRUE;
}
if (lcmd == NULL) {
// Fill the default table
lcmd = default_locale;
msg_table = default_msg_table;
} else {
// Fill the current table
msg_table = current_msg_table;
}
free_dialog_list();
fd = open_loc_file(filename);
if (fd == NULL)
goto out;
} else {
// Called, from a 'b' command - no need to reopen the file,
// just save the current offset and current line number
cur_offset = ftell(fd);
old_loc_line_nr = loc_line_nr;
}
offset = (long)lcmd->num[0];
end_offset = (long)lcmd->num[1];
start_line = lcmd->line_nr;
loc_line_nr = start_line;
buf = (char*) malloc(bufsize);
if (buf == NULL) {
@ -489,6 +518,7 @@ char* get_loc_data_file(const char* filename, long offset, long end_offset, int
}
}
} while(1);
ret = TRUE;
out:
// Don't close on a reentrant call