Small refactors in utility/shared.h/cpp

common/mapimg.cpp

@@ -1989,7 +1989,7 @@ static bool img_save(const struct img *pimg, const char *mapimgfile,
     return false;
   }
 
-  if (!path_is_absolute(mapimgfile) && path != nullptr) {
+  if (!QFileInfo(mapimgfile).isAbsolute() && path != nullptr) {
     make_dir(path);
 
     sz_strlcpy(tmpname, path);

server/savegame/savemain.cpp

@@ -243,7 +243,7 @@ void save_game(const char *orig_filename, const char *save_reason,
     }
   }
 
-  if (!path_is_absolute(stdata->filepath)) {
+  if (!QFileInfo(stdata->filepath).isAbsolute()) {
     QString tmpname;
 
     if (!scenario) {

utility/shared.cpp

@@ -657,25 +657,20 @@ QVector<QString> *fileinfolist(const QStringList &dirs, const char *suffix)
    Returns a filename to access the specified file from a
    directory by searching all specified directories for the file.
 
-   If the specified 'filename' is nullptr, the returned string contains
+   If the specified 'filename' is empty, the returned string contains
    the effective path.  (But this should probably only be used for
    debug output.)
 
-   Returns nullptr if the specified filename cannot be found in any of the
-   data directories.  (A file is considered "found" if it can be
-   read-opened.)  The returned pointer points to static memory, so this
-   function can only supply one filename at a time.  Don't free that
-   pointer.
-
-   TODO: Make this re-entrant
+   Returns an empty string if the specified filename cannot be found
+   in any of the data directories.
  */
-QString fileinfoname(const QStringList &dirs, const char *filename)
+QString fileinfoname(const QStringList &dirs, const QString &filename)
 {
   if (dirs.isEmpty()) {
     return QString();
   }
 
-  if (!filename) {
+  if (filename.isEmpty()) {
     bool first = true;
 
     realfile->clear();
@@ -700,7 +695,8 @@ QString fileinfoname(const QStringList &dirs, const char *filename)
     }
   }
 
-  qDebug("Could not find readable file \"%s\" in data path.", filename);
+  qDebug("Could not find readable file \"%s\" in data path.",
+         qUtf8Printable(filename));
 
   return nullptr;
 }
@@ -731,7 +727,7 @@ QFileInfoList find_files_in_path(const QStringList &path,
               [](const auto &lhs, const auto &rhs) {
                 return lhs.absoluteFilePath() < rhs.absoluteFilePath();
               });
-    std::unique(files.begin(), files.end());
+    files.erase(std::unique(files.begin(), files.end()), files.end());
   }
 
   // Sort the list by last modification time.
@@ -1185,28 +1181,6 @@ bool make_dir(const char *pathname)
   return r;
 }
 
-/**
-   Returns TRUE if the filename's path is absolute.
- */
-bool path_is_absolute(const char *filename)
-{
-  if (!filename) {
-    return false;
-  }
-
-#ifdef FREECIV_MSWINDOWS
-  if (strchr(filename, ':')) {
-    return true;
-  }
-#else  // FREECIV_MSWINDOWS
-  if (filename[0] == '/') {
-    return true;
-  }
-#endif // FREECIV_MSWINDOWS
-
-  return false;
-}
-
 /**
    Scan in a word or set of words from start to but not including
    any of the given delimiters. The buf pointer will point past delimiter,

utility/shared.h

@@ -134,7 +134,7 @@ const QStringList &get_scenario_dirs();
 QVector<QString> *fileinfolist(const QStringList &dirs, const char *suffix);
 QFileInfoList find_files_in_path(const QStringList &path,
                                  const QString &pattern, bool nodups);
-QString fileinfoname(const QStringList &dirs, const char *filename);
+QString fileinfoname(const QStringList &dirs, const QString &filename);
 
 void init_nls();
 void free_nls();
@@ -183,7 +183,6 @@ void interpret_tilde(char *buf, size_t buf_size, const QString &filename);
 char *interpret_tilde_alloc(const char *filename);
 
 bool make_dir(const char *pathname);
-bool path_is_absolute(const char *filename);
 
 char scanin(char **buf, char *delimiters, char *dest, int size);