claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://github.com/86Box/86Box into cleanup30

Browse Source 
# Conflicts:
#	src/cdrom/cdrom_image.c
#	src/cdrom/cdrom_image_backend.c
This commit is contained in:
RichardG867
2022-04-21 13:35:15 -03:00
parent fe026fa49e 7d6ad0d650
commit 2e2adc6945
190 changed files with 7184 additions and 3732 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/cdrom/cdrom_image_backend.c
View File

@@ -17,8 +17,6 @@
* Copyright 2017-2020 Fred N. van Kempen.
* Copyright 2002-2020 The DOSBox Team.
*/
#define _LARGEFILE_SOURCE
#define _LARGEFILE64_SOURCE
#define __STDC_FORMAT_MACROS
#include <ctype.h>
#include <inttypes.h>
@@ -34,10 +32,10 @@
#endif
#define HAVE_STDARG_H
#include <86box/86box.h>
#include <86box/cdrom_image_backend.h>
#include <86box/path.h>
#include <86box/plat.h>
#include <86box/cdrom_image_backend.h>
#define CDROM_BCD(x) (((x) % 10) | (((x) / 10) << 4))
#define MAX_LINE_LENGTH 512
#define MAX_FILENAME_LENGTH 256
@@ -804,7 +802,7 @@ cdi_load_cue(cd_img_t *cdi, const char *cuefile)
/* Get a copy of the filename into pathname, we need it later. */
memset(pathname, 0, MAX_FILENAME_LENGTH * sizeof(char));
plat_get_dirname(pathname, cuefile);
path_get_dirname(pathname, cuefile);
/* Open the file. */
fp = plat_fopen(cuefile, "r");
@@ -959,7 +957,7 @@ cdi_load_cue(cd_img_t *cdi, const char *cuefile)
if (!strcmp(type, "BINARY")) {
memset(temp, 0, MAX_FILENAME_LENGTH * sizeof(char));
plat_append_filename(filename, pathname, ansi);
path_append_filename(filename, pathname, ansi);
trk.file = track_file_init(filename, &error);
}
if (error) {