[Bf-blender-cvs] [a258925] master: Fix T46531: Cannot use % in filenames.

Bastien Montagne noreply at git.blender.org
Sun Oct 18 18:52:53 CEST 2015


Commit: a25892543a7a81d6823c71d0bc54978b00e7a9b1
Author: Bastien Montagne
Date:   Sun Oct 18 18:51:08 2015 +0200
Branches: master
https://developer.blender.org/rBa25892543a7a81d6823c71d0bc54978b00e7a9b1

Fix T46531: Cannot use % in filenames.

Same case as with space char really, one should not use those special chars in
filenames, but they are globally supported by all current FS/OS, so no real reason
to enforce that behvior on users here.

To be backported to 'a' release.

===================================================================

M	source/blender/blenlib/intern/path_util.c

===================================================================

diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c
index c94ce84..99e5124 100644
--- a/source/blender/blenlib/intern/path_util.c
+++ b/source/blender/blenlib/intern/path_util.c
@@ -436,6 +436,7 @@ void BLI_cleanup_file(const char *relabase, char *path)
  * \note Space case ' ' is a bit of an edge case here - in theory it is allowed, but again can be an issue
  *       in some cases, so we simply replace it by an underscore too (good practice anyway).
  *       REMOVED based on popular demand (see T45900).
+ *       Percent '%' char is a bit same case - not recommended to use it, but supported by all decent FS/OS around...
  *
  * \note On Windows, it also ensures there is no '.' (dot char) at the end of the file, this can lead to issues...
  *
@@ -446,7 +447,7 @@ bool BLI_filename_make_safe(char *fname)
 {
 	const char *invalid = "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"
 	                      "\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"
-	                      "/\\?%*:|\"<>";
+	                      "/\\?*:|\"<>";
 	char *fn;
 	bool changed = false;




More information about the Bf-blender-cvs mailing list