Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 12 additions & 5 deletions amd64/uefi/uefi.c
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,7 @@ char* strcpy(char* dest, char const* src);
size_t strlen(char const* str);
void* calloc(int count, int size);

char* _posix_path_to_uefi(char* narrow_string)
char* _relative_path_to_absolute(char* narrow_string)
{
char* absolute_path = calloc(__PATH_MAX, 1);
if(narrow_string[0] != '/' && narrow_string[0] != '\\')
Expand All @@ -500,19 +500,27 @@ char* _posix_path_to_uefi(char* narrow_string)
strcat(absolute_path, narrow_string);

unsigned length = strlen(absolute_path);
char* wide_string = calloc(length + 1, 2);
unsigned i;
for(i = 0; i < length; i += 1)
{
if(absolute_path[i] == '/')
{
wide_string[2 * i] = '\\';
absolute_path[i] = '\\';
}
else
{
wide_string[2 * i] = absolute_path[i];
absolute_path[i] = absolute_path[i];
}
}

return absolute_path;
}

char* _posix_path_to_uefi(char* narrow_string)
{
char* absolute_path = _relative_path_to_absolute(narrow_string);
unsigned length = strlen(absolute_path);
char* wide_string = _string2wide(absolute_path);
free(absolute_path);
return wide_string;
}
Expand Down Expand Up @@ -695,7 +703,6 @@ void _wipe_environment()
}

int strcmp(char const* lhs, char const* rhs);
char* strcpy(char* dest, char const* src);
char* strchr(char const* str, int ch);

void _setup_current_working_directory(char** envp)
Expand Down
8 changes: 7 additions & 1 deletion amd64/uefi/unistd.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,13 @@ int access(char* pathname, int mode)

int chdir(char* path)
{
strcpy(_cwd, path);
char* absolute_path = _relative_path_to_absolute(path);
strncpy(_cwd, absolute_path, __PATH_MAX);
if(_cwd[strlen(_cwd) - 1] != '\\')
{
strncat(_cwd, "/", __PATH_MAX);
}
free(absolute_path);
return 0;
}

Expand Down