From: Cloudwalk <cloudwalk009@gmail.com>
Date: Wed, 26 May 2021 04:32:37 +0000 (-0400)
Subject: Merge branch 'master' into Mario/wrath-darkplaces_extra
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e0fb2cedfda06a98fd9eb199bb8862a89d7a5eed;p=xonotic%2Fdarkplaces.git

Merge branch 'master' into Mario/wrath-darkplaces_extra
---

e0fb2cedfda06a98fd9eb199bb8862a89d7a5eed
diff --cc fs.h
index 4bcca8a2,b8ada8b9..4f85fb48
--- a/fs.h
+++ b/fs.h
@@@ -85,7 -85,7 +85,8 @@@ void FS_Purge (qfile_t* file)
  const char *FS_FileWithoutPath (const char *in);
  const char *FS_FileExtension (const char *in);
  int FS_CheckNastyPath (const char *path, qbool isgamedir);
 +int FS_rmtree(const char *dir);
+ void FS_SanitizePath (char *path);
  
  extern const char *const fs_checkgamedir_missing; // "(missing)"
  const char *FS_CheckGameDir(const char *gamedir); // returns NULL if nasty, fs_checkgamedir_missing (exact pointer) if missing