3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

avrdude: Add a Windows-aware fopen

Browse source
This commit is contained in:
Vojtech Kral 2019-02-25 18:07:10 +01:00
parent a2ce4c00de
commit fba4d109c8
3 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/avrdude/config.c
View file

@ -325,7 +325,7 @@ int read_config(const char * file)
FILE * f; FILE * f;
int r; int r;
f = fopen(file, "r"); f = fopen_utf8(file, "r");
if (f == NULL) { if (f == NULL) {
avrdude_message(MSG_INFO, "%s: can't open config file \"%s\": %s\n", avrdude_message(MSG_INFO, "%s: can't open config file \"%s\": %s\n",
progname, file, strerror(errno)); progname, file, strerror(errno));

12
src/avrdude/fileio.c
View file

@ -102,9 +102,8 @@ static int fmt_autodetect(char * fname, unsigned section);
static FILE *fopen_and_seek(const char *filename, const char *mode, unsigned section) FILE *fopen_utf8(const char *filename, const char *mode)
{ {
FILE *file;
// On Windows we need to convert the filename to UTF-16 // On Windows we need to convert the filename to UTF-16
#if defined(WIN32NATIVE) #if defined(WIN32NATIVE)
static wchar_t fname_buffer[PATH_MAX]; static wchar_t fname_buffer[PATH_MAX];
@ -113,10 +112,15 @@ static FILE *fopen_and_seek(const char *filename, const char *mode, unsigned sec
if (MultiByteToWideChar(CP_UTF8, 0, filename, -1, fname_buffer, PATH_MAX) == 0) { return NULL; } if (MultiByteToWideChar(CP_UTF8, 0, filename, -1, fname_buffer, PATH_MAX) == 0) { return NULL; }
if (MultiByteToWideChar(CP_ACP, 0, mode, -1, mode_buffer, MAX_MODE_LEN) == 0) { return NULL; } if (MultiByteToWideChar(CP_ACP, 0, mode, -1, mode_buffer, MAX_MODE_LEN) == 0) { return NULL; }
file = _wfopen(fname_buffer, mode_buffer); return _wfopen(fname_buffer, mode_buffer);
#else #else
file = fopen(filename, mode); return fopen(filename, mode);
#endif #endif
}
static FILE *fopen_and_seek(const char *filename, const char *mode, unsigned section)
{
FILE *file = fopen_utf8(filename, mode);
if (file == NULL) { if (file == NULL) {
return NULL; return NULL;

2
src/avrdude/libavrdude.h
View file

@ -820,6 +820,8 @@ extern "C" {
char * fmtstr(FILEFMT format); char * fmtstr(FILEFMT format);
FILE *fopen_utf8(const char *filename, const char *mode);
int fileio(int op, char * filename, FILEFMT format, int fileio(int op, char * filename, FILEFMT format,
struct avrpart * p, char * memtype, int size, unsigned section); struct avrpart * p, char * memtype, int size, unsigned section);