Skip to content

Let Windows look in the executable path when opening files if they can't be found in the current directory. #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
richtw1 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Let Windows look in the executable path when opening files if they can't be found in the current directory. #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1b666e5
Changes for Windows, so opening files falls back on the executable pa…
richtw1 Jun 17, 2022
48af189
Revert "Changes for Windows, so opening files falls back on the execu…
richtw1 Jun 17, 2022
262861a
Windows builds now also look in the executable path when opening file…
richtw1 Jun 17, 2022
30cfd96
Updated Windows debug build script
richtw1 Jun 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build_win_dbg.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

# NOTE: -gdwarf-2 needed for my version of wine to recognize the symbols.

x86_64-w64-mingw32-gcc -D__USE_MINGW_ANSI_STDIO=0 \
-Wall -W -Werror \
x86_64-w64-mingw32-gcc -D__USE_MINGW_ANSI_STDIO=0 -DPLATFORM_WINDOWS \
-Wall -W -Werror -Wl,--default-image-base-low \
-Wno-unknown-warning-option -Wno-address-of-packed-member \
-g -gdwarf-2 -o beebjit.exe \
main.c config.c bbc.c defs_6502.c state.c video.c via.c \
Expand Down
4 changes: 2 additions & 2 deletions build_win_opt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

# NOTE: -gdwarf-2 needed for my version of wine to recognize the symbols.

x86_64-w64-mingw32-gcc -D__USE_MINGW_ANSI_STDIO=0 \
-Wall -W -Werror \
x86_64-w64-mingw32-gcc -D__USE_MINGW_ANSI_STDIO=0 -DPLATFORM_WINDOWS \
-Wall -W -Werror -Wl,--default-image-base-low \
-Wno-unknown-warning-option -Wno-address-of-packed-member \
-O3 -DNDEBUG -flto -o beebjit.exe \
main.c config.c bbc.c defs_6502.c state.c video.c via.c \
Expand Down
29 changes: 28 additions & 1 deletion util.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#ifdef PLATFORM_WINDOWS
#include "windows.h"
#endif

void*
util_malloc(size_t size) {
Expand Down Expand Up @@ -279,9 +282,12 @@ util_file_name_split(char** p_file_name_base,
const char* p_sep = NULL;
const char* p_str = p_full_file_name;

/* TODO: respect Windows separator? */
while (*p_str != '\0') {
#ifdef PLATFORM_WINDOWS
if (*p_str == '/' || *p_str == '\\') {
#else
if (*p_str == '/') {
#endif
p_sep = p_str;
}
p_str++;
Expand Down Expand Up @@ -309,7 +315,11 @@ util_file_name_join(const char* p_file_name_base, const char* p_file_name) {
/* TODO: respect Windows separator? */
(void) snprintf(file_name_buf,
sizeof(file_name_buf),
#ifdef PLATFORM_WINDOWS
"%s\\%s",
#else
"%s/%s",
#endif
p_file_name_base,
p_file_name);
return strdup(&file_name_buf[0]);
Expand All @@ -319,6 +329,23 @@ struct util_file*
util_file_open(const char* p_file_name, int writeable, int create) {
struct util_file* p_file = util_file_try_open(p_file_name, writeable, create);
if (p_file == NULL) {
#ifdef PLATFORM_WINDOWS
char executable_path_buf[4096];
char* executable_dir;
char* executable_file_name;
char* joined_file_name;
GetModuleFileNameA(NULL, executable_path_buf, 4096);
util_file_name_split(&executable_dir, &executable_file_name, executable_path_buf);
joined_file_name = util_file_name_join(executable_dir, p_file_name);

p_file = util_file_try_open(joined_file_name, writeable, create);

util_free(joined_file_name);
util_free(executable_file_name);
util_free(executable_dir);
}
if (p_file == NULL) {
#endif
util_bail("couldn't open %s", p_file_name);
}
return p_file;
Expand Down