From 3ae3a161fc41660fc80e9e8251b337ffd0a41509 Mon Sep 17 00:00:00 2001 From: Ben Turley Date: Wed, 3 Jul 2024 10:53:50 -0600 Subject: [PATCH] Fix compile error and host string parsing on macOS --- libs/libsacd/sacd_input.c | 6 +++++- tools/sacd_extract/main.c | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libs/libsacd/sacd_input.c b/libs/libsacd/sacd_input.c index c8f8d4d1..6ba817ae 100644 --- a/libs/libsacd/sacd_input.c +++ b/libs/libsacd/sacd_input.c @@ -331,6 +331,10 @@ static sacd_input_t sacd_net_input_open(const char *target) pb_istream_t input; pb_ostream_t output; uint8_t zero = 0; + char host[256]; + + strncpy(host, target, strchr(target, ':') - target); + host[strchr(target, ':') - target] = '\0'; /* Allocate the library structure */ dev = (sacd_input_t) calloc(sizeof(*dev), 1); @@ -354,7 +358,7 @@ static sacd_input_t sacd_net_input_open(const char *target) timeout_markstart(&tm); err = inet_tryconnect(&dev->fd, - substr(target, 0, strchr(target, ':') - target), + host, atoi(strchr(target, ':') + 1), &tm); if (err) { diff --git a/tools/sacd_extract/main.c b/tools/sacd_extract/main.c index f3d6ef44..09c3ff00 100644 --- a/tools/sacd_extract/main.c +++ b/tools/sacd_extract/main.c @@ -90,7 +90,7 @@ static struct opts_s scarletbook_handle_t *handle; scarletbook_output_t *output; -void mkdir_wrap(char *name, char *mode){ +void mkdir_wrap(char *name, int mode){ #ifdef __MINGW32__ wchar_t *wname; wname = (wchar_t *) charset_convert(name, strlen(name), "UTF-8", "UCS-2-INTERNAL");