From 3b1ce13e77ff0777870d8ddd2064dd6f69738201 Mon Sep 17 00:00:00 2001
From: Fred Gleason <fredg@paraelsystems.com>
Date: Fri, 15 Dec 2017 07:47:41 -0500
Subject: [PATCH] 2017-12-15 Fred Gleason <fredg@paravelsystems.com> 	*
 Removed the 'RDTempDir()' function.

---
 ChangeLog                   |  2 ++
 importers/nexgen_filter.cpp | 12 ++++++------
 lib/rdaudioconvert.cpp      | 35 ++++++++++++++-------------------
 lib/rdaudioconvert.h        |  8 ++++----
 lib/rdconf.cpp              | 23 ----------------------
 lib/rdconf.h                |  1 -
 lib/rdfeed.cpp              |  5 +++--
 lib/rdformpost.cpp          | 20 +++++++++----------
 lib/rdformpost.h            |  4 +++-
 lib/rdrenderer.cpp          |  7 ++++---
 lib/rdtextfile.cpp          | 10 ++++++----
 lib/rdweb.cpp               | 17 ++++++++--------
 rdadmin/createdb.cpp        | 30 +++++++++++++++-------------
 rdcatchd/batch.cpp          | 39 +++++++++++++++++++------------------
 rdcatchd/rdcatchd.cpp       | 31 +++++++++++++++--------------
 rdlibrary/cdripper.cpp      | 15 +++++++-------
 rdlibrary/disk_ripper.cpp   | 21 ++++++++++----------
 rdrepld/citadelxds.cpp      | 15 +++++++-------
 rdrepld/rdrepld.cpp         | 11 ++++++-----
 utils/rdimport/rdimport.cpp | 13 +++++++------
 20 files changed, 154 insertions(+), 165 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e1c23c86..280177f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16483,3 +16483,5 @@
 2017-12-14 Fred Gleason <fredg@paravelsystems.com>
 	* Added an 'RDTempDirectory' class.
 	* Fixed a race in the 'Export' Web API call.
+2017-12-15 Fred Gleason <fredg@paravelsystems.com>
+	* Removed the 'RDTempDir()' function.
diff --git a/importers/nexgen_filter.cpp b/importers/nexgen_filter.cpp
index 164d55b9..dccc044b 100644
--- a/importers/nexgen_filter.cpp
+++ b/importers/nexgen_filter.cpp
@@ -2,7 +2,7 @@
 //
 // A Library import filter for the Prophet NexGen system
 //
-//   (C) Copyright 2012 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2012,2017 Fred Gleason <fredg@paravelsystems.com>
 //
 //   This program is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License version 2 as
@@ -34,15 +34,15 @@
 #include <qfile.h>
 #include <qregexp.h>
 
-#include <rddb.h>
 #include <rd.h>
+#include <rdcart.h>
 #include <rdconfig.h>
 #include <rdconf.h>
 #include <rdcmd_switch.h>
 #include <rdcut.h>
+#include <rddb.h>
+#include <rdtempdirectory.h>
 #include <rdwavefile.h>
-#include <rdcart.h>
-#include <rdcut.h>
 #include <rdweb.h>
 
 #include <nexgen_filter.h>
@@ -210,7 +210,7 @@ MainObject::MainObject(QObject *parent)
   //
   // Create Temp Directory
   //
-  strncpy(tempdir,RDTempDir()+"/nexgen_filterXXXXXX",PATH_MAX);
+  strncpy(tempdir,RDTempDirectory::basePath()+"/nexgen_filterXXXXXX",PATH_MAX);
   filter_temp_dir=new QDir(mkdtemp(tempdir));
   filter_temp_audiofile=filter_temp_dir->canonicalPath()+"/audio.dat";
 
@@ -265,7 +265,7 @@ void MainObject::ProcessArchive(const QString &filename)
   //
   // Create temporary directory
   //
-  snprintf(tempdir,PATH_MAX,"%s/XXXXXX",(const char *)RDTempDir());
+  snprintf(tempdir,PATH_MAX,"%s/XXXXXX",(const char *)RDTempDirectory::basePath());
   if(mkdtemp(tempdir)==NULL) {
     return;
   }
diff --git a/lib/rdaudioconvert.cpp b/lib/rdaudioconvert.cpp
index 350cd732..5da0db17 100644
--- a/lib/rdaudioconvert.cpp
+++ b/lib/rdaudioconvert.cpp
@@ -2,7 +2,7 @@
 //
 // Convert Audio File Formats
 //
-//   (C) Copyright 2010-2015 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2010-2017 Fred Gleason <fredg@paravelsystems.com>
 //
 //   This program is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License version 2 as
@@ -48,11 +48,12 @@
 #include <id3/tag.h>
 #include <qfile.h>
 
-#include <rd.h>
 #include <rdaudioconvert.h>
-#include <rdlibrary_conf.h>
 #include <rdcart.h>
 #include <rdconf.h>
+#include <rd.h>
+#include <rdlibrary_conf.h>
+#include <rdtempdirectory.h>
 
 #define STAGE2_XFER_SIZE 2048
 #define STAGE2_BUFFER_SIZE 49152
@@ -143,10 +144,10 @@ void RDAudioConvert::setSpeedRatio(float ratio)
 
 RDAudioConvert::ErrorCode RDAudioConvert::convert()
 {
-  char tmpdir[PATH_MAX];
   RDAudioConvert::ErrorCode err;
   QString tmpfile1;
   QString tmpfile2;
+  RDTempDirectory *temp_dir=NULL;
 
   //
   // Make sure we're all set to go...
@@ -170,21 +171,21 @@ RDAudioConvert::ErrorCode RDAudioConvert::convert()
   //
   // Generate Temporary Filenames
   //
-  strcpy(tmpdir,RDTempDir());
-  strcat(tmpdir,"/rdaudioconvertXXXXXX");
-  if(mkdtemp(tmpdir)==NULL) {
+  temp_dir=new RDTempDirectory("rdaudioconvert");
+  QString err_msg;
+  if(!temp_dir->create(&err_msg)) {
+    delete temp_dir;
     return RDAudioConvert::ErrorInternal;
   }
-  tmpfile1=QString(tmpdir)+"/signed32_1.wav";
-  tmpfile2=QString(tmpdir)+"/signed32_2.wav";
+  tmpfile1=QString(temp_dir->path())+"/signed32_1.wav";
+  tmpfile2=QString(temp_dir->path())+"/signed32_2.wav";
 
   //
   // Stage One -- Convert Source Format to Signed 32 Bit Integer
   //
   if((err=Stage1Convert(conv_src_filename,tmpfile1))!=
      RDAudioConvert::ErrorOk) {
-    unlink(tmpfile1);
-    rmdir(tmpdir);
+    delete temp_dir;
     return err;
   }
 
@@ -193,9 +194,7 @@ RDAudioConvert::ErrorCode RDAudioConvert::convert()
   //
   if((err=Stage2Convert(tmpfile1,tmpfile2))!=
      RDAudioConvert::ErrorOk) {
-    unlink(tmpfile1);
-    unlink(tmpfile2);
-    rmdir(tmpdir);
+    delete temp_dir;
     return err;
   }
 
@@ -204,18 +203,14 @@ RDAudioConvert::ErrorCode RDAudioConvert::convert()
   //
   if((err=Stage3Convert(tmpfile2,conv_dst_filename))!=
      RDAudioConvert::ErrorOk) {
-    unlink(tmpfile1);
-    unlink(tmpfile2);
-    rmdir(tmpdir);
+    delete temp_dir;
     return err;
   }
 
   //
   // Clean Up
   //
-  unlink(tmpfile1);
-  unlink(tmpfile2);
-  rmdir(tmpdir);
+  delete temp_dir;
 
   return RDAudioConvert::ErrorOk;
 }
diff --git a/lib/rdaudioconvert.h b/lib/rdaudioconvert.h
index 3f7cdbbb..bba529ed 100644
--- a/lib/rdaudioconvert.h
+++ b/lib/rdaudioconvert.h
@@ -2,7 +2,7 @@
 //
 // Convert Audio File Formats
 //
-//   (C) Copyright 2010-2015 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2010-2017 Fred Gleason <fredg@paravelsystems.com>
 //
 //   This program is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License version 2 as
@@ -36,9 +36,9 @@
 
 #include <qobject.h>
 
-#include <rdwavedata.h>
-#include <rdsettings.h>
-#include <rdwavefile.h>
+#include "rdsettings.h"
+#include "rdwavedata.h"
+#include "rdwavefile.h"
 
 class RDAudioConvert : public QObject
 {
diff --git a/lib/rdconf.cpp b/lib/rdconf.cpp
index 3e478dc5..7519d444 100644
--- a/lib/rdconf.cpp
+++ b/lib/rdconf.cpp
@@ -963,29 +963,6 @@ QString RDHomeDir()
 }
 
 
-QString RDTempDir()
-{
-  QString conf_temp_directory = RDConfiguration()->tempDirectory();
-  if (!conf_temp_directory.isEmpty()) {
-    return conf_temp_directory;
-  }
-#ifdef WIN32
-  if(getenv("TEMP")!=NULL) {
-    return QString(getenv("TEMP"));
-  }
-  if(getenv("TMP")!=NULL) {
-    return QString(getenv("TMP"));
-  }
-  return QString("C:\\");
-#else
-  if(getenv("TMPDIR")!=NULL) {
-    return QString(getenv("TMPDIR"));
-  }
-  return QString("/tmp");
-#endif  // WIN32
-}
-
-
 QString RDTempFile()
 {
 #ifndef WIN32
diff --git a/lib/rdconf.h b/lib/rdconf.h
index 24d66564..342dce60 100644
--- a/lib/rdconf.h
+++ b/lib/rdconf.h
@@ -98,7 +98,6 @@ QString RDGetHomeDir(bool *found=0);
 bool RDTimeSynced();
 QString RDTruncateAfterWord(QString str,int word,bool add_dots=false);
 QString RDHomeDir();
-QString RDTempDir();
 QString RDTempFile();
 QString RDTimeZoneName(const QDateTime &datetime);
 QString RDDowCode(int dow);
diff --git a/lib/rdfeed.cpp b/lib/rdfeed.cpp
index 279d8c28..61e85626 100644
--- a/lib/rdfeed.cpp
+++ b/lib/rdfeed.cpp
@@ -2,7 +2,7 @@
 //
 // Abstract a Rivendell RSS Feed
 //
-//   (C) Copyright 2002-2007,2010,2016 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2002-2007,2010,2016-2017 Fred Gleason <fredg@paravelsystems.com>
 //
 //   This program is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License version 2 as
@@ -35,6 +35,7 @@
 #include <rdcut.h>
 #include <rdaudioexport.h>
 #include <rdaudioconvert.h>
+#include <rdtempdirectory.h>
 #include <rdupload.h>
 
 RDFeed::RDFeed(const QString &keyname,RDConfig *config,QObject *parent)
@@ -863,7 +864,7 @@ QString RDFeed::GetTempFilename() const
 {
   char tempname[PATH_MAX];
 
-  sprintf(tempname,"%s/podcastXXXXXX",(const char *)RDTempDir());
+  sprintf(tempname,"%s/podcastXXXXXX",(const char *)RDTempDirectory::basePath());
   if(mkstemp(tempname)<0) {
     return QString();
   }
diff --git a/lib/rdformpost.cpp b/lib/rdformpost.cpp
index 3f3376ec..a288860e 100644
--- a/lib/rdformpost.cpp
+++ b/lib/rdformpost.cpp
@@ -34,13 +34,13 @@
 RDFormPost::RDFormPost(RDFormPost::Encoding encoding,unsigned maxsize,
 		       bool auto_delete)
 {
-  char tempdir[PATH_MAX];
   bool ok=false;
 
   post_encoding=encoding;
   post_error=RDFormPost::ErrorNotInitialized;
   post_auto_delete=auto_delete;
   post_data=NULL;
+  post_tempdir=NULL;
 
   //
   // Client Info
@@ -82,12 +82,11 @@ RDFormPost::RDFormPost(RDFormPost::Encoding encoding,unsigned maxsize,
   }
 
   //
-  // Initialize Temp Directory Path
+  // Initialize Temp Directory
   //
-  strcpy(tempdir,RDTempDir());
-  strcat(tempdir,"/rivendellXXXXXX");
-  post_tempdir=mkdtemp(tempdir);
-  if(post_tempdir.isNull()) {
+  post_tempdir=new RDTempDirectory("rdformpost");
+  QString err_msg;
+  if(!post_tempdir->create(&err_msg)) {
     post_error=RDFormPost::ErrorNoTempDir;
     return;
   }
@@ -130,8 +129,8 @@ RDFormPost::~RDFormPost()
 	unlink(post_values.at(ci->first).toString());
       }
     }
-    if(!post_tempdir.isNull()) {
-      rmdir(post_tempdir);
+    if(post_tempdir!=NULL) {
+      delete post_tempdir;
     }
     if(post_data!=NULL) {
       delete post_data;
@@ -304,7 +303,7 @@ bool RDFormPost::isFile(const QString &name)
 
 QString RDFormPost::tempDir() const
 {
-  return post_tempdir;
+  return post_tempdir->path();
 }
 
 
@@ -584,7 +583,8 @@ void RDFormPost::LoadMultipartEncoding(char first)
 		  name.replace("\"","");
 		}
 		if(pairs[0].lower().simplifyWhiteSpace()=="filename") {
-		  filename=post_tempdir+"/"+pairs[1].simplifyWhiteSpace();
+		  filename=post_tempdir->path()+"/"+
+		    pairs[1].simplifyWhiteSpace();
 		  filename.replace("\"","");
 		  fd=open(filename,O_WRONLY|O_CREAT,S_IRUSR|S_IWUSR);
 		}
diff --git a/lib/rdformpost.h b/lib/rdformpost.h
index ca6a2c2c..be58bf03 100644
--- a/lib/rdformpost.h
+++ b/lib/rdformpost.h
@@ -28,6 +28,8 @@
 #include <qvariant.h>
 #include <qhostaddress.h>
 
+#include <rdtempdirectory.h>
+
 class RDFormPost
 {
  public:
@@ -67,7 +69,7 @@ class RDFormPost
   RDFormPost::Error post_error;
   std::map<QString,QVariant> post_values;
   std::map<QString,bool> post_filenames;
-  QString post_tempdir;
+  RDTempDirectory *post_tempdir;
   bool post_auto_delete;
   unsigned post_content_length;
   QString post_content_type;
diff --git a/lib/rdrenderer.cpp b/lib/rdrenderer.cpp
index 82f83ff7..39cb7e18 100644
--- a/lib/rdrenderer.cpp
+++ b/lib/rdrenderer.cpp
@@ -27,6 +27,7 @@
 #include "rdcart.h"
 #include "rdconf.h"
 #include "rdcut.h"
+#include "rdtempdirectory.h"
 
 #include "rdrenderer.h"
 
@@ -182,7 +183,7 @@ bool __RDRenderLogLine::GetCutFile(const QString &cutname,int start_pt,
   RDAudioExport::ErrorCode export_err;
   char tempdir[PATH_MAX];
   
-  strncpy(tempdir,RDTempDir()+"/rdrenderXXXXXX",PATH_MAX);
+  strncpy(tempdir,RDTempDirectory::basePath()+"/rdrenderXXXXXX",PATH_MAX);
   *dest_filename=QString(mkdtemp(tempdir))+"/"+cutname+".wav";
   RDAudioExport *conv=new RDAudioExport(ll_station,ll_config);
   conv->setDestinationFile(*dest_filename);
@@ -277,7 +278,7 @@ bool RDRenderer::renderToFile(const QString &outfile,RDLogEvent *log,
     //
     // Get Temporary File
     //
-    strncpy(tempdir,RDTempDir()+"/rdrenderXXXXXX",PATH_MAX);
+    strncpy(tempdir,RDTempDirectory::basePath()+"/rdrenderXXXXXX",PATH_MAX);
     temp_output_filename=QString(mkdtemp(tempdir))+"/log.wav";
     ProgressMessage(tr("Using temporary file")+" \""+temp_output_filename+"\".");
 
@@ -359,7 +360,7 @@ bool RDRenderer::renderToCart(unsigned cartnum,int cutnum,RDLogEvent *log,
   //
   // Get Temporary File
   //
-  strncpy(tempdir,RDTempDir()+"/rdrenderXXXXXX",PATH_MAX);
+  strncpy(tempdir,RDTempDirectory::basePath()+"/rdrenderXXXXXX",PATH_MAX);
   temp_output_filename=QString(mkdtemp(tempdir))+"/log.wav";
   ProgressMessage(tr("Using temporary file")+" \""+temp_output_filename+"\".");
 
diff --git a/lib/rdtextfile.cpp b/lib/rdtextfile.cpp
index e5d71d7d..3e229a98 100644
--- a/lib/rdtextfile.cpp
+++ b/lib/rdtextfile.cpp
@@ -2,7 +2,7 @@
 //
 // Spawn an external text file viewer.
 //
-//   (C) Copyright 2002-2006,2016 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2002-2006,2016-2017 Fred Gleason <fredg@paravelsystems.com>
 //
 //   This program is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License version 2 as
@@ -27,8 +27,10 @@
 #include <qmessagebox.h>
 #include <qprocess.h>
 
-#include <rdconf.h>
-#include <rd.h>
+#include "rdconf.h"
+#include "rd.h"
+#include "rdtempdirectory.h"
+
 #include <rdtextfile.h>
 
 bool RDTextFile(const QString &data)
@@ -63,7 +65,7 @@ bool RDTextFile(const QString &data)
   proc->launch("");
   delete proc;
 #else
-  strcpy(tmpfile,RDTempDir()+"/rdreportXXXXXX");
+  strcpy(tmpfile,RDTempDirectory::basePath()+"/rdreportXXXXXX");
   int fd=mkstemp(tmpfile);
   if(fd<0) {
     QMessageBox::warning(NULL,"File Error","Unable to create temporary file");
diff --git a/lib/rdweb.cpp b/lib/rdweb.cpp
index e62c1d34..481dcd23 100644
--- a/lib/rdweb.cpp
+++ b/lib/rdweb.cpp
@@ -3,7 +3,7 @@
 // Functions for interfacing with web components using the
 // Common Gateway Interface (CGI) Standard 
 //
-//   (C) Copyright 1996-2007 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 1996-2007,2017 Fred Gleason <fredg@paravelsystems.com>
 //
 //   This program is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License version 2 as
@@ -32,15 +32,16 @@
 #include <qdatetime.h>
 #include <qstringlist.h>
 
-#include <rdescape_string.h>
-#include <rduser.h>
-#include <rddb.h>
-#include <rdconf.h>
+#include "rdconf.h"
+#include "rddb.h"
+#include "rdescape_string.h"
+#include "rdtempdirectory.h"
+#include "rduser.h"
 #ifndef WIN32
-#include <rdwebresult.h>
+#include "rdwebresult.h"
 #endif  // WIN32
 
-#include <rdweb.h>
+#include "rdweb.h"
 
 #ifndef WIN32
 /* RDReadPost(char *cBuffer,int dSize) */
@@ -787,7 +788,7 @@ bool RDParsePost(std::map<QString,QString> *vars)
   //
   // Initialize Temp Directory Path
   //
-  tempdir = RDTempDir() + "/rivendellXXXXXX";
+  tempdir=RDTempDirectory::basePath()+"/rivendellXXXXXX";
 
   //
   // Get message part separator
diff --git a/rdadmin/createdb.cpp b/rdadmin/createdb.cpp
index 5a924ad3..ff0a457d 100644
--- a/rdadmin/createdb.cpp
+++ b/rdadmin/createdb.cpp
@@ -28,25 +28,27 @@
 
 #include <qapplication.h>
 
-#include <rddb.h>
-#include <rd.h>
-#include <rdevent.h>
-#include <rdlog.h>
 #include <dbversion.h>
+#include <rd.h>
 #include <rdcart.h>
+#include <rdconf.h>
+#include <rdconfig.h>
 #include <rdcreate_log.h>
-#include <rdrecording.h>
+#include <rdcreateauxfieldstable.h>
+#include <rddb.h>
+#include <rdescape_string.h>
+#include <rdevent.h>
+#include <rdfeedlog.h>
+#include <rdlog.h>
+#include <rdlog_line.h>
 #include <rdmacro_event.h>
 #include <rdpaths.h>
+#include <rdrecording.h>
 #include <rdsvc.h>
-#include <rdlog_line.h>
-#include <rdcreateauxfieldstable.h>
-#include <rdfeedlog.h>
-#include <rdescape_string.h>
-#include "rdconfig.h"
-#include <createdb.h>
-#include <globals.h>
-#include <rdconf.h>
+#include <rdtempdirectory.h>
+
+#include "createdb.h"
+#include "globals.h"
 
 //
 // NOTE TO MAINTAINERS:
@@ -2693,7 +2695,7 @@ int UpdateDb(int ver,RDConfig *config)
       bool home_found = false;
       admin_backup_filename = RDGetHomeDir(&home_found);
       if (!home_found) {
-        admin_backup_filename = RDTempDir();
+        admin_backup_filename = RDTempDirectory::basePath();
       }
       admin_backup_filename+=
 	QString().sprintf("/rdbackup-%s-%d.sql.gz",
diff --git a/rdcatchd/batch.cpp b/rdcatchd/batch.cpp
index b35ead26..7daae048 100644
--- a/rdcatchd/batch.cpp
+++ b/rdcatchd/batch.cpp
@@ -2,7 +2,7 @@
 //
 // Batch Routines for the Rivendell netcatcher daemon
 //
-//   (C) Copyright 2002-2016 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2002-2017 Fred Gleason <fredg@paravelsystems.com>
 //
 //   This program is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License version 2 as
@@ -39,28 +39,29 @@
 #include <qsignalmapper.h>
 #include <qsessionmanager.h>
 
-#include <rddb.h>
-#include <rdconf.h>
-#include <rdurl.h>
-#include <rdwavefile.h>
-#include <rdcut.h>
+#include <rdaudioconvert.h>
 #include <rdcatchd_socket.h>
 #include <rdcatchd.h>
-#include <rdrecording.h>
-#include <rdttyout.h>
-#include <rdmixer.h>
 #include <rdcheck_daemons.h>
-#include <rddebug.h>
-#include <rddatedecode.h>
 #include <rdcmd_switch.h>
-#include <rdescape_string.h>
-#include <rdpodcast.h>
-#include <rdsettings.h>
-#include <rdlibrary_conf.h>
-#include <rdaudioconvert.h>
-#include <rdupload.h>
-#include <rdweb.h>
+#include <rdconf.h>
+#include <rdcut.h>
+#include <rddb.h>
+#include <rddatedecode.h>
+#include <rddebug.h>
 #include <rddownload.h>
+#include <rdescape_string.h>
+#include <rdlibrary_conf.h>
+#include <rdmixer.h>
+#include <rdpodcast.h>
+#include <rdrecording.h>
+#include <rdsettings.h>
+#include <rdtempdirectory.h>
+#include <rdttyout.h>
+#include <rdupload.h>
+#include <rdurl.h>
+#include <rdwavefile.h>
+#include <rdweb.h>
 
 void MainObject::catchConnectedData(int serial,bool state)
 {
@@ -131,7 +132,7 @@ void MainObject::RunBatch(RDCmdSwitch *cmd)
   //
   // Calculate Temporary Directory
   //
-  catch_temp_dir=RDTempDir();
+  catch_temp_dir=RDTempDirectory::basePath();
 
   //
   // Open Database
diff --git a/rdcatchd/rdcatchd.cpp b/rdcatchd/rdcatchd.cpp
index 1001b900..ef782f52 100644
--- a/rdcatchd/rdcatchd.cpp
+++ b/rdcatchd/rdcatchd.cpp
@@ -2,7 +2,7 @@
 //
 // The Rivendell Netcatcher Daemon
 //
-//   (C) Copyright 2002-2016 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2002-2017 Fred Gleason <fredg@paravelsystems.com>
 //
 //   This program is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License version 2 as
@@ -41,26 +41,27 @@
 #include <qsignalmapper.h>
 #include <qsessionmanager.h>
 
-#include <rddb.h>
-#include <rdconf.h>
-#include <rdhash.h>
-#include <rdurl.h>
-#include <rdwavefile.h>
-#include <rdcut.h>
+#include <dbversion.h>
 #include <rdcatchd_socket.h>
 #include <rdcatchd.h>
-#include <rdrecording.h>
-#include <rdttyout.h>
-#include <rdmixer.h>
 #include <rdcheck_daemons.h>
-#include <rddebug.h>
+#include <rdconf.h>
+#include <rdcut.h>
 #include <rddatedecode.h>
+#include <rddb.h>
+#include <rddebug.h>
 #include <rdescape_string.h>
-#include <rdpodcast.h>
-#include <rdsettings.h>
+#include <rdhash.h>
 #include <rdlibrary_conf.h>
+#include <rdmixer.h>
 #include <rdpaths.h>
-#include <dbversion.h>
+#include <rdpodcast.h>
+#include <rdrecording.h>
+#include <rdsettings.h>
+#include <rdtempdirectory.h>
+#include <rdttyout.h>
+#include <rdurl.h>
+#include <rdwavefile.h>
 
 RDConfig *catch_config;
 
@@ -190,7 +191,7 @@ MainObject::MainObject(QObject *parent)
   //
   // Calculate Temporary Directory
   //
-  catch_temp_dir=RDTempDir();
+  catch_temp_dir=RDTempDirectory::basePath();
 
   //
   // Macro Event Handling
diff --git a/rdlibrary/cdripper.cpp b/rdlibrary/cdripper.cpp
index d86e33b8..3d4c0732 100644
--- a/rdlibrary/cdripper.cpp
+++ b/rdlibrary/cdripper.cpp
@@ -2,7 +2,7 @@
 //
 // CD Ripper Dialog for Rivendell.
 //
-//   (C) Copyright 2002-2003,2009,2016 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2002-2003,2009,2016-2017 Fred Gleason <fredg@paravelsystems.com>
 //
 //   This program is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License version 2 as
@@ -33,11 +33,12 @@
 #include <qstringlist.h>
 
 #include <rd.h>
-#include <rdconf.h>
-#include <rdwavefile.h>
-#include <rdcut.h>
-#include <rdcdripper.h>
 #include <rdaudioimport.h>
+#include <rdconf.h>
+#include <rdcdripper.h>
+#include <rdcut.h>
+#include <rdtempdirectory.h>
+#include <rdwavefile.h>
 
 #include <cdripper.h>
 #include <globals.h>
@@ -81,7 +82,7 @@ CdRipper::CdRipper(QString cutname,RDCddbRecord *rec,RDLibraryConf *conf,
   // Create Temporary Directory
   //
   char path[PATH_MAX];
-  strncpy(path,RDTempDir(),PATH_MAX);
+  strncpy(path,RDTempDirectory::basePath(),PATH_MAX);
   strcat(path,"/XXXXXX");
   if(mkdtemp(path)==NULL) {
     QMessageBox::warning(this,"RDLibrary - "+tr("Ripper Error"),
@@ -465,7 +466,7 @@ void CdRipper::ripTrackButtonData()
   RDAudioImport::ErrorCode conv_err;
   RDAudioConvert::ErrorCode audio_conv_err;
   RDCdRipper::ErrorCode ripper_err;
-  QString tmpdir=RDTempDir();
+  QString tmpdir=RDTempDirectory::basePath();
   QString tmpfile=tmpdir+"/"+RIPPER_TEMP_WAV;
   if(rip_profile_rip) {
     ripper=new RDCdRipper(stdout,this);
diff --git a/rdlibrary/disk_ripper.cpp b/rdlibrary/disk_ripper.cpp
index e4690e71..ae036657 100644
--- a/rdlibrary/disk_ripper.cpp
+++ b/rdlibrary/disk_ripper.cpp
@@ -2,7 +2,7 @@
 //
 // CD Ripper Dialog for Rivendell.
 //
-//   (C) Copyright 2002-2003,2010,2016 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2002-2003,2010,2016-2017 Fred Gleason <fredg@paravelsystems.com>
 //
 //   This program is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License version 2 as
@@ -31,18 +31,19 @@
 #include <qmessagebox.h>
 #include <qcheckbox.h>
 
-#include <rddb.h>
 #include <rd.h>
-#include <rdconf.h>
-#include <rdwavefile.h>
+#include <rdaudioimport.h>
 #include <rdcart.h>
+#include <rdcdripper.h>
+#include <rdconf.h>
 #include <rdcut.h>
 #include <rdcut_dialog.h>
-#include <rdlist_groups.h>
-#include <rdgroup.h>
-#include <rdaudioimport.h>
-#include <rdcdripper.h>
+#include <rddb.h>
 #include <rdescape_string.h>
+#include <rdgroup.h>
+#include <rdlist_groups.h>
+#include <rdtempdirectory.h>
+#include <rdwavefile.h>
 
 #include <disk_ripper.h>
 #include <globals.h>
@@ -84,7 +85,7 @@ DiskRipper::DiskRipper(QString *filter,QString *group,QString *schedcode,
   // Create Temporary Directory
   //
   char path[PATH_MAX];
-  strncpy(path,RDTempDir(),PATH_MAX);
+  strncpy(path,RDTempDirectory::basePath(),PATH_MAX);
   strcat(path,"/XXXXXX");
   if(mkdtemp(path)==NULL) {
     QMessageBox::warning(this,"RDLibrary - "+tr("Ripper Error"),
@@ -1018,7 +1019,7 @@ void DiskRipper::RipTrack(int track,int end_track,QString cutname,QString title)
   RDAudioImport::ErrorCode conv_err;
   RDAudioConvert::ErrorCode audio_conv_err;
   RDCdRipper::ErrorCode ripper_err;
-  QString tmpdir=RDTempDir();
+  QString tmpdir=RDTempDirectory::basePath();
   QString tmpfile=tmpdir+"/"+RIPPER_TEMP_WAV;
   if(rip_profile_rip) {
     ripper=new RDCdRipper(stdout,this);
diff --git a/rdrepld/citadelxds.cpp b/rdrepld/citadelxds.cpp
index 43db69ec..8078123c 100644
--- a/rdrepld/citadelxds.cpp
+++ b/rdrepld/citadelxds.cpp
@@ -2,7 +2,7 @@
 //
 // Replicator implementation for the Citadel XDS Portal
 //
-//   (C) Copyright 2010,2016 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2010,2016-2017 Fred Gleason <fredg@paravelsystems.com>
 //
 //   This program is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License version 2 as
@@ -26,15 +26,16 @@
 #include <qfileinfo.h>
 #include <qdatetime.h>
 
-#include <rddb.h>
-#include <rdconf.h>
 #include <rdaudioconvert.h>
-#include <rdupload.h>
-#include <rdcut.h>
 #include <rdcart.h>
+#include <rdcut.h>
+#include <rdconf.h>
+#include <rddb.h>
+#include <rddelete.h>
 #include <rdescape_string.h>
 #include <rdstringlist.h>
-#include <rddelete.h>
+#include <rdtempdirectory.h>
+#include <rdupload.h>
 
 #include <citadelxds.h>
 
@@ -345,7 +346,7 @@ bool CitadelXds::PostCut(const QString &cutname,const QString &filename)
     speed_ratio=(float)cut->length()/(float)cart->forcedLength();
   }
   RDSettings *settings=new RDSettings();
-  QString tempfile=RDTempDir()+"/"+filename;
+  QString tempfile=RDTempDirectory::basePath()+"/"+filename;
   RDAudioConvert *conv=new RDAudioConvert(rdconfig->stationName());
   conv->setSourceFile(RDCut::pathName(cutname));
   conv->setDestinationFile(tempfile);
diff --git a/rdrepld/rdrepld.cpp b/rdrepld/rdrepld.cpp
index 9c484115..e16062bd 100644
--- a/rdrepld/rdrepld.cpp
+++ b/rdrepld/rdrepld.cpp
@@ -2,7 +2,7 @@
 //
 // The Rivendell Replicator Daemon
 //
-//   (C) Copyright 2010,2016 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2010,2016-2017 Fred Gleason <fredg@paravelsystems.com>
 //
 //   This program is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License version 2 as
@@ -24,12 +24,13 @@
 
 #include <qapplication.h>
 
-#include <rddb.h>
+#include <dbversion.h>
+#include <rdcart.h>
 #include <rdconf.h>
 #include <rdcmd_switch.h>
+#include <rddb.h>
 #include <rdescape_string.h>
-#include <rdcart.h>
-#include <dbversion.h>
+#include <rdtempdirectory.h>
 
 #include <globals.h>
 #include <citadelxds.h>
@@ -100,7 +101,7 @@ MainObject::MainObject(QObject *parent)
   //
   // Calculate Temporary Directory
   //
-  repl_temp_dir=RDTempDir();
+  repl_temp_dir=RDTempDirectory::basePath();
 
   //
   // Open Database
diff --git a/utils/rdimport/rdimport.cpp b/utils/rdimport/rdimport.cpp
index a00be01c..d7f4866b 100644
--- a/utils/rdimport/rdimport.cpp
+++ b/utils/rdimport/rdimport.cpp
@@ -2,7 +2,7 @@
 //
 // A Batch Importer for Rivendell.
 //
-//   (C) Copyright 2002-2014,2016 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2002-2014,2016-2017 Fred Gleason <fredg@paravelsystems.com>
 //
 //   This program is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License version 2 as
@@ -34,13 +34,14 @@
 #include <qstringlist.h>
 
 #include <rd.h>
-#include <rdcut.h>
+#include <rdaudioimport.h>
 #include <rdconf.h>
+#include <rdcut.h>
+#include <rddbheartbeat.h>
+#include <rdescape_string.h>
 #include <rdimport.h>
 #include <rdlibrary_conf.h>
-#include <rdescape_string.h>
-#include <rddbheartbeat.h>
-#include <rdaudioimport.h>
+#include <rdtempdirectory.h>
 
 volatile bool import_run=true;
 
@@ -1488,7 +1489,7 @@ RDWaveFile *MainObject::FixFile(const QString &filename,RDWaveData *wavedata)
   // Copy File
   //
   import_temp_fix_filename=
-    QString(tempnam(RDTempDir(),"rdfix"))+QString(".wav");
+    QString(tempnam(RDTempDirectory::basePath(),"rdfix"))+QString(".wav");
   if(import_temp_fix_filename.isNull()) {
     return NULL;
   }