m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More Amiga OS fixes

Browse Source
This commit is contained in:
PulkoMandy 2022-10-24 20:52:09 +02:00
parent e782bfd66b
commit b36c464ccd
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/filesel.c
View File

@ -2299,15 +2299,21 @@ byte Button_Load_or_Save(T_Selector_settings *settings, byte load, T_IO_Context
{ {
char * current_dir; char * current_dir;
Display_cursor(); Display_cursor();
#if !defined (__amigaos__)
GFX2_Log(GFX2_WARNING, "cannot chdir to \"%s\" !\n", directory_to_change_to); GFX2_Log(GFX2_WARNING, "cannot chdir to \"%s\" !\n", directory_to_change_to);
#endif
current_dir = Get_current_directory(NULL, NULL, 0); current_dir = Get_current_directory(NULL, NULL, 0);
#if !defined (__amigaos__)
GFX2_Log(GFX2_WARNING, "Current directory is \"%s\"\n", current_dir); GFX2_Log(GFX2_WARNING, "Current directory is \"%s\"\n", current_dir);
#endif
free(current_dir); free(current_dir);
// restore Selector_filename // restore Selector_filename
free(Selector->filename); free(Selector->filename);
Selector->filename = save_filename; // steal heap buffer Selector->filename = save_filename; // steal heap buffer
save_filename = NULL; save_filename = NULL;
#if !defined (__amigaos__)
Error(0); Error(0);
#endif
} }
directory_to_change_to = NULL; directory_to_change_to = NULL;
} }

2
src/helpfile.h
View File

@ -420,7 +420,7 @@ static const T_Help_table helptable_credits[] =
HELP_TEXT ("") HELP_TEXT ("")
HELP_BOLD (" AMIGA OS 3 PORT") HELP_BOLD (" AMIGA OS 3 PORT")
HELP_TEXT ("") HELP_TEXT ("")
HELP_TEXT (" Artur Jarosik") HELP_TEXT (" Artur Jarosik (Arczi)")
HELP_TEXT ("") HELP_TEXT ("")
HELP_BOLD (" AMIGA OS 4 PORT") HELP_BOLD (" AMIGA OS 4 PORT")
HELP_TEXT ("") HELP_TEXT ("")

6
src/io.c
View File

@ -1072,14 +1072,12 @@ char * Get_current_directory(char * buf, word * * unicode, size_t size)
} }
free(cur_dir); free(cur_dir);
return buf; return buf;
#elif defined (__amigaos__)
char * ret = "";
if (unicode != NULL)
*unicode = NULL; // no unicode support
#else #else
char * ret = getcwd(buf, size); char * ret = getcwd(buf, size);
#if !defined (__amigaos__)
if (ret == NULL) if (ret == NULL)
GFX2_Log(GFX2_ERROR, "getcwd(%p, %lu) failed !\n", buf, (unsigned long)size); GFX2_Log(GFX2_ERROR, "getcwd(%p, %lu) failed !\n", buf, (unsigned long)size);
#endif
#ifdef ENABLE_FILENAMES_ICONV #ifdef ENABLE_FILENAMES_ICONV
if (ret != NULL && unicode != NULL) if (ret != NULL && unicode != NULL)
{ {