Skip to content

Provide Windows replacement implementation for realpath(3) #93

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

Merged
hattne merged 2 commits into from
Jul 5, 2025
Merged

Provide Windows replacement implementation for realpath(3) #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
276ae6e
Provide actual replacement implementation for realpath(3)
hattne Jul 1, 2025
85cb9f9
Fix fgetln(3) for consistency
hattne Jul 1, 2025
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: 14 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,14 +337,20 @@ if (NOT CMAKE_BUILD_TYPE)
endif (NOT CMAKE_BUILD_TYPE)


# Check for missing functions: fgetln(3) is in 4.4BSD; regcomp(3) is
# in POSIX.1-2001, POSIX.1-2008.
# Check for missing functions: fgetln(3) is in 4.4BSD; realpath(3) is
# in 4.4BSD, POSIX.1-2001; regcomp(3) is in POSIX.1-2001,
# POSIX.1-2008.
include(CheckSymbolExists)
check_symbol_exists(fgetln "stdio.h" HAVE_FGETLN)
if(HAVE_FGETLN)
add_compile_definitions("HAVE_FGETLN")
endif()

check_symbol_exists(realpath "stdlib.h" HAVE_REALPATH)
if(HAVE_REALPATH)
add_compile_definitions("HAVE_REALPATH")
endif()

check_symbol_exists(regcomp "regex.h" HAVE_REGEX)
if(HAVE_REGEX)
add_compile_definitions("HAVE_REGEX")
Expand Down Expand Up @@ -819,6 +825,10 @@ if(CBF_ENABLE_ULP)
target_sources(cbf
PRIVATE "${CBF__SRC}/cbf_ulp.c")
endif()
if(NOT HAVE_REALPATH)
target_sources(cbf
PRIVATE "${CBF__SRC}/realpath.c")
endif()

set_target_properties(cbf PROPERTIES OUTPUT_NAME "cbf")
set_target_properties(cbf PROPERTIES LINKER_LANGUAGE C)
Expand Down Expand Up @@ -1100,7 +1110,8 @@ target_link_libraries(cbf_standardize_numbers
cbf
"${libm}")
if(NOT HAVE_FGETLN)
target_sources(cbf_standardize_numbers PRIVATE "${CBF__SRC}/fgetln.c")
target_sources(cbf_standardize_numbers
PRIVATE "${CBF__SRC}/fgetln.c")
endif()

add_executable(cbf_tail
Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -736,9 +736,9 @@ endif
CC = gcc
C++ = g++
ifneq ($(CBFDEBUG),)
CFLAGS = -g -O0 -Wall -D_USE_XOPEN_EXTENDED -fno-strict-aliasing -DCBFDEBUG=1 $(HDF5CFLAGS)
CFLAGS = -g -O0 -Wall -DHAVE_REALPATH -D_USE_XOPEN_EXTENDED -fno-strict-aliasing -DCBFDEBUG=1 $(HDF5CFLAGS)
else
CFLAGS = -g -O3 -Wall -D_USE_XOPEN_EXTENDED -fno-strict-aliasing $(HDF5CFLAGS)
CFLAGS = -g -O3 -Wall -DHAVE_REALPATH -D_USE_XOPEN_EXTENDED -fno-strict-aliasing $(HDF5CFLAGS)
endif
LDFLAGS =
F90C = gfortran
Expand Down
2 changes: 1 addition & 1 deletion Makefile_LINUX
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -735,7 +735,7 @@ endif
#########################################################
CC = gcc
C++ = g++
CFLAGS = -g -O2 -Wall -D_USE_XOPEN_EXTENDED -fno-strict-aliasing $(HDF5CFLAGS)
CFLAGS = -g -O2 -Wall -DHAVE_REALPATH -D_USE_XOPEN_EXTENDED -fno-strict-aliasing $(HDF5CFLAGS)
LDFLAGS =
F90C = gfortran
#F90FLAGS = -g -fno-range-check -fallow-invalid-boz
Expand Down
2 changes: 1 addition & 1 deletion Makefile_OSX
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -736,7 +736,7 @@ endif
#########################################################
CC = gcc
C++ = g++
CFLAGS = -g -O2 -Wall -std=c99 -pedantic $(HDF5CFLAGS)
CFLAGS = -g -O2 -Wall -std=c99 -pedantic -DHAVE_REALPATH $(HDF5CFLAGS)
LDFLAGS =
F90C = gfortran
#F90FLAGS = -g -fno-range-check -fallow-invalid-boz
Expand Down
6 changes: 5 additions & 1 deletion examples/cbf_standardize_numbers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,11 @@
#include <string.h>


char * fgetln(FILE *, size_t *);
#ifndef HAVE_FGETLN
# define fgetln _cbf_fgetln
char *
_cbf_fgetln(FILE *stream, size_t *len);
#endif

void usage ( void ) {

Expand Down
20 changes: 10 additions & 10 deletions m4/Makefile.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -743,7 +743,7 @@ endif
#########################################################
CC = gcc
C++ = g++
CFLAGS = -g -O2 -Wall -std=c99 -pedantic $(HDF5CFLAGS)
CFLAGS = -g -O2 -Wall -std=c99 -pedantic -DHAVE_REALPATH $(HDF5CFLAGS)
LDFLAGS =
F90C = gfortran
#F90FLAGS = -g -fno-range-check -fallow-invalid-boz
Expand All @@ -769,7 +769,7 @@ cbf_system,`OSX_gcc42',`
#########################################################
CC = gcc
C++ = g++
CFLAGS = -g -O2 -Wall -std=c99 -pedantic $(HDF5CFLAGS)
CFLAGS = -g -O2 -Wall -std=c99 -pedantic -DHAVE_REALPATH $(HDF5CFLAGS)
LDFLAGS =
F90C = gfortran
#F90FLAGS = -g -fno-range-check -fallow-invalid-boz
Expand All @@ -795,7 +795,7 @@ cbf_system,`OSX_gcc42_DMALLOC',`
#########################################################
CC = gcc
C++ = g++
CFLAGS = -g -O2 -Wall -std=c99 -pedantic -DDMALLOC -DDMALLOC_FUNC_CHECK -I$(HOME)/include $(HDF5CFLAGS)
CFLAGS = -g -O2 -Wall -std=c99 -pedantic -DDMALLOC -DDMALLOC_FUNC_CHECK -DHAVE_REALPATH -I$(HOME)/include $(HDF5CFLAGS)
LDFLAGS =
F90C = gfortran
#F90FLAGS = -g -fno-range-check -fallow-invalid-boz
Expand All @@ -822,7 +822,7 @@ cbf_system,`LINUX_64',`
#########################################################
CC = gcc -m64
C++ = g++ -m64
CFLAGS = -g -O2 -Wall -D_USE_XOPEN_EXTENDED -fno-strict-aliasing $(HDF5CFLAGS)
CFLAGS = -g -O2 -Wall -DHAVE_REALPATH -D_USE_XOPEN_EXTENDED -fno-strict-aliasing $(HDF5CFLAGS)
LDFLAGS =
F90C = gfortran -m64
#F90FLAGS = -g -fno-range-check -fallow-invalid-boz
Expand Down Expand Up @@ -850,7 +850,7 @@ cbf_system,`LINUX_gcc42',`
#########################################################
CC = gcc
C++ = g++
CFLAGS = -g -O2 -Wall -D_USE_XOPEN_EXTENDED -fno-strict-aliasing $(HDF5CFLAGS)
CFLAGS = -g -O2 -Wall -DHAVE_REALPATH -D_USE_XOPEN_EXTENDED -fno-strict-aliasing $(HDF5CFLAGS)
LDFLAGS =
F90C = gfortran
#F90FLAGS = -g -fno-range-check -fallow-invalid-boz
Expand All @@ -877,7 +877,7 @@ cbf_system,`LINUX',`
#########################################################
CC = gcc
C++ = g++
CFLAGS = -g -O2 -Wall -D_USE_XOPEN_EXTENDED -fno-strict-aliasing $(HDF5CFLAGS)
CFLAGS = -g -O2 -Wall -DHAVE_REALPATH -D_USE_XOPEN_EXTENDED -fno-strict-aliasing $(HDF5CFLAGS)
LDFLAGS =
F90C = gfortran
#F90FLAGS = -g -fno-range-check -fallow-invalid-boz
Expand Down Expand Up @@ -905,7 +905,7 @@ cbf_system,`LINUX_gcc42_DMALLOC', `
#########################################################
CC = gcc
C++ = g++
CFLAGS = -g -O2 -Wall -D_USE_XOPEN_EXTENDED -fno-strict-aliasing \
CFLAGS = -g -O2 -Wall -DHAVE_REALPATH -D_USE_XOPEN_EXTENDED -fno-strict-aliasing \
-DDMALLOC -DDMALLOC_FUNC_CHECK $(HDF5CFLAGS) -I$(HOME)/include
LDFLAGS =
F90C = gfortran
Expand All @@ -932,7 +932,7 @@ cbf_system,`LINUX_DMALLOC',`
#########################################################
CC = gcc
C++ = g++
CFLAGS = -g -O2 -Wall -D_USE_XOPEN_EXTENDED -fno-strict-aliasing \
CFLAGS = -g -O2 -Wall -DHAVE_REALPATH -D_USE_XOPEN_EXTENDED -fno-strict-aliasing \
-DDMALLOC -DDMALLOC_FUNC_CHECK $(HDF5CFLAGS) -I$(HOME)/include
LDFLAGS =
F90C = gfortran
Expand Down Expand Up @@ -1105,9 +1105,9 @@ RANLIB = ',
CC = gcc
C++ = g++
ifneq ($(CBFDEBUG),)
CFLAGS = -g -O0 -Wall -D_USE_XOPEN_EXTENDED -fno-strict-aliasing -DCBFDEBUG=1 $(HDF5CFLAGS)
CFLAGS = -g -O0 -Wall -DHAVE_REALPATH -D_USE_XOPEN_EXTENDED -fno-strict-aliasing -DCBFDEBUG=1 $(HDF5CFLAGS)
else
CFLAGS = -g -O3 -Wall -D_USE_XOPEN_EXTENDED -fno-strict-aliasing $(HDF5CFLAGS)
CFLAGS = -g -O3 -Wall -DHAVE_REALPATH -D_USE_XOPEN_EXTENDED -fno-strict-aliasing $(HDF5CFLAGS)
endif
LDFLAGS =
F90C = gfortran
Expand Down
6 changes: 6 additions & 0 deletions src/cbf_hdf5.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,12 @@ extern "C" {
#include <assert.h>
#include <errno.h>

#ifndef HAVE_REALPATH
#define realpath _cbf_realpath
char *
_cbf_realpath(const char *path, char *resolved_path);
#endif

static int cbf_find_array_data_h5type
(hid_t * const type,
unsigned int bits,
Expand Down
4 changes: 1 addition & 3 deletions src/fgetln.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,8 @@
#include <stdlib.h>
#include <string.h>

#ifndef HAVE_fgetln
char *
fgetln(FILE *stream, size_t *len)
_cbf_fgetln(FILE *stream, size_t *len)
{
static char *buf = NULL;
static size_t buflen = 0;
Expand Down Expand Up @@ -63,4 +62,3 @@ fgetln(FILE *stream, size_t *len)
*len = strlen(buf);
return buf;
}
#endif /* !defined(HAVE_fgetln) */
21 changes: 17 additions & 4 deletions src/realpath.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,19 @@
#include <stdlib.h>
char *realpath(const char *path, char *resolved_path)
#ifdef _WIN32
# include <windows.h>
#endif

char *
_cbf_realpath(const char *path, char *resolved_path)
{
return 0;
}
#ifdef _WIN32
if (path == NULL) {
errno = EINVAL;
return (NULL);
}

return (_fullpath(resolved_path, path, MAX_PATH));
#else
errno = ENOSYS;
return (NULL);
#endif
}