TREX/trexio
1
0
Fork 0
mirror of https://github.com/TREX-CoE/trexio.git synced 2024-12-22 20:35:44 +01:00
Code Issues Projects Releases Wiki Activity

configure tries cp -r -n

Browse Source
This commit is contained in:
Anthony Scemama 2023-01-05 10:25:27 +01:00
parent 52a00468c0
commit 69aa17862c
2 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
configure.ac
View File

@ -98,6 +98,31 @@ case $CC in
;; ;;
esac esac
# Check if `cp -r -n` works, otherwise use `cp -r`
AC_CHECK_PROGS(CP_PROG, [cp])
AC_MSG_CHECKING([for cp -r -n option])
AC_RUN_IFELSE(
[AC_LANG_PROGRAM([
#include <unistd.h>
],[
execl("/bin/sh", "sh", "-c", "mkdir tmpdir1 && \
touch tmpdir1/test_file && \
$CP_PROG -r -n tmpdir1 tmpdir2 && \
exec ls tmpdir2/test_file", NULL);
])],
[ rm -rf tmpdir1 tmpdir2
CP_COMMAND="\"$CP_PROG\", \"-r\", \"-n\""
AC_MSG_RESULT([yes])],
[ rm -rf tmpdir1 tmpdir2
CP_COMMAND="\"$CP_PROG\", \"-r\""
AC_MSG_RESULT([no])],
[ rm -rf tmpdir1 tmpdir2
CP_COMMAND="\"$CP_PROG\", \"-r\""
AC_MSG_RESULT([no])]
)
AC_DEFINE_UNQUOTED([CP_COMMAND], [$CP_COMMAND], [Command used for trexio_cp])
## --------- ## ---------
## Libraries ## Libraries
@ -175,6 +200,9 @@ AC_TYPE_INT64_T
AC_TYPE_SIZE_T AC_TYPE_SIZE_T
AC_TYPE_UINT32_T AC_TYPE_UINT32_T
AC_TYPE_UINT64_T AC_TYPE_UINT64_T
AC_TYPE_PID_T
AC_C_CONST
AC_C_INLINE
# Checks for library functions. # Checks for library functions.
# AC_FUNC_MALLOC # AC_FUNC_MALLOC

8
src/templates_front/templator_front.org
View File

@ -1590,7 +1590,7 @@ def _inquire(file_name: str) -> bool:
** File copy ** File copy
~trexio_cp~ copies a TREXIO file using =/bin/cp=. ~trexio_cp~ copies a TREXIO file using =cp=.
**Input parameters:** **Input parameters:**
1) ~source_file_name~ - string containing the name of the source file 1) ~source_file_name~ - string containing the name of the source file
@ -1654,16 +1654,16 @@ trexio_cp(const char* source, const char* dest)
if (pid == 0) { if (pid == 0) {
switch (back_end_local) { switch (back_end_local) {
case TREXIO_TEXT: case TREXIO_TEXT:
execl("/bin/cp", "/bin/cp", "-r", "-n", source, dest, (char *)0); execlp("cp", CP_COMMAND, source, dest, (char *)0);
case TREXIO_HDF5: case TREXIO_HDF5:
#ifdef HAVE_HDF5 #ifdef HAVE_HDF5
execl("/bin/cp", "/bin/cp", "-n", source, dest, (char *)0); execlp("cp", CP_COMMAND, source, dest, (char *)0);
#else #else
return TREXIO_FILE_ERROR; return TREXIO_FILE_ERROR;
#endif #endif
/* /*
case TREXIO_JSON: case TREXIO_JSON:
execl("/bin/cp", "/bin/cp", source, dest, (char *)0); execlp("cp", CP_COMMAND, source, dest, (char *)0);
,*/ ,*/
default: default:
return TREXIO_FILE_ERROR; return TREXIO_FILE_ERROR;