From 05cc02cec03507c47846a668c92e6dcc4ba2e71e Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Tue, 18 Jan 2011 01:00:15 -0800
Subject: cleanup mkdir usage with boost filesystem:

Replaced copy/pasted code and MKDIR_TAKES_ONE_ARG #ifdefs
with portable boost filesystem path and directory creation.

Gets the correct home directory on windows systems: APPDATA.
Replaces large amounts of copypasta with single lines of code.
Removes MKDIR_TAKES_ONE_ARG configuration checks from m4 files.
Adds boost filesystem and system library as build dependencies.
---
 gnuradio-core/src/lib/general/gri_fft.cc | 33 ++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

(limited to 'gnuradio-core/src/lib/general')

diff --git a/gnuradio-core/src/lib/general/gri_fft.cc b/gnuradio-core/src/lib/general/gri_fft.cc
index e535f28c7..37be06f09 100644
--- a/gnuradio-core/src/lib/general/gri_fft.cc
+++ b/gnuradio-core/src/lib/general/gri_fft.cc
@@ -29,6 +29,17 @@
 #include <cassert>
 #include <stdexcept>
 
+#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/path.hpp>
+namespace fs = boost::filesystem;
+
+static std::string get_home_dir(void){
+    #if defined(BOOST_WINDOWS)
+        return getenv ("APPDATA");
+    #else
+        return getenv ("HOME");
+    #endif
+}
 
 boost::mutex &
 gri_fft_planner::mutex()
@@ -38,26 +49,18 @@ gri_fft_planner::mutex()
   return s_planning_mutex;
 }
 
-static char *
+static const char *
 wisdom_filename ()
 {
-  static const char *filename = ".gr_fftw_wisdom";
-
-  char	*home = getenv ("HOME");
-  if (home){
-    char *p = new char[strlen (home) + strlen (filename) + 2];
-    strcpy (p, home);
-    strcat (p, "/");
-    strcat (p, filename);
-    return p;
-  }
-  return 0;
+  static fs::path path;
+  path = fs::path(get_home_dir()) / ".gr_fftw_wisdom";
+  return path.string().c_str();
 }
 
 static void 
 gri_fftw_import_wisdom ()
 {
-  char *filename = wisdom_filename ();
+  const char *filename = wisdom_filename ();
   FILE *fp = fopen (filename, "r");
   if (fp != 0){
     int r = fftwf_import_wisdom_from_file (fp);
@@ -66,13 +69,12 @@ gri_fftw_import_wisdom ()
       fprintf (stderr, "gri_fftw: can't import wisdom from %s\n", filename);
     }
   }
-  delete [] filename;
 }
 
 static void
 gri_fftw_export_wisdom ()
 {
-  char *filename = wisdom_filename ();
+  const char *filename = wisdom_filename ();
   FILE *fp = fopen (filename, "w");
   if (fp != 0){
     fftwf_export_wisdom_to_file (fp);
@@ -82,7 +84,6 @@ gri_fftw_export_wisdom ()
     fprintf (stderr, "gri_fftw: ");
     perror (filename);
   }
-  delete [] filename;
 }
 
 // ----------------------------------------------------------------
-- 
cgit 


From ebb0f56da62e9ff16928b32cc525f24c93a99e0b Mon Sep 17 00:00:00 2001
From: Tom Rondeau
Date: Sat, 22 Jan 2011 14:54:20 -0500
Subject: Updating copyright.

---
 gnuradio-core/src/lib/general/gri_fft.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gnuradio-core/src/lib/general')

diff --git a/gnuradio-core/src/lib/general/gri_fft.cc b/gnuradio-core/src/lib/general/gri_fft.cc
index 37be06f09..eebe3b9c5 100644
--- a/gnuradio-core/src/lib/general/gri_fft.cc
+++ b/gnuradio-core/src/lib/general/gri_fft.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2003,2008 Free Software Foundation, Inc.
+ * Copyright 2003,2008,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
-- 
cgit