From 66dd7f05d7dc973f8ce55d24ebcc88447242d4e5 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 9 Aug 2019 13:01:05 -0700 Subject: [PATCH] Switch to utimensat for newer POSIX versions Some libcs like uClibc-ng can optionally disable deprecated functions. utime is one of them. When done so, both the header and the function go missing. This fixes flac_utime to work in such a situation. --- include/share/compat.h | 10 +++++++++- src/libFLAC/metadata_iterators.c | 9 +++++++-- src/share/grabbag/file.c | 9 +++++++-- src/test_libFLAC++/metadata_manip.cpp | 11 +++++++---- src/test_libFLAC/metadata_manip.c | 10 +++++++--- 5 files changed, 37 insertions(+), 12 deletions(-) diff --git a/include/share/compat.h b/include/share/compat.h index f3041655..c28054be 100644 --- a/include/share/compat.h +++ b/include/share/compat.h @@ -112,9 +112,13 @@ #include /* for utime() */ #endif #else +#if defined(_POSIX_C_SOURCE) && (_POSIX_C_SOURCE >= 200809L) +#include +#else #include /* some flavors of BSD (like OS X) require this to get time_t */ #include /* for utime() */ #endif +#endif #if defined _MSC_VER # if _MSC_VER >= 1800 @@ -160,11 +164,15 @@ #define flac_fopen fopen #define flac_chmod chmod -#define flac_utime utime #define flac_unlink unlink #define flac_rename rename #define flac_stat stat +#if defined(_POSIX_C_SOURCE) && (_POSIX_C_SOURCE >= 200809L) +#define flac_utime(a, b) utimensat (AT_FDCWD, a, *b, 0) +#else +#define flac_utime utime +#endif #endif #ifdef _WIN32 diff --git a/src/libFLAC/metadata_iterators.c b/src/libFLAC/metadata_iterators.c index 352a6c7a..fca2c15e 100644 --- a/src/libFLAC/metadata_iterators.c +++ b/src/libFLAC/metadata_iterators.c @@ -3422,13 +3422,18 @@ FLAC__bool get_file_stats_(const char *filename, struct flac_stat_s *stats) void set_file_stats_(const char *filename, struct flac_stat_s *stats) { - struct utimbuf srctime; - FLAC__ASSERT(0 != filename); FLAC__ASSERT(0 != stats); +#if defined(_POSIX_C_SOURCE) && (_POSIX_C_SOURCE >= 200809L) + struct timespec srctime[2] = {}; + srctime[0].tv_sec = stats->st_atime; + srctime[1].tv_sec = stats->st_mtime; +#else + struct utimbuf srctime; srctime.actime = stats->st_atime; srctime.modtime = stats->st_mtime; +#endif (void)flac_chmod(filename, stats->st_mode); (void)flac_utime(filename, &srctime); #if !defined _MSC_VER && !defined __BORLANDC__ && !defined __MINGW32__ diff --git a/src/share/grabbag/file.c b/src/share/grabbag/file.c index 2c67bebf..5f3bc4ef 100644 --- a/src/share/grabbag/file.c +++ b/src/share/grabbag/file.c @@ -27,7 +27,6 @@ #include /* for _O_BINARY */ #else #include /* some flavors of BSD (like OS X) require this to get time_t */ -#include /* for utime() */ #endif #if defined __EMX__ #include /* for setmode(), O_BINARY */ @@ -53,11 +52,17 @@ void grabbag__file_copy_metadata(const char *srcpath, const char *destpath) { struct flac_stat_s srcstat; - struct utimbuf srctime; if(0 == flac_stat(srcpath, &srcstat)) { +#if defined(_POSIX_C_SOURCE) && (_POSIX_C_SOURCE >= 200809L) + struct timespec srctime[2] = {}; + srctime[0].tv_sec = srcstat.st_atime; + srctime[1].tv_sec = srcstat.st_mtime; +#else + struct utimbuf srctime; srctime.actime = srcstat.st_atime; srctime.modtime = srcstat.st_mtime; +#endif (void)flac_chmod(destpath, srcstat.st_mode); (void)flac_utime(destpath, &srctime); } diff --git a/src/test_libFLAC++/metadata_manip.cpp b/src/test_libFLAC++/metadata_manip.cpp index 93b6e517..ab98aa10 100644 --- a/src/test_libFLAC++/metadata_manip.cpp +++ b/src/test_libFLAC++/metadata_manip.cpp @@ -27,8 +27,6 @@ #include /* some flavors of BSD (like OS X) require this to get time_t */ #ifdef _MSC_VER #include -#else -#include /* for utime() */ #endif #if !defined _MSC_VER && !defined __MINGW32__ && !defined __EMX__ #include /* for chown(), unlink() */ @@ -271,13 +269,18 @@ bool get_file_stats_(const char *filename, struct flac_stat_s *stats) void set_file_stats_(const char *filename, struct flac_stat_s *stats) { - struct utimbuf srctime; - FLAC__ASSERT(0 != filename); FLAC__ASSERT(0 != stats); +#if defined(_POSIX_C_SOURCE) && (_POSIX_C_SOURCE >= 200809L) + struct timespec srctime[2] = {}; + srctime[0].tv_sec = stats->st_atime; + srctime[1].tv_sec = stats->st_mtime; +#else + struct utimbuf srctime; srctime.actime = stats->st_atime; srctime.modtime = stats->st_mtime; +#endif (void)flac_chmod(filename, stats->st_mode); (void)flac_utime(filename, &srctime); #if !defined _MSC_VER && !defined __MINGW32__ && !defined __EMX__ diff --git a/src/test_libFLAC/metadata_manip.c b/src/test_libFLAC/metadata_manip.c index b4bf065e..da10d855 100644 --- a/src/test_libFLAC/metadata_manip.c +++ b/src/test_libFLAC/metadata_manip.c @@ -29,7 +29,6 @@ #include /* for chmod() */ #else #include /* some flavors of BSD (like OS X) require this to get time_t */ -#include /* for utime() */ #include /* for chown(), unlink() */ #endif #include /* for stat(), maybe chmod() */ @@ -256,13 +255,18 @@ static FLAC__bool get_file_stats_(const char *filename, struct flac_stat_s *stat static void set_file_stats_(const char *filename, struct flac_stat_s *stats) { - struct utimbuf srctime; - FLAC__ASSERT(0 != filename); FLAC__ASSERT(0 != stats); +#if defined(_POSIX_C_SOURCE) && (_POSIX_C_SOURCE >= 200809L) + struct timespec srctime[2] = {}; + srctime[0].tv_sec = stats->st_atime; + srctime[1].tv_sec = stats->st_mtime; +#else + struct utimbuf srctime; srctime.actime = stats->st_atime; srctime.modtime = stats->st_mtime; +#endif (void)flac_chmod(filename, stats->st_mode); (void)flac_utime(filename, &srctime); #if !defined _MSC_VER && !defined __MINGW32__ -- 2.11.4.GIT