upstream/mercurial-mirror Files · mercurial/util.h

win32mbcs: wrap underlying pycompat.bytestr to use checkwinfilename safely...

win32mbcs: wrap underlying pycompat.bytestr to use checkwinfilename safely win32mbcs wraps some functions, to prevent them from unintentionally treating backslash (0x5c), which is used as the second or later byte of multi bytes characters by problematic encodings, as a path component delimiter on Windows platform. This wrapping assumes that wrapped functions can safely accept unicode string arguments. Unfortunately, broke this assumption by introducing pycompat.bytestr() into util.checkwinfilename() for py3 support. After that, wrapped checkwinfilename() always fails for non-ASCII filename at pycompat.bytestr() invocation. This patch wraps underlying pycompat.bytestr() function to use util.checkwinfilename() safely. To avoid similar regression in the future, another patch series will add smoke testing on default branch.

Gregory Szorc - - Load All Authors

File last commit:

r30112:9b6ff0f9 default


                r32244:176ed32d

stable

Download file

             util.h
        
                    45 lines
            
             | 981 B
            
                | text/x-c
            
             |
                CLexer
            
             / mercurial / util.h
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      /*

       util.h - utility functions for interfacing with the various python APIs.

       This software may be used and distributed according to the terms of

       the GNU General Public License, incorporated herein by reference.

      */

      #ifndef _HG_UTIL_H_

      #define _HG_UTIL_H_

      #include "compat.h"

      #if PY_MAJOR_VERSION >= 3

      #define IS_PY3K

      #endif

      typedef struct {

      	PyObject_HEAD

      	char state;

      	int mode;

      	int size;

      	int mtime;

      } dirstateTupleObject;

      extern PyTypeObject dirstateTupleType;

      #define dirstate_tuple_check(op) (Py_TYPE(op) == &dirstateTupleType)

      /* This should be kept in sync with normcasespecs in encoding.py. */

      enum normcase_spec {

      	NORMCASE_LOWER = -1,

      	NORMCASE_UPPER = 1,

      	NORMCASE_OTHER = 0

      };

      #define MIN(a, b) (((a)<(b))?(a):(b))

      /* VC9 doesn't include bool and lacks stdbool.h based on my searching */

      #if defined(_MSC_VER) || __STDC_VERSION__ < 199901L

      #define true 1

      #define false 0

      typedef unsigned char bool;

      #else

      #include <stdbool.h>

      #endif

      #endif /* _HG_UTIL_H_ */

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				/*
				util.h - utility functions for interfacing with the various python APIs.

				This software may be used and distributed according to the terms of
				the GNU General Public License, incorporated herein by reference.
				*/

				#ifndef _HG_UTIL_H_
				#define _HG_UTIL_H_

				#include "compat.h"

				#if PY_MAJOR_VERSION >= 3
				#define IS_PY3K
				#endif

				typedef struct {
				PyObject_HEAD
				char state;
				int mode;
				int size;
				int mtime;
				} dirstateTupleObject;

				extern PyTypeObject dirstateTupleType;
				#define dirstate_tuple_check(op) (Py_TYPE(op) == &dirstateTupleType)

				/* This should be kept in sync with normcasespecs in encoding.py. */
				enum normcase_spec {
				NORMCASE_LOWER = -1,
				NORMCASE_UPPER = 1,
				NORMCASE_OTHER = 0
				};

				#define MIN(a, b) (((a)<(b))?(a):(b))
				/* VC9 doesn't include bool and lacks stdbool.h based on my searching */
				#if defined(_MSC_VER) \|\| __STDC_VERSION__ < 199901L
				#define true 1
				#define false 0
				typedef unsigned char bool;
				#else
				#include <stdbool.h>
				#endif

				#endif /* _HG_UTIL_H_ */