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

hgweb: do not import uuid immediately to avoid its side effect...

hgweb: do not import uuid immediately to avoid its side effect With hgdemandimport disabled (chg's case), `import uuid` has an immediate side effect calling `ctypes.util.find_library` trying to locate the `libuuid` library. This happens at `import` time before `dispatch.run()`. The call trace is like: File "hg/hg", line 54, in <module> from mercurial import ( File "hg/mercurial/dispatch.py", line 24, in <module> from . import ( File "hg/mercurial/commands.py", line 23, in <module> from . import ( File "hg/mercurial/help.py", line 33, in <module> from .hgweb import ( File "hg/mercurial/hgweb/__init__.py", line 20, in <module> from . import ( File "hg/mercurial/hgweb/hgweb_mod.py", line 14, in <module> from .common import ( File "hg/mercurial/hgweb/common.py", line 15, in <module> import uuid File "/usr/lib64/python2.7/uuid.py", line 404, in <module> lib = ctypes.CDLL(ctypes.util.find_library(libname)) The problem is, `ctypes.util.find_library` will execute `sh -c '/sbin/ldconfig -p 2>/dev/null'` on Python <= 2.7.12. The output of `sh` may pollute the terminal: shell-init: error retrieving current directory: getcwd: cannot access parent directories: No such file or directory This patch moves `import uuid` so its side-effect can only happen after the cwd check in `dispatch._getlocal`. Therefore the terminal won't be polluted by importing `uuid`. Differential Revision: https://phab.mercurial-scm.org/D1024

Martin von Zweigbergk - - Load All Authors

File last commit:

r32646:b4356d1c default


                r34644:f42dec9c

default

Download file

             bitmanipulation.h
        
                    55 lines
            
             | 954 B
            
                | text/x-c
            
             |
                CLexer
            
             / mercurial / bitmanipulation.h
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #ifndef _HG_BITMANIPULATION_H_

      #define _HG_BITMANIPULATION_H_

      #include <string.h>

      #include "compat.h"

      static inline uint32_t getbe32(const char *c)

      {

      	const unsigned char *d = (const unsigned char *)c;

      	return ((d[0] << 24) |

      		(d[1] << 16) |

      		(d[2] << 8) |

      		(d[3]));

      }

      static inline int16_t getbeint16(const char *c)

      {

      	const unsigned char *d = (const unsigned char *)c;

      	return ((d[0] << 8) |

      		(d[1]));

      }

      static inline uint16_t getbeuint16(const char *c)

      {

      	const unsigned char *d = (const unsigned char *)c;

      	return ((d[0] << 8) |

      		(d[1]));

      }

      static inline void putbe32(uint32_t x, char *c)

      {

      	c[0] = (x >> 24) & 0xff;

      	c[1] = (x >> 16) & 0xff;

      	c[2] = (x >> 8) & 0xff;

      	c[3] = (x) & 0xff;

      }

      static inline double getbefloat64(const char *c)

      {

      	const unsigned char *d = (const unsigned char *)c;

      	double ret;

      	int i;

      	uint64_t t = 0;

      	for (i = 0; i < 8; i++) {

      		t = (t<<8) + d[i];

      	}

      	memcpy(&ret, &t, sizeof(t));

      	return ret;

      }

      #endif

	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

				#ifndef _HG_BITMANIPULATION_H_
				#define _HG_BITMANIPULATION_H_

				#include <string.h>

				#include "compat.h"

				static inline uint32_t getbe32(const char *c)
				{
				const unsigned char d = (const unsigned char )c;

				return ((d[0] << 24) \|
				(d[1] << 16) \|
				(d[2] << 8) \|
				(d[3]));
				}

				static inline int16_t getbeint16(const char *c)
				{
				const unsigned char d = (const unsigned char )c;

				return ((d[0] << 8) \|
				(d[1]));
				}

				static inline uint16_t getbeuint16(const char *c)
				{
				const unsigned char d = (const unsigned char )c;

				return ((d[0] << 8) \|
				(d[1]));
				}

				static inline void putbe32(uint32_t x, char *c)
				{
				c[0] = (x >> 24) & 0xff;
				c[1] = (x >> 16) & 0xff;
				c[2] = (x >> 8) & 0xff;
				c[3] = (x) & 0xff;
				}

				static inline double getbefloat64(const char *c)
				{
				const unsigned char d = (const unsigned char )c;
				double ret;
				int i;
				uint64_t t = 0;
				for (i = 0; i < 8; i++) {
				t = (t<<8) + d[i];
				}
				memcpy(&ret, &t, sizeof(t));
				return ret;
				}

				#endif