work related to moving some file utils into the new file_utils convenience lib

5 files changed, 5 insertions, 51 deletions

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 <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -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 <stdio.h>
 #include <stdlib.h>
-#if defined _MSC_VER || defined __MINGW32__
-#include <io.h> /* for chmod(), unlink */
-#endif
-#include <sys/stat.h> /* for stat(), chmod() */
-#if defined _WIN32 && !defined __CYGWIN__
-#else
-#include <unistd.h> /* for unlink() */
-#endif
+#include <sys/stat.h> /* 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