[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58117] branches/ soc-2013-meshdata_transfer/source/blender/blenkernel/intern/autoexec.c: repair bad merge

Campbell Barton ideasman42 at gmail.com
Tue Jul 9 12:15:04 CEST 2013


Revision: 58117
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58117
Author:   campbellbarton
Date:     2013-07-09 10:15:04 +0000 (Tue, 09 Jul 2013)
Log Message:
-----------
repair bad merge

Added Paths:
-----------
    branches/soc-2013-meshdata_transfer/source/blender/blenkernel/intern/autoexec.c

Copied: branches/soc-2013-meshdata_transfer/source/blender/blenkernel/intern/autoexec.c (from rev 58116, trunk/blender/source/blender/blenkernel/intern/autoexec.c)
===================================================================
--- branches/soc-2013-meshdata_transfer/source/blender/blenkernel/intern/autoexec.c	                        (rev 0)
+++ branches/soc-2013-meshdata_transfer/source/blender/blenkernel/intern/autoexec.c	2013-07-09 10:15:04 UTC (rev 58117)
@@ -0,0 +1,70 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Contributor(s): Blender Foundation 2013
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/blenkernel/intern/autoexec.c
+ *  \ingroup bke
+ *
+ * Currently just checks if a blend file can be trusted to autoexec,
+ * may add signing here later.
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "DNA_userdef_types.h"
+
+#include "BLI_utildefines.h"
+#include "BLI_fnmatch.h"
+#include "BLI_string.h"
+#include "BLI_path_util.h"
+
+#include "BKE_autoexec.h"  /* own include */
+
+/**
+ * \param path  The path to check against.
+ * \return Success
+ */
+bool BKE_autoexec_match(const char *path)
+{
+	bPathCompare *path_cmp;
+
+#ifdef WIN32
+	const int fnmatch_flags = FNM_CASEFOLD;
+#else
+	const int fnmatch_flags = 0;
+#endif
+
+	BLI_assert((U.flag & USER_SCRIPT_AUTOEXEC_DISABLE) == 0);
+
+	for (path_cmp = U.autoexec_paths.first; path_cmp; path_cmp = path_cmp->next) {
+		if ((path_cmp->flag & USER_PATHCMP_GLOB)) {
+			if (fnmatch(path_cmp->path, path, fnmatch_flags) == 0) {
+				return true;
+			}
+		}
+		else if (BLI_path_ncmp(path_cmp->path, path, strlen(path_cmp->path)) == 0) {
+			return true;
+		}
+	}
+
+	return false;
+}




More information about the Bf-blender-cvs mailing list