From 59c19a9e17bd2a8dce06670fcd6a747d2430c308 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Mon, 23 Jul 2018 17:17:32 +0000 Subject: [PATCH] 2018-07-23 Fred Gleason * Cleaned up RDConf calls to ensure UTF-8 compatibility. --- ChangeLog | 2 ++ lib/rdconf.cpp | 36 ++++++++++++++++-------------------- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index f9b30d11..c19a7d59 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17210,3 +17210,5 @@ * Fixed a buffer overflow vulnerability in the 'RDCddbLookup' class. 2018-07-23 Fred Gleason * Cleaned up CDDA calls to ensure UTF-8 compatibility. +2018-07-23 Fred Gleason + * Cleaned up RDConf calls to ensure UTF-8 compatibility. diff --git a/lib/rdconf.cpp b/lib/rdconf.cpp index 7519d444..65a039d2 100644 --- a/lib/rdconf.cpp +++ b/lib/rdconf.cpp @@ -2,7 +2,7 @@ // // Small library for handling common configuration file tasks // -// (C) Copyright 1996-2003 Fred Gleason +// (C) Copyright 1996-2018 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU Library General Public License @@ -500,8 +500,7 @@ QString RDGetDisplay(bool strip_point) int l; if(getenv("DISPLAY")[0]==':') { - display=QString().sprintf("%s%s",(const char *)RDGetHostAddr().toString(), - getenv("DISPLAY")); + display=RDGetHostAddr().toString()+getenv("DISPLAY"); } else { display=QString(getenv("DISPLAY")); @@ -702,29 +701,30 @@ QString RDGetTimeLength(int mseconds,bool leadzero,bool tenths) tenthsecs=mseconds/100; if(leadzero) { if(tenths) { - return QString().sprintf("%s%d:%02d:%02d.%d",negative,hour,min,seconds, - tenthsecs); + return QString(negative)+ + QString().sprintf("%d:%02d:%02d.%d",hour,min,seconds,tenthsecs); } - return QString().sprintf("%s%d:%02d:%02d",negative,hour,min,seconds); + return QString(negative)+ + QString().sprintf("%d:%02d:%02d",hour,min,seconds); } if((hour==0)&&(min==0)) { if(tenths) { - return QString().sprintf("%s:%02d.%d",negative,seconds,tenthsecs); + return QString(negative)+QString().sprintf(":%02d.%d",seconds,tenthsecs); } - return QString().sprintf("%s:%02d",negative,seconds); + return QString(negative)+QString().sprintf(":%02d",seconds); } if(hour==0) { if(tenths) { - return QString().sprintf("%s%2d:%02d.%d",negative,min,seconds, - tenthsecs); + return QString(negative)+ + QString().sprintf("%2d:%02d.%d",min,seconds,tenthsecs); } - return QString().sprintf("%s%2d:%02d",negative,min,seconds); + return QString(negative)+QString().sprintf("%2d:%02d",min,seconds); } if(tenths) { - return QString().sprintf("%s%2d:%02d:%02d.%d",negative,hour,min,seconds, - tenthsecs); + return QString(negative)+ + QString().sprintf("%2d:%02d:%02d.%d",hour,min,seconds,tenthsecs); } - return QString().sprintf("%s%2d:%02d:%02d",negative,hour,min,seconds); + return QString(negative)+QString().sprintf("%2d:%02d:%02d",hour,min,seconds); } @@ -848,9 +848,7 @@ bool RDWritePid(const QString &dirname,const QString &filename,int owner, { FILE *file; mode_t prev_mask; - QString pathname=QString().sprintf("%s/%s", - (const char *)dirname, - (const char *)filename); + QString pathname=dirname+"/"+filename; prev_mask = umask(0113); // Set umask so pid files are user and group writable. file=fopen((const char *)pathname,"w"); @@ -868,9 +866,7 @@ bool RDWritePid(const QString &dirname,const QString &filename,int owner, void RDDeletePid(const QString &dirname,const QString &filename) { - QString pid=QString().sprintf("%s/%s", - (const char *)dirname, - (const char *)filename); + QString pid=dirname+"/"+filename; unlink((const char *)pid); }