2005-12-05 22:54:29 +03:00
|
|
|
#ifndef GIT_COMPAT_UTIL_H
|
|
|
|
#define GIT_COMPAT_UTIL_H
|
|
|
|
|
2007-02-17 12:13:10 +03:00
|
|
|
#define _FILE_OFFSET_BITS 64
|
|
|
|
|
2006-01-07 12:33:54 +03:00
|
|
|
#ifndef FLEX_ARRAY
|
2007-11-20 23:08:06 +03:00
|
|
|
/*
|
|
|
|
* See if our compiler is known to support flexible array members.
|
|
|
|
*/
|
git-compat-util.h: avoid using c99 flex array feature with Sun compiler 5.8
The Sun c99 compiler as recent as version 5.8 Patch 121016-06 2007/08/01
produces an error when compiling diff-delta.c. This source file #includes
the delta.h header file which pre-declares a struct which is later defined
to contain a flex array member. The Sun c99 compiler fails to compile
diff-delta.c and gives the following error:
"diff-delta.c", line 314: identifier redeclared: create_delta
current : function(pointer to const struct delta_index {unsigned long memsize, pointer to const void src_buf, unsigned long src_size, unsigned int hash_mask, array[-1] of pointer to struct index_entry {..} hash}, pointer to const void, unsigned long, pointer to unsigned long, unsigned long) returning pointer to void
previous: function(pointer to const struct delta_index {unsigned long memsize, pointer to const void src_buf, unsigned long src_size, unsigned int hash_mask, array[-1] of pointer to struct index_entry {..} hash}, pointer to const void, unsigned long, pointer to unsigned long, unsigned long) returning pointer to void : "delta.h", line 44
c99: acomp failed for diff-delta.c
So, avoid using this c99 feature when compiling with the Sun c compilers
version 5.8 and older (the most recent version tested).
Signed-off-by: Brandon Casey <drafnel@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-06-09 03:53:48 +04:00
|
|
|
#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) && (!defined(__SUNPRO_C) || (__SUNPRO_C > 0x580))
|
2007-11-20 23:08:06 +03:00
|
|
|
# define FLEX_ARRAY /* empty */
|
|
|
|
#elif defined(__GNUC__)
|
|
|
|
# if (__GNUC__ >= 3)
|
|
|
|
# define FLEX_ARRAY /* empty */
|
|
|
|
# else
|
|
|
|
# define FLEX_ARRAY 0 /* older GNU extension */
|
|
|
|
# endif
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Otherwise, default to safer but a bit wasteful traditional style
|
|
|
|
*/
|
|
|
|
#ifndef FLEX_ARRAY
|
|
|
|
# define FLEX_ARRAY 1
|
2006-01-07 12:33:54 +03:00
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
2006-03-09 22:58:05 +03:00
|
|
|
#define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
|
2009-07-23 01:34:34 +04:00
|
|
|
#define bitsizeof(x) (CHAR_BIT * sizeof(x))
|
2006-03-09 22:58:05 +03:00
|
|
|
|
2007-04-09 09:06:29 +04:00
|
|
|
#ifdef __GNUC__
|
|
|
|
#define TYPEOF(x) (__typeof__(x))
|
|
|
|
#else
|
|
|
|
#define TYPEOF(x)
|
|
|
|
#endif
|
|
|
|
|
2009-07-23 01:34:34 +04:00
|
|
|
#define MSB(x, bits) ((x) & TYPEOF(x)(~0ULL << (bitsizeof(x) - (bits))))
|
2007-11-07 13:20:27 +03:00
|
|
|
#define HAS_MULTI_BITS(i) ((i) & ((i) - 1)) /* checks if an integer has more than 1 bit set */
|
2007-04-09 09:06:29 +04:00
|
|
|
|
2009-07-23 01:34:35 +04:00
|
|
|
#define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d))
|
|
|
|
|
2007-05-15 20:33:25 +04:00
|
|
|
/* Approximation of the length of the decimal representation of this type. */
|
|
|
|
#define decimal_length(x) ((int)(sizeof(x) * 2.56 + 0.5) + 1)
|
|
|
|
|
2009-06-06 03:36:13 +04:00
|
|
|
#if defined(__sun__)
|
|
|
|
/*
|
|
|
|
* On Solaris, when _XOPEN_EXTENDED is set, its header file
|
|
|
|
* forces the programs to be XPG4v2, defeating any _XOPEN_SOURCE
|
|
|
|
* setting to say we are XPG5 or XPG6. Also on Solaris,
|
|
|
|
* XPG6 programs must be compiled with a c99 compiler, while
|
|
|
|
* non XPG6 programs must be compiled with a pre-c99 compiler.
|
|
|
|
*/
|
|
|
|
# if __STDC_VERSION__ - 0 >= 199901L
|
|
|
|
# define _XOPEN_SOURCE 600
|
|
|
|
# else
|
|
|
|
# define _XOPEN_SOURCE 500
|
|
|
|
# endif
|
2010-04-02 11:52:09 +04:00
|
|
|
#elif !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__USLC__) && \
|
2010-06-02 05:55:36 +04:00
|
|
|
!defined(_M_UNIX) && !defined(__sgi) && !defined(__DragonFly__)
|
2006-12-20 01:34:12 +03:00
|
|
|
#define _XOPEN_SOURCE 600 /* glibc2 and AIX 5.3L need 500, OpenBSD needs 600 for S_ISLNK() */
|
|
|
|
#define _XOPEN_SOURCE_EXTENDED 1 /* AIX 5.3L needs this */
|
2006-12-21 04:32:21 +03:00
|
|
|
#endif
|
2007-01-16 04:34:49 +03:00
|
|
|
#define _ALL_SOURCE 1
|
|
|
|
#define _GNU_SOURCE 1
|
|
|
|
#define _BSD_SOURCE 1
|
2009-04-26 17:49:00 +04:00
|
|
|
#define _NETBSD_SOURCE 1
|
git-compat-util.h: adjust for SGI IRIX 6.5
Don't define _XOPEN_SOURCE
Do define _SGI_SOURCE
Defining _XOPEN_SOURCE prevents many of the common functions and macros
from being defined. _Not_ setting _XOPEN_SOURCE, and instead setting
_SGI_SOURCE, provides all of the XPG4, XPG5, BSD, POSIX functions and
declarations, _BUT_ provides a horribly broken snprintf(). SGI does have
a working snprintf(), but it is only provided when _NO_XOPEN5 evaluates
to zero, and this only happens if _XOPEN_SOURCE is defined which, as
mentioned above, prevents many other common functions and defines.
The broken snprintf will be worked around with SNPRINTF_RETURNS_BOGUS in
the Makefile in a later patch.
Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-07-10 21:10:44 +04:00
|
|
|
#define _SGI_SOURCE 1
|
2006-12-20 01:34:12 +03:00
|
|
|
|
2009-09-16 12:20:26 +04:00
|
|
|
#ifdef WIN32 /* Both MinGW and MSVC */
|
|
|
|
#define WIN32_LEAN_AND_MEAN /* stops windows.h including winsock.h */
|
|
|
|
#include <winsock2.h>
|
|
|
|
#include <windows.h>
|
|
|
|
#endif
|
|
|
|
|
2005-12-05 22:54:29 +03:00
|
|
|
#include <unistd.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <sys/stat.h>
|
|
|
|
#include <fcntl.h>
|
|
|
|
#include <stddef.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <stdarg.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <errno.h>
|
|
|
|
#include <limits.h>
|
|
|
|
#include <sys/param.h>
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <dirent.h>
|
2006-12-20 01:34:12 +03:00
|
|
|
#include <sys/time.h>
|
|
|
|
#include <time.h>
|
|
|
|
#include <signal.h>
|
|
|
|
#include <fnmatch.h>
|
2007-12-01 23:24:59 +03:00
|
|
|
#include <assert.h>
|
|
|
|
#include <regex.h>
|
|
|
|
#include <utime.h>
|
|
|
|
#ifndef __MINGW32__
|
|
|
|
#include <sys/wait.h>
|
2006-12-20 01:34:12 +03:00
|
|
|
#include <sys/poll.h>
|
|
|
|
#include <sys/socket.h>
|
2007-11-13 23:05:01 +03:00
|
|
|
#include <sys/ioctl.h>
|
2010-01-11 13:41:01 +03:00
|
|
|
#include <termios.h>
|
2008-01-24 21:34:46 +03:00
|
|
|
#ifndef NO_SYS_SELECT_H
|
2007-11-13 23:05:01 +03:00
|
|
|
#include <sys/select.h>
|
2008-01-24 21:34:46 +03:00
|
|
|
#endif
|
2006-12-20 01:34:12 +03:00
|
|
|
#include <netinet/in.h>
|
|
|
|
#include <netinet/tcp.h>
|
|
|
|
#include <arpa/inet.h>
|
|
|
|
#include <netdb.h>
|
|
|
|
#include <pwd.h>
|
2007-01-26 00:11:40 +03:00
|
|
|
#include <inttypes.h>
|
2007-03-03 21:28:52 +03:00
|
|
|
#if defined(__CYGWIN__)
|
|
|
|
#undef _XOPEN_SOURCE
|
|
|
|
#include <grp.h>
|
|
|
|
#define _XOPEN_SOURCE 600
|
2008-09-30 17:53:47 +04:00
|
|
|
#include "compat/cygwin.h"
|
2007-03-03 21:28:52 +03:00
|
|
|
#else
|
2007-01-16 04:34:49 +03:00
|
|
|
#undef _ALL_SOURCE /* AIX 5.3L defines a struct list with _ALL_SOURCE. */
|
2006-12-20 01:34:12 +03:00
|
|
|
#include <grp.h>
|
2007-01-16 04:34:49 +03:00
|
|
|
#define _ALL_SOURCE 1
|
2007-03-03 21:28:52 +03:00
|
|
|
#endif
|
2007-12-01 23:24:59 +03:00
|
|
|
#else /* __MINGW32__ */
|
|
|
|
/* pull in Windows compatibility stuff */
|
|
|
|
#include "compat/mingw.h"
|
|
|
|
#endif /* __MINGW32__ */
|
2009-09-16 12:20:25 +04:00
|
|
|
#ifdef _MSC_VER
|
|
|
|
#include "compat/msvc.h"
|
|
|
|
#endif
|
2006-12-20 01:34:12 +03:00
|
|
|
|
2009-05-31 12:35:51 +04:00
|
|
|
#ifndef NO_LIBGEN_H
|
|
|
|
#include <libgen.h>
|
|
|
|
#else
|
|
|
|
#define basename gitbasename
|
|
|
|
extern char *gitbasename(char *);
|
|
|
|
#endif
|
|
|
|
|
2006-12-20 01:34:12 +03:00
|
|
|
#ifndef NO_ICONV
|
|
|
|
#include <iconv.h>
|
|
|
|
#endif
|
2005-12-05 22:54:29 +03:00
|
|
|
|
2008-07-10 01:29:00 +04:00
|
|
|
#ifndef NO_OPENSSL
|
|
|
|
#include <openssl/ssl.h>
|
|
|
|
#include <openssl/err.h>
|
|
|
|
#endif
|
|
|
|
|
2006-09-16 09:47:21 +04:00
|
|
|
/* On most systems <limits.h> would have given us this, but
|
|
|
|
* not on some systems (e.g. GNU/Hurd).
|
|
|
|
*/
|
|
|
|
#ifndef PATH_MAX
|
|
|
|
#define PATH_MAX 4096
|
|
|
|
#endif
|
|
|
|
|
2007-03-07 04:44:30 +03:00
|
|
|
#ifndef PRIuMAX
|
|
|
|
#define PRIuMAX "llu"
|
|
|
|
#endif
|
|
|
|
|
2008-07-10 00:38:14 +04:00
|
|
|
#ifndef PRIu32
|
|
|
|
#define PRIu32 "u"
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifndef PRIx32
|
|
|
|
#define PRIx32 "x"
|
|
|
|
#endif
|
|
|
|
|
2007-12-03 23:55:57 +03:00
|
|
|
#ifndef PATH_SEP
|
|
|
|
#define PATH_SEP ':'
|
|
|
|
#endif
|
|
|
|
|
2010-04-13 13:07:13 +04:00
|
|
|
#ifdef HAVE_PATHS_H
|
|
|
|
#include <paths.h>
|
|
|
|
#endif
|
|
|
|
#ifndef _PATH_DEFPATH
|
|
|
|
#define _PATH_DEFPATH "/usr/local/bin:/usr/bin:/bin"
|
|
|
|
#endif
|
|
|
|
|
2007-12-08 22:57:25 +03:00
|
|
|
#ifndef STRIP_EXTENSION
|
|
|
|
#define STRIP_EXTENSION ""
|
|
|
|
#endif
|
|
|
|
|
2008-03-05 23:51:27 +03:00
|
|
|
#ifndef has_dos_drive_prefix
|
|
|
|
#define has_dos_drive_prefix(path) 0
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifndef is_dir_sep
|
|
|
|
#define is_dir_sep(c) ((c) == '/')
|
|
|
|
#endif
|
|
|
|
|
2005-12-05 22:54:29 +03:00
|
|
|
#ifdef __GNUC__
|
|
|
|
#define NORETURN __attribute__((__noreturn__))
|
2009-09-30 22:05:50 +04:00
|
|
|
#define NORETURN_PTR __attribute__((__noreturn__))
|
2010-01-20 22:45:12 +03:00
|
|
|
#elif defined(_MSC_VER)
|
|
|
|
#define NORETURN __declspec(noreturn)
|
|
|
|
#define NORETURN_PTR
|
2005-12-05 22:54:29 +03:00
|
|
|
#else
|
|
|
|
#define NORETURN
|
2009-09-30 22:05:50 +04:00
|
|
|
#define NORETURN_PTR
|
2005-12-05 22:54:29 +03:00
|
|
|
#ifndef __attribute__
|
|
|
|
#define __attribute__(x)
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
2009-08-18 23:26:55 +04:00
|
|
|
#include "compat/bswap.h"
|
|
|
|
|
2005-12-05 22:54:29 +03:00
|
|
|
/* General helper functions */
|
2010-03-06 18:40:39 +03:00
|
|
|
extern void vreportf(const char *prefix, const char *err, va_list params);
|
2009-09-30 22:05:49 +04:00
|
|
|
extern NORETURN void usage(const char *err);
|
2009-11-09 18:05:02 +03:00
|
|
|
extern NORETURN void usagef(const char *err, ...) __attribute__((format (printf, 1, 2)));
|
2009-09-30 22:05:49 +04:00
|
|
|
extern NORETURN void die(const char *err, ...) __attribute__((format (printf, 1, 2)));
|
|
|
|
extern NORETURN void die_errno(const char *err, ...) __attribute__((format (printf, 1, 2)));
|
2005-12-05 22:54:29 +03:00
|
|
|
extern int error(const char *err, ...) __attribute__((format (printf, 1, 2)));
|
2007-03-31 03:07:05 +04:00
|
|
|
extern void warning(const char *err, ...) __attribute__((format (printf, 1, 2)));
|
2005-12-05 22:54:29 +03:00
|
|
|
|
2009-09-30 22:05:50 +04:00
|
|
|
extern void set_die_routine(NORETURN_PTR void (*routine)(const char *err, va_list params));
|
2006-06-24 06:34:38 +04:00
|
|
|
|
2008-01-03 12:23:12 +03:00
|
|
|
extern int prefixcmp(const char *str, const char *prefix);
|
2009-11-26 05:23:55 +03:00
|
|
|
extern int suffixcmp(const char *str, const char *suffix);
|
2008-01-03 12:23:12 +03:00
|
|
|
|
2008-06-27 20:21:56 +04:00
|
|
|
static inline const char *skip_prefix(const char *str, const char *prefix)
|
|
|
|
{
|
|
|
|
size_t len = strlen(prefix);
|
|
|
|
return strncmp(str, prefix, len) ? NULL : str + len;
|
|
|
|
}
|
|
|
|
|
2009-03-13 18:50:45 +03:00
|
|
|
#if defined(NO_MMAP) || defined(USE_WIN32_MMAP)
|
2005-12-05 22:54:29 +03:00
|
|
|
|
|
|
|
#ifndef PROT_READ
|
|
|
|
#define PROT_READ 1
|
|
|
|
#define PROT_WRITE 2
|
|
|
|
#define MAP_PRIVATE 1
|
|
|
|
#endif
|
|
|
|
|
2006-12-24 08:45:37 +03:00
|
|
|
#define mmap git_mmap
|
|
|
|
#define munmap git_munmap
|
|
|
|
extern void *git_mmap(void *start, size_t length, int prot, int flags, int fd, off_t offset);
|
|
|
|
extern int git_munmap(void *start, size_t length);
|
2005-12-05 22:54:29 +03:00
|
|
|
|
2009-03-13 18:50:45 +03:00
|
|
|
#else /* NO_MMAP || USE_WIN32_MMAP */
|
|
|
|
|
|
|
|
#include <sys/mman.h>
|
|
|
|
|
|
|
|
#endif /* NO_MMAP || USE_WIN32_MMAP */
|
|
|
|
|
|
|
|
#ifdef NO_MMAP
|
|
|
|
|
2007-02-15 00:20:41 +03:00
|
|
|
/* This value must be multiple of (pagesize * 2) */
|
2006-12-24 08:46:13 +03:00
|
|
|
#define DEFAULT_PACKED_GIT_WINDOW_SIZE (1 * 1024 * 1024)
|
|
|
|
|
2005-12-05 22:54:29 +03:00
|
|
|
#else /* NO_MMAP */
|
|
|
|
|
2007-02-15 00:20:41 +03:00
|
|
|
/* This value must be multiple of (pagesize * 2) */
|
2007-01-05 06:28:08 +03:00
|
|
|
#define DEFAULT_PACKED_GIT_WINDOW_SIZE \
|
|
|
|
(sizeof(void*) >= 8 \
|
|
|
|
? 1 * 1024 * 1024 * 1024 \
|
|
|
|
: 32 * 1024 * 1024)
|
2005-12-05 22:54:29 +03:00
|
|
|
|
|
|
|
#endif /* NO_MMAP */
|
|
|
|
|
2010-05-14 13:31:39 +04:00
|
|
|
#ifndef MAP_FAILED
|
|
|
|
#define MAP_FAILED ((void *)-1)
|
|
|
|
#endif
|
|
|
|
|
2008-08-18 23:57:16 +04:00
|
|
|
#ifdef NO_ST_BLOCKS_IN_STRUCT_STAT
|
|
|
|
#define on_disk_bytes(st) ((st).st_size)
|
|
|
|
#else
|
|
|
|
#define on_disk_bytes(st) ((st).st_blocks * 512)
|
|
|
|
#endif
|
|
|
|
|
2007-01-05 06:28:08 +03:00
|
|
|
#define DEFAULT_PACKED_GIT_LIMIT \
|
2007-01-07 11:11:11 +03:00
|
|
|
((1024L * 1024L) * (sizeof(void*) >= 8 ? 8192 : 256))
|
2006-12-24 08:46:13 +03:00
|
|
|
|
2007-01-10 00:04:12 +03:00
|
|
|
#ifdef NO_PREAD
|
|
|
|
#define pread git_pread
|
|
|
|
extern ssize_t git_pread(int fd, void *buf, size_t count, off_t offset);
|
|
|
|
#endif
|
2007-11-17 22:48:14 +03:00
|
|
|
/*
|
|
|
|
* Forward decl that will remind us if its twin in cache.h changes.
|
|
|
|
* This function is used in compat/pread.c. But we can't include
|
|
|
|
* cache.h there.
|
|
|
|
*/
|
|
|
|
extern ssize_t read_in_full(int fd, void *buf, size_t count);
|
2007-01-10 00:04:12 +03:00
|
|
|
|
2005-12-05 22:54:29 +03:00
|
|
|
#ifdef NO_SETENV
|
|
|
|
#define setenv gitsetenv
|
|
|
|
extern int gitsetenv(const char *, const char *, int);
|
|
|
|
#endif
|
|
|
|
|
2007-10-21 00:03:49 +04:00
|
|
|
#ifdef NO_MKDTEMP
|
|
|
|
#define mkdtemp gitmkdtemp
|
|
|
|
extern char *gitmkdtemp(char *);
|
|
|
|
#endif
|
|
|
|
|
2009-05-31 12:35:50 +04:00
|
|
|
#ifdef NO_MKSTEMPS
|
|
|
|
#define mkstemps gitmkstemps
|
|
|
|
extern int gitmkstemps(char *, int);
|
|
|
|
#endif
|
|
|
|
|
2006-01-25 23:38:36 +03:00
|
|
|
#ifdef NO_UNSETENV
|
|
|
|
#define unsetenv gitunsetenv
|
|
|
|
extern void gitunsetenv(const char *);
|
|
|
|
#endif
|
|
|
|
|
2005-12-05 22:54:29 +03:00
|
|
|
#ifdef NO_STRCASESTR
|
|
|
|
#define strcasestr gitstrcasestr
|
|
|
|
extern char *gitstrcasestr(const char *haystack, const char *needle);
|
|
|
|
#endif
|
|
|
|
|
2006-06-24 18:01:25 +04:00
|
|
|
#ifdef NO_STRLCPY
|
|
|
|
#define strlcpy gitstrlcpy
|
|
|
|
extern size_t gitstrlcpy(char *, const char *, size_t);
|
|
|
|
#endif
|
|
|
|
|
2007-02-20 03:22:56 +03:00
|
|
|
#ifdef NO_STRTOUMAX
|
|
|
|
#define strtoumax gitstrtoumax
|
|
|
|
extern uintmax_t gitstrtoumax(const char *, char **, int);
|
|
|
|
#endif
|
|
|
|
|
2007-06-13 22:54:32 +04:00
|
|
|
#ifdef NO_HSTRERROR
|
|
|
|
#define hstrerror githstrerror
|
|
|
|
extern const char *githstrerror(int herror);
|
|
|
|
#endif
|
|
|
|
|
2007-09-07 02:32:54 +04:00
|
|
|
#ifdef NO_MEMMEM
|
|
|
|
#define memmem gitmemmem
|
|
|
|
void *gitmemmem(const void *haystack, size_t haystacklen,
|
|
|
|
const void *needle, size_t needlelen);
|
|
|
|
#endif
|
|
|
|
|
2008-02-09 05:32:47 +03:00
|
|
|
#ifdef FREAD_READS_DIRECTORIES
|
2008-05-08 11:34:49 +04:00
|
|
|
#ifdef fopen
|
|
|
|
#undef fopen
|
|
|
|
#endif
|
2008-02-09 05:32:47 +03:00
|
|
|
#define fopen(a,b) git_fopen(a,b)
|
|
|
|
extern FILE *git_fopen(const char*, const char*);
|
|
|
|
#endif
|
|
|
|
|
2008-03-05 18:46:13 +03:00
|
|
|
#ifdef SNPRINTF_RETURNS_BOGUS
|
|
|
|
#define snprintf git_snprintf
|
|
|
|
extern int git_snprintf(char *str, size_t maxsize,
|
|
|
|
const char *format, ...);
|
|
|
|
#define vsnprintf git_vsnprintf
|
|
|
|
extern int git_vsnprintf(char *str, size_t maxsize,
|
|
|
|
const char *format, va_list ap);
|
|
|
|
#endif
|
|
|
|
|
2007-11-12 13:09:05 +03:00
|
|
|
#ifdef __GLIBC_PREREQ
|
|
|
|
#if __GLIBC_PREREQ(2, 1)
|
|
|
|
#define HAVE_STRCHRNUL
|
2010-03-21 03:43:32 +03:00
|
|
|
#define HAVE_MEMPCPY
|
2007-11-12 13:09:05 +03:00
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifndef HAVE_STRCHRNUL
|
2007-11-09 03:49:36 +03:00
|
|
|
#define strchrnul gitstrchrnul
|
2007-11-10 14:55:48 +03:00
|
|
|
static inline char *gitstrchrnul(const char *s, int c)
|
|
|
|
{
|
|
|
|
while (*s && *s != c)
|
|
|
|
s++;
|
|
|
|
return (char *)s;
|
|
|
|
}
|
2007-11-09 03:49:36 +03:00
|
|
|
#endif
|
|
|
|
|
2010-03-21 03:43:32 +03:00
|
|
|
#ifndef HAVE_MEMPCPY
|
|
|
|
#define mempcpy gitmempcpy
|
|
|
|
static inline void *gitmempcpy(void *dest, const void *src, size_t n)
|
|
|
|
{
|
|
|
|
return (char *)memcpy(dest, src, n) + n;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
Actually handle some-low memory conditions
Tim Ansell discovered his Debian server didn't permit git-daemon to
use as much memory as it needed to handle cloning a project with
a 128 MiB packfile. Filtering the strace provided by Tim of the
rev-list child showed this gem of a sequence:
open("./objects/pack/pack-*.pack", O_RDONLY|O_LARGEFILE <unfinished ...>
<... open resumed> ) = 5
OK, so the packfile is fd 5...
mmap2(NULL, 33554432, PROT_READ, MAP_PRIVATE, 5, 0 <unfinished ...>
<... mmap2 resumed> ) = 0xb5e2d000
and we mapped one 32 MiB window from it at position 0...
mmap2(NULL, 31020635, PROT_READ, MAP_PRIVATE, 5, 0x6000 <unfinished ...>
<... mmap2 resumed> ) = -1 ENOMEM (Cannot allocate memory)
And we asked for another window further into the file. But got
denied. In Tim's case this was due to a resource limit on the
git-daemon process, and its children.
Now where are we in the code? We're down inside use_pack(),
after we have called unuse_one_window() enough times to make sure
we stay within our allowed maximum window size. However since we
didn't unmap the prior window at 0xb5e2d000 we aren't exceeding
the current limit (which probably was just the defaults).
But we're actually down inside xmmap()...
So we release the window we do have (by calling release_pack_memory),
assuming there is some memory pressure...
munmap(0xb5e2d000, 33554432 <unfinished ...>
<... munmap resumed> ) = 0
close(5 <unfinished ...>
<... close resumed> ) = 0
And that was the last window in this packfile. So we closed it.
Way to go us. Our xmmap did not expect release_pack_memory to
close the fd its about to map...
mmap2(NULL, 31020635, PROT_READ, MAP_PRIVATE, 5, 0x6000 <unfinished ...>
<... mmap2 resumed> ) = -1 EBADF (Bad file descriptor)
And so the Linux kernel happily tells us f' off.
write(2, "fatal: ", 7 <unfinished ...>
<... write resumed> ) = 7
write(2, "Out of memory? mmap failed: Bad "..., 47 <unfinished ...>
<... write resumed> ) = 47
And we report the bad file descriptor error, and not the ENOMEM,
and die, claiming we are out of memory. But actually that mmap
should have succeeded, as we had enough memory for that window,
seeing as how we released the prior one.
Originally when I developed the sliding window mmap feature I had
this exact same bug in fast-import, and I dealt with it by handing
in the struct packed_git* we want to open the new window for, as the
caller wasn't prepared to reopen the packfile if unuse_one_window
closed it. The same is true here from xmmap, but the caller doesn't
have the struct packed_git* handy. So I'm using the file descriptor
instead to perform the same test.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-04-25 12:02:27 +04:00
|
|
|
extern void release_pack_memory(size_t, int);
|
2006-12-24 08:47:19 +03:00
|
|
|
|
2010-05-08 19:13:49 +04:00
|
|
|
typedef void (*try_to_free_t)(size_t);
|
|
|
|
extern try_to_free_t set_try_to_free_routine(try_to_free_t);
|
2010-03-24 23:22:34 +03:00
|
|
|
|
Shrink the git binary a bit by avoiding unnecessary inline functions
So I was looking at the disgusting size of the git binary, and even with
the debugging removed, and using -Os instead of -O2, the size of the text
section was pretty high. In this day and age I guess almost a megabyte of
text isn't really all that surprising, but it still doesn't exactly make
me think "lean and mean".
With -Os, a surprising amount of text space is wasted on inline functions
that end up just being replicated multiple times, and where performance
really isn't a valid reason to inline them. In particular, the trivial
wrapper functions like "xmalloc()" are used _everywhere_, and making them
inline just duplicates the text (and the string we use to 'die()' on
failure) unnecessarily.
So this just moves them into a "wrapper.c" file, getting rid of a tiny bit
of unnecessary bloat. The following numbers are both with "CFLAGS=-Os":
Before:
[torvalds@woody git]$ size git
text data bss dec hex filename
700460 15160 292184 1007804 f60bc git
After:
[torvalds@woody git]$ size git
text data bss dec hex filename
670540 15160 292184 977884 eebdc git
so it saves almost 30k of text-space (it actually saves more than that
with the default -O2, but I don't think that's necessarily a very relevant
number from a "try to shrink git" standpoint).
It might conceivably have a performance impact, but none of this should be
_that_ performance critical. The real cost is not generally in the wrapper
anyway, but in the code it wraps (ie the cost of "xread()" is all in the
read itself, not in the trivial wrapping of it).
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-06-22 23:19:25 +04:00
|
|
|
extern char *xstrdup(const char *str);
|
|
|
|
extern void *xmalloc(size_t size);
|
2010-01-26 21:24:12 +03:00
|
|
|
extern void *xmallocz(size_t size);
|
Shrink the git binary a bit by avoiding unnecessary inline functions
So I was looking at the disgusting size of the git binary, and even with
the debugging removed, and using -Os instead of -O2, the size of the text
section was pretty high. In this day and age I guess almost a megabyte of
text isn't really all that surprising, but it still doesn't exactly make
me think "lean and mean".
With -Os, a surprising amount of text space is wasted on inline functions
that end up just being replicated multiple times, and where performance
really isn't a valid reason to inline them. In particular, the trivial
wrapper functions like "xmalloc()" are used _everywhere_, and making them
inline just duplicates the text (and the string we use to 'die()' on
failure) unnecessarily.
So this just moves them into a "wrapper.c" file, getting rid of a tiny bit
of unnecessary bloat. The following numbers are both with "CFLAGS=-Os":
Before:
[torvalds@woody git]$ size git
text data bss dec hex filename
700460 15160 292184 1007804 f60bc git
After:
[torvalds@woody git]$ size git
text data bss dec hex filename
670540 15160 292184 977884 eebdc git
so it saves almost 30k of text-space (it actually saves more than that
with the default -O2, but I don't think that's necessarily a very relevant
number from a "try to shrink git" standpoint).
It might conceivably have a performance impact, but none of this should be
_that_ performance critical. The real cost is not generally in the wrapper
anyway, but in the code it wraps (ie the cost of "xread()" is all in the
read itself, not in the trivial wrapping of it).
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-06-22 23:19:25 +04:00
|
|
|
extern void *xmemdupz(const void *data, size_t len);
|
|
|
|
extern char *xstrndup(const char *str, size_t len);
|
|
|
|
extern void *xrealloc(void *ptr, size_t size);
|
|
|
|
extern void *xcalloc(size_t nmemb, size_t size);
|
|
|
|
extern void *xmmap(void *start, size_t length, int prot, int flags, int fd, off_t offset);
|
|
|
|
extern ssize_t xread(int fd, void *buf, size_t len);
|
|
|
|
extern ssize_t xwrite(int fd, const void *buf, size_t len);
|
|
|
|
extern int xdup(int fd);
|
|
|
|
extern FILE *xfdopen(int fd, const char *mode);
|
|
|
|
extern int xmkstemp(char *template);
|
2009-02-25 10:11:29 +03:00
|
|
|
extern int odb_mkstemp(char *template, size_t limit, const char *pattern);
|
|
|
|
extern int odb_pack_keep(char *name, size_t namesz, unsigned char *sha1);
|
2007-08-14 23:44:53 +04:00
|
|
|
|
2007-03-07 04:44:37 +03:00
|
|
|
static inline size_t xsize_t(off_t len)
|
|
|
|
{
|
|
|
|
return (size_t)len;
|
|
|
|
}
|
|
|
|
|
2006-08-11 16:01:45 +04:00
|
|
|
static inline int has_extension(const char *filename, const char *ext)
|
2006-08-10 19:02:30 +04:00
|
|
|
{
|
2006-08-11 16:01:45 +04:00
|
|
|
size_t len = strlen(filename);
|
|
|
|
size_t extlen = strlen(ext);
|
2006-08-10 19:02:30 +04:00
|
|
|
return len > extlen && !memcmp(filename + len - extlen, ext, extlen);
|
|
|
|
}
|
|
|
|
|
2005-12-05 22:54:29 +03:00
|
|
|
/* Sane ctype - no locale, and works with signed chars */
|
2009-03-07 16:06:49 +03:00
|
|
|
#undef isascii
|
2005-12-05 22:54:29 +03:00
|
|
|
#undef isspace
|
|
|
|
#undef isdigit
|
|
|
|
#undef isalpha
|
|
|
|
#undef isalnum
|
|
|
|
#undef tolower
|
|
|
|
#undef toupper
|
|
|
|
extern unsigned char sane_ctype[256];
|
|
|
|
#define GIT_SPACE 0x01
|
|
|
|
#define GIT_DIGIT 0x02
|
|
|
|
#define GIT_ALPHA 0x04
|
2009-01-17 18:50:34 +03:00
|
|
|
#define GIT_GLOB_SPECIAL 0x08
|
2009-01-17 18:50:37 +03:00
|
|
|
#define GIT_REGEX_SPECIAL 0x10
|
2005-12-05 22:54:29 +03:00
|
|
|
#define sane_istest(x,mask) ((sane_ctype[(unsigned char)(x)] & (mask)) != 0)
|
2009-03-07 16:06:49 +03:00
|
|
|
#define isascii(x) (((x) & ~0x7f) == 0)
|
2005-12-05 22:54:29 +03:00
|
|
|
#define isspace(x) sane_istest(x,GIT_SPACE)
|
|
|
|
#define isdigit(x) sane_istest(x,GIT_DIGIT)
|
|
|
|
#define isalpha(x) sane_istest(x,GIT_ALPHA)
|
|
|
|
#define isalnum(x) sane_istest(x,GIT_ALPHA | GIT_DIGIT)
|
2009-01-17 18:50:34 +03:00
|
|
|
#define is_glob_special(x) sane_istest(x,GIT_GLOB_SPECIAL)
|
2009-01-17 18:50:37 +03:00
|
|
|
#define is_regex_special(x) sane_istest(x,GIT_GLOB_SPECIAL | GIT_REGEX_SPECIAL)
|
2005-12-05 22:54:29 +03:00
|
|
|
#define tolower(x) sane_case((unsigned char)(x), 0x20)
|
|
|
|
#define toupper(x) sane_case((unsigned char)(x), 0)
|
|
|
|
|
|
|
|
static inline int sane_case(int x, int high)
|
|
|
|
{
|
|
|
|
if (sane_istest(x, GIT_ALPHA))
|
|
|
|
x = (x & ~0x20) | high;
|
|
|
|
return x;
|
|
|
|
}
|
|
|
|
|
2007-04-10 03:01:44 +04:00
|
|
|
static inline int strtoul_ui(char const *s, int base, unsigned int *result)
|
|
|
|
{
|
|
|
|
unsigned long ul;
|
|
|
|
char *p;
|
|
|
|
|
|
|
|
errno = 0;
|
|
|
|
ul = strtoul(s, &p, base);
|
|
|
|
if (errno || *p || p == s || (unsigned int) ul != ul)
|
|
|
|
return -1;
|
|
|
|
*result = ul;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-10-24 00:33:26 +04:00
|
|
|
static inline int strtol_i(char const *s, int base, int *result)
|
|
|
|
{
|
|
|
|
long ul;
|
|
|
|
char *p;
|
|
|
|
|
|
|
|
errno = 0;
|
|
|
|
ul = strtol(s, &p, base);
|
|
|
|
if (errno || *p || p == s || (int) ul != ul)
|
|
|
|
return -1;
|
|
|
|
*result = ul;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-02-06 00:10:44 +03:00
|
|
|
#ifdef INTERNAL_QSORT
|
|
|
|
void git_qsort(void *base, size_t nmemb, size_t size,
|
|
|
|
int(*compar)(const void *, const void *));
|
|
|
|
#define qsort git_qsort
|
|
|
|
#endif
|
|
|
|
|
2008-03-05 02:15:39 +03:00
|
|
|
#ifndef DIR_HAS_BSD_GROUP_SEMANTICS
|
|
|
|
# define FORCE_DIR_SET_GID S_ISGID
|
|
|
|
#else
|
|
|
|
# define FORCE_DIR_SET_GID 0
|
|
|
|
#endif
|
|
|
|
|
2009-03-04 20:47:40 +03:00
|
|
|
#ifdef NO_NSEC
|
|
|
|
#undef USE_NSEC
|
|
|
|
#define ST_CTIME_NSEC(st) 0
|
|
|
|
#define ST_MTIME_NSEC(st) 0
|
|
|
|
#else
|
2009-03-08 23:04:28 +03:00
|
|
|
#ifdef USE_ST_TIMESPEC
|
|
|
|
#define ST_CTIME_NSEC(st) ((unsigned int)((st).st_ctimespec.tv_nsec))
|
|
|
|
#define ST_MTIME_NSEC(st) ((unsigned int)((st).st_mtimespec.tv_nsec))
|
|
|
|
#else
|
2009-03-04 20:47:40 +03:00
|
|
|
#define ST_CTIME_NSEC(st) ((unsigned int)((st).st_ctim.tv_nsec))
|
|
|
|
#define ST_MTIME_NSEC(st) ((unsigned int)((st).st_mtim.tv_nsec))
|
|
|
|
#endif
|
2009-03-08 23:04:28 +03:00
|
|
|
#endif
|
2009-03-04 20:47:40 +03:00
|
|
|
|
2009-04-20 12:17:00 +04:00
|
|
|
#ifdef UNRELIABLE_FSTAT
|
|
|
|
#define fstat_is_reliable() 0
|
|
|
|
#else
|
|
|
|
#define fstat_is_reliable() 1
|
|
|
|
#endif
|
|
|
|
|
2009-04-30 01:21:46 +04:00
|
|
|
/*
|
|
|
|
* Preserves errno, prints a message, but gives no warning for ENOENT.
|
|
|
|
* Always returns the return value of unlink(2).
|
|
|
|
*/
|
|
|
|
int unlink_or_warn(const char *path);
|
2010-03-26 18:25:33 +03:00
|
|
|
/*
|
|
|
|
* Likewise for rmdir(2).
|
|
|
|
*/
|
|
|
|
int rmdir_or_warn(const char *path);
|
2010-03-26 18:25:34 +03:00
|
|
|
/*
|
|
|
|
* Calls the correct function out of {unlink,rmdir}_or_warn based on
|
|
|
|
* the supplied file mode.
|
|
|
|
*/
|
|
|
|
int remove_or_warn(unsigned int mode, const char *path);
|
2009-04-30 01:21:46 +04:00
|
|
|
|
2005-12-05 22:54:29 +03:00
|
|
|
#endif
|