More Amiga OS fixes
This commit is contained in:
parent
e782bfd66b
commit
b36c464ccd
@ -2299,15 +2299,21 @@ byte Button_Load_or_Save(T_Selector_settings *settings, byte load, T_IO_Context
|
||||
{
|
||||
char * current_dir;
|
||||
Display_cursor();
|
||||
#if !defined (__amigaos__)
|
||||
GFX2_Log(GFX2_WARNING, "cannot chdir to \"%s\" !\n", directory_to_change_to);
|
||||
#endif
|
||||
current_dir = Get_current_directory(NULL, NULL, 0);
|
||||
#if !defined (__amigaos__)
|
||||
GFX2_Log(GFX2_WARNING, "Current directory is \"%s\"\n", current_dir);
|
||||
#endif
|
||||
free(current_dir);
|
||||
// restore Selector_filename
|
||||
free(Selector->filename);
|
||||
Selector->filename = save_filename; // steal heap buffer
|
||||
save_filename = NULL;
|
||||
#if !defined (__amigaos__)
|
||||
Error(0);
|
||||
#endif
|
||||
}
|
||||
directory_to_change_to = NULL;
|
||||
}
|
||||
|
||||
@ -420,7 +420,7 @@ static const T_Help_table helptable_credits[] =
|
||||
HELP_TEXT ("")
|
||||
HELP_BOLD (" AMIGA OS 3 PORT")
|
||||
HELP_TEXT ("")
|
||||
HELP_TEXT (" Artur Jarosik")
|
||||
HELP_TEXT (" Artur Jarosik (Arczi)")
|
||||
HELP_TEXT ("")
|
||||
HELP_BOLD (" AMIGA OS 4 PORT")
|
||||
HELP_TEXT ("")
|
||||
|
||||
6
src/io.c
6
src/io.c
@ -1072,14 +1072,12 @@ char * Get_current_directory(char * buf, word * * unicode, size_t size)
|
||||
}
|
||||
free(cur_dir);
|
||||
return buf;
|
||||
#elif defined (__amigaos__)
|
||||
char * ret = "";
|
||||
if (unicode != NULL)
|
||||
*unicode = NULL; // no unicode support
|
||||
#else
|
||||
char * ret = getcwd(buf, size);
|
||||
#if !defined (__amigaos__)
|
||||
if (ret == NULL)
|
||||
GFX2_Log(GFX2_ERROR, "getcwd(%p, %lu) failed !\n", buf, (unsigned long)size);
|
||||
#endif
|
||||
#ifdef ENABLE_FILENAMES_ICONV
|
||||
if (ret != NULL && unicode != NULL)
|
||||
{
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user