diff --git a/src/test_libFLAC++/Makefile.lite b/src/test_libFLAC++/Makefile.lite index 36ce25de..a5206bbf 100644 --- a/src/test_libFLAC++/Makefile.lite +++ b/src/test_libFLAC++/Makefile.lite @@ -23,7 +23,7 @@ topdir = ../.. PROGRAM_NAME = test_libFLAC++ INCLUDES = -I$(topdir)/include -LIBS = -lFLAC++ -lFLAC -lm +LIBS = -lFLAC++ -lFLAC -lfile_utils -lm OBJS = \ decoders.o \ encoders.o \ diff --git a/src/test_libFLAC++/Makefile.vc b/src/test_libFLAC++/Makefile.vc index 5881f538..4a859b40 100644 --- a/src/test_libFLAC++/Makefile.vc +++ b/src/test_libFLAC++/Makefile.vc @@ -52,7 +52,7 @@ CPP_OBJS= $(CPP_FILES:.cpp=.obj) all: test_libFLAC++.exe test_libFLAC++.exe: $(C_OBJS) $(CPP_OBJS) - link.exe /libpath:"..\..\obj\lib" -out:../../obj/bin/$*.exe $(CPP_OBJS) $(C_OBJS) libFLAC++.lib libFLAC.lib + link.exe /libpath:"..\..\obj\lib" -out:../../obj/bin/$*.exe $(CPP_OBJS) $(C_OBJS) libFLAC++.lib libFLAC.lib file_utils.lib clean: -del *.obj *.pch diff --git a/src/test_libFLAC++/decoders.cpp b/src/test_libFLAC++/decoders.cpp index c19cc25f..8e86ae11 100644 --- a/src/test_libFLAC++/decoders.cpp +++ b/src/test_libFLAC++/decoders.cpp @@ -23,6 +23,7 @@ extern "C" { #include "FLAC/assert.h" #include "FLAC/metadata.h" // for ::FLAC__metadata_object_is_equal() #include "FLAC++/decoder.h" +#include "share/file_utils.h" #include #include #include @@ -2187,7 +2188,7 @@ bool test_decoders() if(!test_file_decoder()) return false; - (void) file_utils__remove_file(flacfilename_); + (void) FLAC__file_utils_remove_file(flacfilename_); free_metadata_blocks_(); return true; diff --git a/src/test_libFLAC++/file_utils.c b/src/test_libFLAC++/file_utils.c index 6a144687..aff1ab70 100644 --- a/src/test_libFLAC++/file_utils.c +++ b/src/test_libFLAC++/file_utils.c @@ -21,14 +21,7 @@ #include "FLAC/stream_encoder.h" #include #include -#if defined _MSC_VER || defined __MINGW32__ -#include /* for chmod(), unlink */ -#endif -#include /* for stat(), chmod() */ -#if defined _WIN32 && !defined __CYGWIN__ -#else -#include /* for unlink() */ -#endif +#include /* for stat() */ #ifdef min #undef min @@ -56,42 +49,6 @@ static void encoder_metadata_callback_(const FLAC__StreamEncoder *encoder, const (void)encoder, (void)metadata, (void)client_data; } -FLAC__bool file_utils__change_stats(const char *filename, FLAC__bool read_only) -{ - struct stat stats; - - if(0 == stat(filename, &stats)) { -#if !defined _MSC_VER && !defined __MINGW32__ - if(read_only) { - stats.st_mode &= ~S_IWUSR; - stats.st_mode &= ~S_IWGRP; - stats.st_mode &= ~S_IWOTH; - } - else { - stats.st_mode |= S_IWUSR; - stats.st_mode |= S_IWGRP; - stats.st_mode |= S_IWOTH; - } -#else - if(read_only) - stats.st_mode &= ~S_IWRITE; - else - stats.st_mode |= S_IWRITE; -#endif - if(0 != chmod(filename, stats.st_mode)) - return false; - } - else - return false; - - return true; -} - -FLAC__bool file_utils__remove_file(const char *filename) -{ - return file_utils__change_stats(filename, /*read_only=*/false) && 0 == unlink(filename); -} - FLAC__bool file_utils__generate_flacfile(const char *output_filename, unsigned *output_filesize, unsigned length, const FLAC__StreamMetadata *streaminfo, FLAC__StreamMetadata **metadata, unsigned num_metadata) { FLAC__int32 samples[1024]; diff --git a/src/test_libFLAC++/file_utils.h b/src/test_libFLAC++/file_utils.h index 851992ea..491b2cad 100644 --- a/src/test_libFLAC++/file_utils.h +++ b/src/test_libFLAC++/file_utils.h @@ -21,10 +21,6 @@ #include "FLAC/format.h" -FLAC__bool file_utils__change_stats(const char *filename, FLAC__bool read_only); - -FLAC__bool file_utils__remove_file(const char *filename); - FLAC__bool file_utils__generate_flacfile(const char *output_filename, unsigned *output_filesize, unsigned length, const FLAC__StreamMetadata *streaminfo, FLAC__StreamMetadata **metadata, unsigned num_metadata); #endif diff --git a/src/test_libFLAC++/metadata_manip.cpp b/src/test_libFLAC++/metadata_manip.cpp index 167f1b3b..893fef2b 100644 --- a/src/test_libFLAC++/metadata_manip.cpp +++ b/src/test_libFLAC++/metadata_manip.cpp @@ -22,6 +22,7 @@ extern "C" { #include "FLAC/assert.h" #include "FLAC++/decoder.h" #include "FLAC++/metadata.h" +#include "share/file_utils.h" #include #include /* for malloc() */ #include /* for memcpy()/memset() */ @@ -362,8 +363,8 @@ static bool test_file_(const char *filename, bool ignore_metadata) static bool change_stats_(const char *filename, bool read_only) { - if(!file_utils__change_stats(filename, read_only)) - return die_("during file_utils__change_stats()"); + if(!FLAC__file_utils_change_stats(filename, read_only)) + return die_("during FLAC__file_utils_change_stats()"); return true; } @@ -373,7 +374,7 @@ static bool remove_file_(const char *filename) while(our_metadata_.num_blocks > 0) delete_from_our_metadata_(0); - if(!file_utils__remove_file(filename)) + if(!FLAC__file_utils_remove_file(filename)) return die_("removing file"); return true; diff --git a/src/test_libFLAC/Makefile.lite b/src/test_libFLAC/Makefile.lite index b4c1f499..73c22783 100644 --- a/src/test_libFLAC/Makefile.lite +++ b/src/test_libFLAC/Makefile.lite @@ -23,7 +23,7 @@ topdir = ../.. PROGRAM_NAME = test_libFLAC INCLUDES = -I../libFLAC/include -I$(topdir)/include -LIBS = -lFLAC -lm +LIBS = -lFLAC -lfile_utils -lm OBJS = \ bitbuffer.o \ decoders.o \ diff --git a/src/test_libFLAC/Makefile.vc b/src/test_libFLAC/Makefile.vc index 1981a3d0..e44273b7 100644 --- a/src/test_libFLAC/Makefile.vc +++ b/src/test_libFLAC/Makefile.vc @@ -41,7 +41,7 @@ OBJS= $(C_FILES:.c=.obj) all: test_libFLAC.exe test_libFLAC.exe: $(OBJS) - link.exe /libpath:"..\..\obj\lib" -out:../../obj/bin/$*.exe $(OBJS) libFLAC.lib + link.exe /libpath:"..\..\obj\lib" -out:../../obj/bin/$*.exe $(OBJS) libFLAC.lib file_utils.lib clean: -del *.obj *.pch diff --git a/src/test_libFLAC/decoders.c b/src/test_libFLAC/decoders.c index 1dce3616..a055e81c 100644 --- a/src/test_libFLAC/decoders.c +++ b/src/test_libFLAC/decoders.c @@ -23,6 +23,7 @@ #include "FLAC/file_decoder.h" #include "FLAC/seekable_stream_decoder.h" #include "FLAC/stream_decoder.h" +#include "share/file_utils.h" #include #include #include @@ -2075,7 +2076,7 @@ FLAC__bool test_decoders() if(!test_file_decoder()) return false; - (void) file_utils__remove_file(flacfilename_); + (void) FLAC__file_utils_remove_file(flacfilename_); free_metadata_blocks_(); return true; diff --git a/src/test_libFLAC/encoders.c b/src/test_libFLAC/encoders.c index 779e82da..291e10cf 100644 --- a/src/test_libFLAC/encoders.c +++ b/src/test_libFLAC/encoders.c @@ -22,6 +22,7 @@ #include "FLAC/file_encoder.h" #include "FLAC/seekable_stream_encoder.h" #include "FLAC/stream_encoder.h" +#include "share/file_utils.h" #include #include #include @@ -1122,7 +1123,7 @@ FLAC__bool test_encoders() if(!test_file_encoder()) return false; - (void) file_utils__remove_file(flacfilename_); + (void) FLAC__file_utils_remove_file(flacfilename_); free_metadata_blocks_(); return true; diff --git a/src/test_libFLAC/file_utils.c b/src/test_libFLAC/file_utils.c index 6a144687..aff1ab70 100644 --- a/src/test_libFLAC/file_utils.c +++ b/src/test_libFLAC/file_utils.c @@ -21,14 +21,7 @@ #include "FLAC/stream_encoder.h" #include #include -#if defined _MSC_VER || defined __MINGW32__ -#include /* for chmod(), unlink */ -#endif -#include /* for stat(), chmod() */ -#if defined _WIN32 && !defined __CYGWIN__ -#else -#include /* for unlink() */ -#endif +#include /* for stat() */ #ifdef min #undef min @@ -56,42 +49,6 @@ static void encoder_metadata_callback_(const FLAC__StreamEncoder *encoder, const (void)encoder, (void)metadata, (void)client_data; } -FLAC__bool file_utils__change_stats(const char *filename, FLAC__bool read_only) -{ - struct stat stats; - - if(0 == stat(filename, &stats)) { -#if !defined _MSC_VER && !defined __MINGW32__ - if(read_only) { - stats.st_mode &= ~S_IWUSR; - stats.st_mode &= ~S_IWGRP; - stats.st_mode &= ~S_IWOTH; - } - else { - stats.st_mode |= S_IWUSR; - stats.st_mode |= S_IWGRP; - stats.st_mode |= S_IWOTH; - } -#else - if(read_only) - stats.st_mode &= ~S_IWRITE; - else - stats.st_mode |= S_IWRITE; -#endif - if(0 != chmod(filename, stats.st_mode)) - return false; - } - else - return false; - - return true; -} - -FLAC__bool file_utils__remove_file(const char *filename) -{ - return file_utils__change_stats(filename, /*read_only=*/false) && 0 == unlink(filename); -} - FLAC__bool file_utils__generate_flacfile(const char *output_filename, unsigned *output_filesize, unsigned length, const FLAC__StreamMetadata *streaminfo, FLAC__StreamMetadata **metadata, unsigned num_metadata) { FLAC__int32 samples[1024]; diff --git a/src/test_libFLAC/file_utils.h b/src/test_libFLAC/file_utils.h index 851992ea..491b2cad 100644 --- a/src/test_libFLAC/file_utils.h +++ b/src/test_libFLAC/file_utils.h @@ -21,10 +21,6 @@ #include "FLAC/format.h" -FLAC__bool file_utils__change_stats(const char *filename, FLAC__bool read_only); - -FLAC__bool file_utils__remove_file(const char *filename); - FLAC__bool file_utils__generate_flacfile(const char *output_filename, unsigned *output_filesize, unsigned length, const FLAC__StreamMetadata *streaminfo, FLAC__StreamMetadata **metadata, unsigned num_metadata); #endif diff --git a/src/test_libFLAC/metadata_manip.c b/src/test_libFLAC/metadata_manip.c index 152f8734..a3c86718 100644 --- a/src/test_libFLAC/metadata_manip.c +++ b/src/test_libFLAC/metadata_manip.c @@ -21,6 +21,7 @@ #include "FLAC/assert.h" #include "FLAC/file_decoder.h" #include "FLAC/metadata.h" +#include "share/file_utils.h" #include #include /* for malloc() */ @@ -376,8 +377,8 @@ static FLAC__bool test_file_(const char *filename, void (*metadata_callback)(con static FLAC__bool change_stats_(const char *filename, FLAC__bool read_only) { - if(!file_utils__change_stats(filename, read_only)) - return die_("during file_utils__change_stats()"); + if(!FLAC__file_utils_change_stats(filename, read_only)) + return die_("during FLAC__file_utils_change_stats()"); return true; } @@ -387,7 +388,7 @@ static FLAC__bool remove_file_(const char *filename) while(our_metadata_.num_blocks > 0) delete_from_our_metadata_(0); - if(!file_utils__remove_file(filename)) + if(!FLAC__file_utils_remove_file(filename)) return die_("removing file"); return true; diff --git a/src/test_libOggFLAC++/Makefile.lite b/src/test_libOggFLAC++/Makefile.lite index 8707bf84..9b710704 100644 --- a/src/test_libOggFLAC++/Makefile.lite +++ b/src/test_libOggFLAC++/Makefile.lite @@ -24,7 +24,7 @@ topdir = ../.. PROGRAM_NAME = test_libOggFLAC++ #@@@ TODO: conditionalize ogg lib path and -logg INCLUDES = -I$(topdir)/include -LIBS = -lOggFLAC++ -lOggFLAC -lFLAC -L$(HOME)/local/lib -logg -lm +LIBS = -lOggFLAC++ -lOggFLAC -lFLAC -L$(HOME)/local/lib -logg -lfile_utils -lm OBJS = \ decoders.o \ encoders.o \ diff --git a/src/test_libOggFLAC++/Makefile.vc b/src/test_libOggFLAC++/Makefile.vc index 30140804..078ac3ef 100644 --- a/src/test_libOggFLAC++/Makefile.vc +++ b/src/test_libOggFLAC++/Makefile.vc @@ -49,7 +49,7 @@ CPP_OBJS= $(CPP_FILES:.cpp=.obj) all: test_libOggFLAC++.exe test_libOggFLAC++.exe: $(C_OBJS) $(CPP_OBJS) - link.exe /libpath:"..\..\obj\lib" -out:../../obj/bin/$*.exe $(CPP_OBJS) $(C_OBJS) libOggFLAC++.lib libOggFLAC.lib libFLAC.lib ogg_static.lib + link.exe /libpath:"..\..\obj\lib" -out:../../obj/bin/$*.exe $(CPP_OBJS) $(C_OBJS) libOggFLAC++.lib libOggFLAC.lib libFLAC.lib ogg_static.lib file_utils.lib clean: -del *.obj *.pch diff --git a/src/test_libOggFLAC++/decoders.cpp b/src/test_libOggFLAC++/decoders.cpp index da11bfdb..adc1ab3b 100644 --- a/src/test_libOggFLAC++/decoders.cpp +++ b/src/test_libOggFLAC++/decoders.cpp @@ -23,6 +23,7 @@ extern "C" { #include "FLAC/assert.h" #include "FLAC/metadata.h" // for ::FLAC__metadata_object_is_equal() #include "OggFLAC++/decoder.h" +#include "share/file_utils.h" #include #include #include @@ -866,7 +867,7 @@ bool test_decoders() if(!test_stream_decoder()) return false; - (void) file_utils__remove_file(oggflacfilename_); + (void) FLAC__file_utils_remove_file(oggflacfilename_); free_metadata_blocks_(); return true; diff --git a/src/test_libOggFLAC++/file_utils.c b/src/test_libOggFLAC++/file_utils.c index a3481f3a..493f1d9e 100644 --- a/src/test_libOggFLAC++/file_utils.c +++ b/src/test_libOggFLAC++/file_utils.c @@ -21,14 +21,7 @@ #include "OggFLAC/stream_encoder.h" #include #include -#if defined _MSC_VER || defined __MINGW32__ -#include /* for chmod(), unlink */ -#endif -#include /* for stat(), chmod() */ -#if defined _WIN32 && !defined __CYGWIN__ -#else -#include /* for unlink() */ -#endif +#include /* for stat() */ #ifdef min #undef min @@ -53,42 +46,6 @@ static FLAC__StreamEncoderWriteStatus encoder_write_callback_(const OggFLAC__Str return FLAC__STREAM_ENCODER_WRITE_STATUS_OK; } -FLAC__bool file_utils__change_stats(const char *filename, FLAC__bool read_only) -{ - struct stat stats; - - if(0 == stat(filename, &stats)) { -#if !defined _MSC_VER && !defined __MINGW32__ - if(read_only) { - stats.st_mode &= ~S_IWUSR; - stats.st_mode &= ~S_IWGRP; - stats.st_mode &= ~S_IWOTH; - } - else { - stats.st_mode |= S_IWUSR; - stats.st_mode |= S_IWGRP; - stats.st_mode |= S_IWOTH; - } -#else - if(read_only) - stats.st_mode &= ~S_IWRITE; - else - stats.st_mode |= S_IWRITE; -#endif - if(0 != chmod(filename, stats.st_mode)) - return false; - } - else - return false; - - return true; -} - -FLAC__bool file_utils__remove_file(const char *filename) -{ - return file_utils__change_stats(filename, /*read_only=*/false) && 0 == unlink(filename); -} - FLAC__bool file_utils__generate_oggflacfile(const char *output_filename, unsigned *output_filesize, unsigned length, const FLAC__StreamMetadata *streaminfo, FLAC__StreamMetadata **metadata, unsigned num_metadata) { FLAC__int32 samples[1024]; diff --git a/src/test_libOggFLAC++/file_utils.h b/src/test_libOggFLAC++/file_utils.h index ef73f26a..a94298ce 100644 --- a/src/test_libOggFLAC++/file_utils.h +++ b/src/test_libOggFLAC++/file_utils.h @@ -23,10 +23,6 @@ extern const long file_utils__serial_number; -FLAC__bool file_utils__change_stats(const char *filename, FLAC__bool read_only); - -FLAC__bool file_utils__remove_file(const char *filename); - FLAC__bool file_utils__generate_oggflacfile(const char *output_filename, unsigned *output_filesize, unsigned length, const FLAC__StreamMetadata *streaminfo, FLAC__StreamMetadata **metadata, unsigned num_metadata); #endif diff --git a/src/test_libOggFLAC/Makefile.lite b/src/test_libOggFLAC/Makefile.lite index 2a937894..8e6000ee 100644 --- a/src/test_libOggFLAC/Makefile.lite +++ b/src/test_libOggFLAC/Makefile.lite @@ -24,7 +24,7 @@ topdir = ../.. PROGRAM_NAME = test_libOggFLAC #@@@ TODO: conditionalize ogg lib path and -logg INCLUDES = -I$(topdir)/include -LIBS = -lOggFLAC -lFLAC -lm -L$(HOME)/local/lib -logg +LIBS = -lOggFLAC -lFLAC -L$(HOME)/local/lib -logg -lfile_utils -lm OBJS = \ decoders.o \ encoders.o \ diff --git a/src/test_libOggFLAC/Makefile.vc b/src/test_libOggFLAC/Makefile.vc index 97084389..9c14cc42 100644 --- a/src/test_libOggFLAC/Makefile.vc +++ b/src/test_libOggFLAC/Makefile.vc @@ -37,7 +37,7 @@ OBJS= $(C_FILES:.c=.obj) all: test_libOggFLAC.exe test_libOggFLAC.exe: $(OBJS) - link.exe /libpath:"..\..\obj\lib" -out:../../obj/bin/$*.exe $(OBJS) libOggFLAC.lib libFLAC.lib ogg_static.lib + link.exe /libpath:"..\..\obj\lib" -out:../../obj/bin/$*.exe $(OBJS) libOggFLAC.lib libFLAC.lib ogg_static.lib file_utils.lib clean: -del *.obj *.pch diff --git a/src/test_libOggFLAC/decoders.c b/src/test_libOggFLAC/decoders.c index e64113b6..277b244c 100644 --- a/src/test_libOggFLAC/decoders.c +++ b/src/test_libOggFLAC/decoders.c @@ -21,6 +21,7 @@ #include "metadata_utils.h" #include "FLAC/assert.h" #include "OggFLAC/stream_decoder.h" +#include "share/file_utils.h" #include #include #include @@ -814,7 +815,7 @@ FLAC__bool test_decoders() if(!test_stream_decoder()) return false; - (void) file_utils__remove_file(oggflacfilename_); + (void) FLAC__file_utils_remove_file(oggflacfilename_); free_metadata_blocks_(); return true; diff --git a/src/test_libOggFLAC/encoders.c b/src/test_libOggFLAC/encoders.c index 388b4093..ec6188e7 100644 --- a/src/test_libOggFLAC/encoders.c +++ b/src/test_libOggFLAC/encoders.c @@ -20,6 +20,7 @@ #include "file_utils.h" #include "FLAC/assert.h" #include "OggFLAC/stream_encoder.h" +#include "share/file_utils.h" #include #include #include @@ -450,7 +451,7 @@ FLAC__bool test_encoders() if(!test_stream_encoder()) return false; - (void) file_utils__remove_file(oggflacfilename_); + (void) FLAC__file_utils_remove_file(oggflacfilename_); free_metadata_blocks_(); return true; diff --git a/src/test_libOggFLAC/file_utils.c b/src/test_libOggFLAC/file_utils.c index a3481f3a..493f1d9e 100644 --- a/src/test_libOggFLAC/file_utils.c +++ b/src/test_libOggFLAC/file_utils.c @@ -21,14 +21,7 @@ #include "OggFLAC/stream_encoder.h" #include #include -#if defined _MSC_VER || defined __MINGW32__ -#include /* for chmod(), unlink */ -#endif -#include /* for stat(), chmod() */ -#if defined _WIN32 && !defined __CYGWIN__ -#else -#include /* for unlink() */ -#endif +#include /* for stat() */ #ifdef min #undef min @@ -53,42 +46,6 @@ static FLAC__StreamEncoderWriteStatus encoder_write_callback_(const OggFLAC__Str return FLAC__STREAM_ENCODER_WRITE_STATUS_OK; } -FLAC__bool file_utils__change_stats(const char *filename, FLAC__bool read_only) -{ - struct stat stats; - - if(0 == stat(filename, &stats)) { -#if !defined _MSC_VER && !defined __MINGW32__ - if(read_only) { - stats.st_mode &= ~S_IWUSR; - stats.st_mode &= ~S_IWGRP; - stats.st_mode &= ~S_IWOTH; - } - else { - stats.st_mode |= S_IWUSR; - stats.st_mode |= S_IWGRP; - stats.st_mode |= S_IWOTH; - } -#else - if(read_only) - stats.st_mode &= ~S_IWRITE; - else - stats.st_mode |= S_IWRITE; -#endif - if(0 != chmod(filename, stats.st_mode)) - return false; - } - else - return false; - - return true; -} - -FLAC__bool file_utils__remove_file(const char *filename) -{ - return file_utils__change_stats(filename, /*read_only=*/false) && 0 == unlink(filename); -} - FLAC__bool file_utils__generate_oggflacfile(const char *output_filename, unsigned *output_filesize, unsigned length, const FLAC__StreamMetadata *streaminfo, FLAC__StreamMetadata **metadata, unsigned num_metadata) { FLAC__int32 samples[1024]; diff --git a/src/test_libOggFLAC/file_utils.h b/src/test_libOggFLAC/file_utils.h index ef73f26a..a94298ce 100644 --- a/src/test_libOggFLAC/file_utils.h +++ b/src/test_libOggFLAC/file_utils.h @@ -23,10 +23,6 @@ extern const long file_utils__serial_number; -FLAC__bool file_utils__change_stats(const char *filename, FLAC__bool read_only); - -FLAC__bool file_utils__remove_file(const char *filename); - FLAC__bool file_utils__generate_oggflacfile(const char *output_filename, unsigned *output_filesize, unsigned length, const FLAC__StreamMetadata *streaminfo, FLAC__StreamMetadata **metadata, unsigned num_metadata); #endif