Attachment #412966 for bug #560358

Lines 25-30 Link Here

(-)xfsdump-3.1.4.orig/common/cldmgr.c (+4 lines)
25	#include <sys/prctl.h>	25	#include <sys/prctl.h>
26	#include <errno.h>	26	#include <errno.h>
27	#include <pthread.h>	27	#include <pthread.h>
		28	#include <assert.h>
		29	#include <string.h>
		30	#include <unistd.h>
28		31
29	#include "exit.h"	32	#include "exit.h"
30	#include "types.h"	33	#include "types.h"
Lines 33-38 Link Here
33	#include "stream.h"	36	#include "stream.h"
34	#include "mlog.h"	37	#include "mlog.h"
35	#include "cldmgr.h"	38	#include "cldmgr.h"
		39	#include "fake_platform_defs.h"
36		40
37	extern size_t pgsz;	41	extern size_t pgsz;
38		42

Lines 18-23 Link Here

(-)xfsdump-3.1.4.orig/common/cldmgr.h (+2 lines)
18	#ifndef CLDMGR_H	18	#ifndef CLDMGR_H
19	#define CLDMGR_H	19	#define CLDMGR_H
20		20
		21	#include <assert.h>
		22
21	/* cldmgr.[hc] - manages all child threads	23	/* cldmgr.[hc] - manages all child threads
22	*/	24	*/
23		25

Lines 18-23 Link Here

(-)xfsdump-3.1.4.orig/common/content_common.h (+2 lines)
18	#ifndef CONTENT_COMMON_H	18	#ifndef CONTENT_COMMON_H
19	#define CONTENT_COMMON_H	19	#define CONTENT_COMMON_H
20		20
		21	#include "fake_platform_defs.h"
		22
21	extern bool_t Media_prompt_change( drive_t *drivep );	23	extern bool_t Media_prompt_change( drive_t *drivep );
22		24
23	#endif /* CONTENT_COMMON_H */	25	#endif /* CONTENT_COMMON_H */

Lines 26-36 Link Here

(-)xfsdump-3.1.4.orig/common/dlog.c (+4 lines)
26	#include <time.h>	26	#include <time.h>
27	#include <errno.h>	27	#include <errno.h>
28	#include <signal.h>	28	#include <signal.h>
		29	#include <assert.h>
		30	#include <string.h>
		31	#include <unistd.h>
29		32
30	#include "types.h"	33	#include "types.h"
31	#include "mlog.h"	34	#include "mlog.h"
32	#include "dlog.h"	35	#include "dlog.h"
33	#include "getopt.h"	36	#include "getopt.h"
		37	#include "fake_platform_defs.h"
34		38
35	static int dlog_ttyfd = -1;	39	static int dlog_ttyfd = -1;
36	static volatile bool_t dlog_allowed_flag = BOOL_FALSE;	40	static volatile bool_t dlog_allowed_flag = BOOL_FALSE;

Lines 18-23 Link Here

(-)xfsdump-3.1.4.orig/common/drive.h (+4 lines)
18	#ifndef DRIVE_H	18	#ifndef DRIVE_H
19	#define DRIVE_H	19	#define DRIVE_H
20		20
		21	#include <stdlib.h>
		22
		23	#include "fake_platform_defs.h"
		24
21	/* drive.[hc] - drive abstraction	25	/* drive.[hc] - drive abstraction
22	*	26	*
23	* drive_t provides a framework for device-independent drive abstraction,	27	* drive_t provides a framework for device-independent drive abstraction,

Lines 31-37 Link Here

(-)xfsdump-3.1.4.orig/common/fs.c (-1 / +1 lines)
31	#include "types.h"	31	#include "types.h"
32	#include "mlog.h"	32	#include "mlog.h"
33	#include "fs.h"	33	#include "fs.h"
34		34	#include "fake_platform_defs.h"
35		35
36	/* fs_info - a magic, highly heuristic function to convert a user-supplied	36	/* fs_info - a magic, highly heuristic function to convert a user-supplied
37	* string into a file system type, character special device pathname,	37	* string into a file system type, character special device pathname,

Lines 18-23 Link Here

(-)xfsdump-3.1.4.orig/common/fs.h (+5 lines)
18	#ifndef FS_H	18	#ifndef FS_H
19	#define FS_H	19	#define FS_H
20		20
		21	#include <assert.h>
		22	#include <string.h>
		23	#include <unistd.h>
		24	#include <stddef.h>
		25
21	/* fs - utilities for examining and manipulating file systems	26	/* fs - utilities for examining and manipulating file systems
22	*/	27	*/
23		28

Lines 22-27 Link Here

(-)xfsdump-3.1.4.orig/common/global.c (+1 lines)
22	#include <sys/stat.h>	22	#include <sys/stat.h>
23	#include <time.h>	23	#include <time.h>
24	#include <errno.h>	24	#include <errno.h>
		25	#include <unistd.h>
25		26
26	#include "types.h"	27	#include "types.h"
27	#include "util.h"	28	#include "util.h"

Lines 18-23 Link Here

(-)xfsdump-3.1.4.orig/common/global.h (+2 lines)
18	#ifndef GLOBAL_H	18	#ifndef GLOBAL_H
19	#define GLOBAL_H	19	#define GLOBAL_H
20		20
		21	#include <assert.h>
		22
21	/* global_hdr_t - first page of every media file	23	/* global_hdr_t - first page of every media file
22	*/	24	*/
23	#define GLOBAL_HDR_SZ PGSZ	25	#define GLOBAL_HDR_SZ PGSZ





#include <xfs/xfs.h>
#include <xfs/jdm.h>
#include <assert.h>
#include "types.h"
#include "global.h"
#include "content.h"
#include "content_inode.h"
#include "fake_platform_defs.h"

#define	HSM_API_VERSION_1	1	/* only version supported so far */


Lines 18-23 Link Here

(-)xfsdump-3.1.4.orig/common/lock.c (+1 lines)
18		18
19	#include <xfs/xfs.h>	19	#include <xfs/xfs.h>
20	#include <xfs/jdm.h>	20	#include <xfs/jdm.h>
		21	#include <assert.h>
21		22
22	#include "types.h"	23	#include "types.h"
23	#include "qlock.h"	24	#include "qlock.h"

Lines 21-27 Link Here

(-)xfsdump-3.1.4.orig/common/mlog.h (+2 lines)
21	/* mlog.[hc] - message logging abstraction	21	/* mlog.[hc] - message logging abstraction
22	*/	22	*/
23	#include <stdarg.h>	23	#include <stdarg.h>
		24	#include <string.h>
24	#include "types.h"	25	#include "types.h"
		26	#include "fake_platform_defs.h"
25		27
26	/* defined log levels - msg will be logged only if cmdline -v arg	28	/* defined log levels - msg will be logged only if cmdline -v arg
27	* is greater than or equal to its level.	29	* is greater than or equal to its level.

Lines 18-23 Link Here

(-)xfsdump-3.1.4.orig/common/path.h (+4 lines)
18	#ifndef PATH_H	18	#ifndef PATH_H
19	#define PATH_H	19	#define PATH_H
20		20
		21	#include <string.h>
		22	#include <assert.h>
		23	#include "fake_platform_defs.h"
		24
21	/* various pathname helpers	25	/* various pathname helpers
22	*/	26	*/
23	extern char * path_reltoabs( char dir, char basedir );	27	extern char * path_reltoabs( char dir, char basedir );

Lines 18-23 Link Here

(-)xfsdump-3.1.4.orig/common/ring.h (+2 lines)
18	#ifndef RING_H	18	#ifndef RING_H
19	#define RING_H	19	#define RING_H
20		20
		21	#include "fake_platform_defs.h"
		22
21	/* ring - readahead/writeahead abstraction	23	/* ring - readahead/writeahead abstraction
22	*	24	*
23	* the ring is conceptually an ordered set of messages circulating between the	25	* the ring is conceptually an ordered set of messages circulating between the

Lines 18-23 Link Here

(-)xfsdump-3.1.4.orig/common/util.h (+2 lines)
18	#ifndef UTIL_H	18	#ifndef UTIL_H
19	#define UTIL_H	19	#define UTIL_H
20		20
		21	#include <string.h>
		22	#include "fake_platform_defs.h"
21		23
22	/* util.[hc] - generally useful functions	24	/* util.[hc] - generally useful functions
23	*/	25	*/

Lines 1-9 Link Here

(-)xfsdump-3.1.4.orig/configure.ac (-3 / +13 lines)
1	AC_INIT([xfsdump], [3.1.3])	1	AC_INIT([xfsdump], [3.1.4])
2	AC_PREREQ(2.50)	2	AC_PREREQ(2.50)
3	AC_CONFIG_AUX_DIR([.])	3	AC_CONFIG_AUX_DIR([.])
4	AC_CONFIG_MACRO_DIR([m4])	4	AC_CONFIG_MACRO_DIR([m4])
5	AC_CONFIG_SRCDIR([common/main.c])	5	AC_CONFIG_SRCDIR([common/main.c])
6	AC_CONFIG_HEADER(include/config.h)	6	AC_CONFIG_HEADER(include/config.h)
		7	AC_CONFIG_HEADER([include/fake_platform_defs.h])
7	AC_PREFIX_DEFAULT(/usr)	8	AC_PREFIX_DEFAULT(/usr)
8		9
9	AC_PROG_LIBTOOL	10	AC_PROG_LIBTOOL
Lines 54-62 esac Link Here
54	AC_SUBST([root_sbindir])	55	AC_SUBST([root_sbindir])
55	AC_SUBST([root_libdir])	56	AC_SUBST([root_libdir])
56		57
57	# Find localized files	58	# Find localized files. Don't descend into any "dot directories"
		59	# (like .git or .pc from quilt). Strangely, the "-print" argument
		60	# to "find" is required, to avoid including such directories in the
		61	# list.
58	LOCALIZED_FILES=""	62	LOCALIZED_FILES=""
59	for lfile in `find ${srcdir} -name '*.c' -type f \|\| exit 1`; do	63	for lfile in `find ${srcdir} -path './.??' -prune -o -name '.c' -type f -print \|\| exit 1`; do
60	LOCALIZED_FILES="$LOCALIZED_FILES \$(TOPDIR)/$lfile"	64	LOCALIZED_FILES="$LOCALIZED_FILES \$(TOPDIR)/$lfile"
61	done	65	done
62	AC_SUBST(LOCALIZED_FILES)	66	AC_SUBST(LOCALIZED_FILES)
Lines 82-87 AC_PACKAGE_NEED_ATTRIBUTES_H Link Here
82	AC_PACKAGE_NEED_ATTRIBUTES_MACROS	86	AC_PACKAGE_NEED_ATTRIBUTES_MACROS
83	AC_PACKAGE_NEED_ATTRGET_LIBATTR	87	AC_PACKAGE_NEED_ATTRGET_LIBATTR
84		88
		89	AC_CHECK_SIZEOF([long])
		90	AC_CHECK_SIZEOF([char *])
		91	AC_TYPE_PSINT
		92	AC_TYPE_PSUNSIGNED
		93	AC_TYPE_U32
		94	AC_TYPE_UMODE_T
85	AC_MANUAL_FORMAT	95	AC_MANUAL_FORMAT
86		96
87	AC_CONFIG_FILES([include/builddefs])	97	AC_CONFIG_FILES([include/builddefs])

Lines 29-34 Link Here

(-)xfsdump-3.1.4.orig/dump/var.c (+1 lines)
29	#include "mlog.h"	29	#include "mlog.h"
30	#include "global.h"	30	#include "global.h"
31	#include "inventory.h"	31	#include "inventory.h"
		32	#include "fake_platform_defs.h"
32		33
33	static void var_skip_recurse( char , void ( )( xfs_ino_t ));	34	static void var_skip_recurse( char , void ( )( xfs_ino_t ));
34	static int var_create_component( char * );	35	static int var_create_component( char * );

Lines 75-80 GCCFLAGS = -funsigned-char -fno-strict-a Link Here

(-)xfsdump-3.1.4.orig/include/builddefs.in (+3 lines)
75		75
76	ifeq ($(PKG_PLATFORM),linux)	76	ifeq ($(PKG_PLATFORM),linux)
77	PCFLAGS = -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 $(GCCFLAGS)	77	PCFLAGS = -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 $(GCCFLAGS)
		78	ifeq ($(HAVE_UMODE_T),yes)
		79	PCFLAGS += -DHAVE_UMODE_T
		80	endif
78	DEPENDFLAGS = -D__linux__	81	DEPENDFLAGS = -D__linux__
79	endif	82	endif
80	ifeq ($(PKG_PLATFORM),darwin)	83	ifeq ($(PKG_PLATFORM),darwin)




/* include/config.h.in.  Generated from configure.ac by autoheader.  */
 * Copyright (c) 2002 Silicon Graphics, Inc.  All Rights Reserved.
 *
 * @configure_input@
 */
#ifndef __CONFIG_H__
#define __CONFIG_H__

/* Define if you want gettext (I18N) support */
#undef ENABLE_GETTEXT

#ifndef _
# ifdef ENABLE_GETTEXT
#  include <libintl.h>
#   define _(x)			gettext(x)
# else
#  define _(x)			(x)
#  define textdomain(d)		do { } while (0)
#  define bindtextdomain(d,dir)	do { } while (0)
# endif
#endif
#include <locale.h>

/* Define to 1 if you have the <attr/attributes.h> header file. */
#undef HAVE_ATTR_ATTRIBUTES_H

/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H

/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H

/* Define to 1 if you have the `attr' library (-lattr). */
#undef HAVE_LIBATTR

/* Define to 1 if you have the `handle' library (-lhandle). */
#undef HAVE_LIBHANDLE

/* Define to 1 if you have the `ncurses' library (-lncurses). */
#undef HAVE_LIBNCURSES

/* Define to 1 if you have the `pthread' library (-lpthread). */
#undef HAVE_LIBPTHREAD

/* Define to 1 if you have the `uuid' library (-luuid). */
#undef HAVE_LIBUUID

/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H

/* Define to 1 if you have the <ncurses.h> header file. */
#undef HAVE_NCURSES_H

/* Define to 1 if you have the <pthread.h> header file. */
#undef HAVE_PTHREAD_H

/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H

/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H

/* Define to 1 if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H

/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H

/* Define to 1 if you have the <sys/attributes.h> header file. */
#undef HAVE_SYS_ATTRIBUTES_H

/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H

/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H

/* Define to 1 if you have the <sys/uuid.h> header file. */
#undef HAVE_SYS_UUID_H

/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H

/* Define to 1 if you have the `uuid_compare' function. */
#undef HAVE_UUID_COMPARE

/* Define to 1 if you have the <uuid.h> header file. */
#undef HAVE_UUID_H

/* Define to 1 if you have the <uuid/uuid.h> header file. */
#undef HAVE_UUID_UUID_H

/* Define to 1 if you have the <xfs/handle.h> header file. */
#undef HAVE_XFS_HANDLE_H

/* Define to 1 if you have the <xfs/xfs.h> header file. */
#undef HAVE_XFS_XFS_H

/* Define to the sub-directory in which libtool stores uninstalled libraries.
   */
#undef LT_OBJDIR

/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT

/* Define to the full name of this package. */
#undef PACKAGE_NAME

/* Define to the full name and version of this package. */
#undef PACKAGE_STRING

/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME

/* Define to the home page for this package. */
#undef PACKAGE_URL

/* Define to the version of this package. */
#undef PACKAGE_VERSION

/* The size of `char *', as computed by sizeof. */
#undef SIZEOF_CHAR_P

/* The size of `long', as computed by sizeof. */
#undef SIZEOF_LONG

/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS




/*
 * Copyright (c) 2000-2015 Silicon Graphics, Inc.
 * All Rights Reserved.
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public License
 * as published by the Free Software Foundation.
 *
 * This program is distributed in the hope that it would be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public License
 * along with this program; if not, write the Free Software Foundation,
 * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 *
 * @configure_input@
 */
#ifndef _FAKE_PLATFORM_DEFS_H
#define _FAKE_PLATFORM_DEFS_H

#include <stdio.h>
#include <errno.h>
#include <fcntl.h>
#include <stdarg.h>
#include <assert.h>
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
#include <stdint.h>
#include <unistd.h>
#include <pthread.h>
#include <ctype.h>
#include <sys/types.h>
#include <limits.h>
#include <stdbool.h>

#undef HAVE___U32
#ifdef HAVE___U32
#include <asm/types.h>
#else
typedef unsigned char           __u8;
typedef signed char             __s8;
typedef unsigned short          __u16;
typedef signed short            __s16;
typedef unsigned int            __u32;
typedef signed int              __s32;
typedef unsigned long long int  __u64;
typedef signed long long int    __s64;
#endif

#ifdef __CHECKER__
#define __bitwise               __attribute__((bitwise))
#define __force                 __attribute__((force))
#else
#define __bitwise
#define __force
#endif

typedef __u16   __bitwise       __le16;
typedef __u32   __bitwise       __le32;
typedef __u64   __bitwise       __le64;

typedef __u16   __bitwise       __be16;
typedef __u32   __bitwise       __be32;
typedef __u64   __bitwise       __be64;

typedef struct filldir          filldir_t;

#if defined(__linux__)
#include <xfs/linux.h>
#elif defined(__FreeBSD__)
#include <xfs/freebsd.h>
#elif defined(__FreeBSD_kernel__)
#include <xfs/gnukfreebsd.h>
#elif defined(__APPLE__)
#include <xfs/darwin.h>
#elif defined(__sgi__) || defined(__sgi)
#include <xfs/irix.h>
#else
# error unknown platform... have fun porting!
#endif

/* long and pointer must be either 32 bit or 64 bit */
#undef SIZEOF_LONG
#undef SIZEOF_CHAR_P
#define BITS_PER_LONG (SIZEOF_LONG * CHAR_BIT)

/* Check if __psint_t is set to something meaningful */
#undef HAVE___PSINT_T
#ifndef HAVE___PSINT_T
# if (SIZEOF_CHAR_P * CHAR_BIT) == 32
typedef int __psint_t;
# elif (SIZEOF_CHAR_P * CHAR_BIT) == 64
#  if BITS_PER_LONG == 64
typedef long __psint_t;
#  else
/* This is a very strange architecture, which has 64 bit pointers but */
/* not 64 bit longs.  So, just punt here and assume long long is OK.  */
typedef long long __psint_t;
#  endif
# else
#  error Unknown pointer size
# endif
#endif

/* Check whether to define umode_t ourselves. */
#ifndef HAVE_UMODE_T
typedef unsigned short umode_t;
#endif

/* Define if you want gettext (I18N) support */
#undef ENABLE_GETTEXT
#ifdef ENABLE_GETTEXT
# include <libintl.h>
# define _(x)                   gettext(x)
# define N_(x)                   x
#else
# define _(x)                   (x)
# define N_(x)                   x
# define textdomain(d)          do { } while (0)
# define bindtextdomain(d,dir)  do { } while (0)
#endif
#include <locale.h>

#ifdef DEBUG
# define ASSERT(EX)     assert(EX)
#else
# define ASSERT(EX)     ((void) 0)
#endif

/*
 * sparse kernel source annotations
 */
#ifndef __user
#define __user
#endif

#define IRIX_DEV_BITSMAJOR      14
#define IRIX_DEV_BITSMINOR      18
#define IRIX_DEV_MAXMAJ         0x1ff
#define IRIX_DEV_MAXMIN         0x3ffff
#define IRIX_DEV_MAJOR(dev)     ((int)(((unsigned)(dev) >> IRIX_DEV_BITSMINOR) \
                                        & IRIX_DEV_MAXMAJ))
#define IRIX_DEV_MINOR(dev)     ((int)((dev) & IRIX_DEV_MAXMIN))
#define IRIX_MKDEV(major,minor) ((xfs_dev_t)(((major) << IRIX_DEV_BITSMINOR) \
                                        | (minor&IRIX_DEV_MAXMIN)))
#define IRIX_DEV_TO_KDEVT(dev)  makedev(IRIX_DEV_MAJOR(dev),IRIX_DEV_MINOR(dev))

/* ARM old ABI has some weird alignment/padding */
#if defined(__arm__) && !defined(__ARM_EABI__)
#define __arch_pack __attribute__((packed))
#else
#define __arch_pack
#endif

#ifndef min
#define min(a,b)      (((a)<(b))?(a):(b))
#define max(a,b)      (((a)>(b))?(a):(b))
#endif

#endif /* !defined(_FAKE_PLATFORM_DEFS_H) */

Lines 6-12 TOPDIR = .. Link Here

(-)xfsdump-3.1.4.orig/include/Makefile (-1 / +1 lines)
6	include $(TOPDIR)/include/builddefs	6	include $(TOPDIR)/include/builddefs
7		7
8	HFILES = swab.h swap.h	8	HFILES = swab.h swap.h
9	LSRCFILES = builddefs.in buildmacros buildrules config.h.in install-sh	9	LSRCFILES = fake_platform_defs.h.in builddefs.in buildmacros buildrules config.h.in install-sh
10		10
11	default install install-dev :	11	default install install-dev :
12		12

Lines 23-29 Link Here

(-)xfsdump-3.1.4.orig/inventory/inv_files.c (-1 / +2 lines)
23	#include <errno.h>	23	#include <errno.h>
24	#include <sys/stat.h>	24	#include <sys/stat.h>
25	#include <sys/dir.h>	25	#include <sys/dir.h>
26		26	#include <assert.h>
		27	#include "fake_platform_defs.h"
27		28
28	/----------------------------------------------------------------------/	29	/----------------------------------------------------------------------/
29	/* */	30	/* */

Lines 25-30 Link Here

(-)xfsdump-3.1.4.orig/inventory/inv_idx.c (+1 lines)
25	#include <sys/file.h>	25	#include <sys/file.h>
26	#include <sys/stat.h>	26	#include <sys/stat.h>
27	#include <sys/dir.h>	27	#include <sys/dir.h>
		28	#include <string.h>
28	#include "types.h"	29	#include "types.h"
29	#include "mlog.h"	30	#include "mlog.h"
30	#include "inv_priv.h"	31	#include "inv_priv.h"

Lines 19-27 Link Here

(-)xfsdump-3.1.4.orig/inventory/inv_priv.h (+3 lines)
19	#define _INV_PRIV_H_	19	#define _INV_PRIV_H_
20		20
21	#include <sys/file.h> /* for flock */	21	#include <sys/file.h> /* for flock */
		22	#include <string.h>
		23	#include <assert.h>
22	#include "global.h"	24	#include "global.h"
23	#include "inventory.h"	25	#include "inventory.h"
24	#include "mlog.h"	26	#include "mlog.h"
		27	#include "fake_platform_defs.h"
25		28
26		29
27	/----------------------------------------------------------------------/	30	/----------------------------------------------------------------------/

Lines 18-23 Link Here

(-)xfsdump-3.1.4.orig/invutil/cmenu.h (+2 lines)
18	#ifndef CMENU_H	18	#ifndef CMENU_H
19	#define CMENU_H	19	#define CMENU_H
20		20
		21	#include <string.h>
		22
21	#include "types.h"	23	#include "types.h"
22	#include "mlog.h"	24	#include "mlog.h"
23	#include "inv_priv.h"	25	#include "inv_priv.h"

Lines 24-29 Link Here

(-)xfsdump-3.1.4.orig/invutil/invutil.c (+1 lines)
24	#include <fcntl.h>	24	#include <fcntl.h>
25	#include <time.h>	25	#include <time.h>
26	#include <sys/mman.h>	26	#include <sys/mman.h>
		27	#include <string.h>
27		28
28	#include "types.h"	29	#include "types.h"
29	#include "mlog.h"	30	#include "mlog.h"

Lines 18-23 Link Here

(-)xfsdump-3.1.4.orig/invutil/invutil.h (+9 lines)
18	#ifndef INVUTIL_H	18	#ifndef INVUTIL_H
19	#define INVUTIL_H	19	#define INVUTIL_H
20		20
		21	#include <stdlib.h>
		22	#include <string.h>
		23	#include <unistd.h>
		24	#include <sys/types.h>
		25	#include <assert.h>
		26
		27	#include "types.h"
		28	#include "inv_priv.h"
		29
21	#define STR_LEN INV_STRLEN+32	30	#define STR_LEN INV_STRLEN+32
22	#define GEN_STRLEN 32	31	#define GEN_STRLEN 32
23		32

Lines 29-34 Link Here

(-)xfsdump-3.1.4.orig/librmt/rmtlib.h (+7 lines)
29		29
30		30
31	#include <xfs/xfs.h>	31	#include <xfs/xfs.h>
		32	#include <stdarg.h>
		33	#include <assert.h>
		34	#include <string.h>
		35	#include <stropts.h>
		36	#include <stdlib.h>
		37	#include <unistd.h>
		38	#include "fake_platform_defs.h"
32		39
33	/*	40	/*
34	* Note that local vs remote file descriptors are distinquished	41	* Note that local vs remote file descriptors are distinquished

Lines 18-23 LSRCFILES = \ Link Here

(-)xfsdump-3.1.4.orig/m4/Makefile (+1 lines)
18	package_globals.m4 \	18	package_globals.m4 \
19	package_ncurses.m4 \	19	package_ncurses.m4 \
20	package_pthread.m4 \	20	package_pthread.m4 \
		21	package_types.m4 \
21	package_utilies.m4 \	22	package_utilies.m4 \
22	package_uuiddev.m4 \	23	package_uuiddev.m4 \
23	package_xfslibs.m4 \	24	package_xfslibs.m4 \




# 
# Check if we have a type for the pointer's size integer (__psint_t)
# 
AC_DEFUN([AC_TYPE_PSINT],
  [ AC_MSG_CHECKING([for __psint_t ])
    AC_TRY_COMPILE([
#include <sys/types.h>
#include <stdlib.h>
#include <stddef.h>
    ], [
         __psint_t  psint;
    ], AC_DEFINE(HAVE___PSINT_T) AC_MSG_RESULT(yes) , AC_MSG_RESULT(no))
  ])

# 
# Check if we have a type for the pointer's size unsigned (__psunsigned_t)
# 
AC_DEFUN([AC_TYPE_PSUNSIGNED],
  [ AC_MSG_CHECKING([for __psunsigned_t ])
    AC_TRY_COMPILE([
#include <sys/types.h>
#include <stdlib.h>
#include <stddef.h>
    ], [
        __psunsigned_t  psuint;
    ], AC_DEFINE(HAVE___PSUNSIGNED_T) AC_MSG_RESULT(yes) , AC_MSG_RESULT(no))
  ])

# 
# Check if we have a type for __u32
# 
AC_DEFUN([AC_TYPE_U32],
  [ AC_MSG_CHECKING([for __u32 ])
    AC_TRY_COMPILE([
#include <asm/types.h>
#include <stdlib.h>
#include <stddef.h>
    ], [
         __u32  u32;
    ], AC_DEFINE(HAVE___U32) AC_MSG_RESULT(yes) , AC_MSG_RESULT(no))
  ])
#
# Check if we have umode_t
#
AC_DEFUN([AC_TYPE_UMODE_T],
  [ AC_MSG_CHECKING([for umode_t])
    AC_TRY_COMPILE([
#include <asm/types.h>
    ], [
         umode_t umode;
    ], AC_DEFINE(HAVE_UMODE_T) AC_MSG_RESULT(yes) , AC_MSG_RESULT(no))
  ])

Lines 34-40 SRCTARINC = m4/libtool.m4 m4/lt~obsolete Link Here

(-)xfsdump-3.1.4.orig/Makefile (-1 / +2 lines)
34		34
35	LDIRT = config.log .ltdep .dep config.status config.cache confdefs.h \	35	LDIRT = config.log .ltdep .dep config.status config.cache confdefs.h \
36	conftest* built .census install.* install-dev.* *.gz \	36	conftest* built .census install.* install-dev.* *.gz \
37	autom4te.cache/* libtool include/builddefs include/config.h	37	autom4te.cache/* libtool include/builddefs include/config.h \
		38	include/fake_platform_defs.h
38		39
39	ifeq ($(HAVE_BUILDDEFS), yes)	40	ifeq ($(HAVE_BUILDDEFS), yes)
40	LDIRDIRT = $(SRCDIR)	41	LDIRDIRT = $(SRCDIR)

Return to bug 560358

Lines 21-30 Link Here

(-)xfsdump-3.1.4.orig/common/hsmapi.h (+2 lines)
21		21
22	#include <xfs/xfs.h>	22	#include <xfs/xfs.h>
23	#include <xfs/jdm.h>	23	#include <xfs/jdm.h>
		24	#include <assert.h>
24	#include "types.h"	25	#include "types.h"
25	#include "global.h"	26	#include "global.h"
26	#include "content.h"	27	#include "content.h"
27	#include "content_inode.h"	28	#include "content_inode.h"
		29	#include "fake_platform_defs.h"
28		30
29	#define HSM_API_VERSION_1 1 /* only version supported so far */	31	#define HSM_API_VERSION_1 1 /* only version supported so far */
30		32

Lines 1-24 Link Here

(-)xfsdump-3.1.4.orig/include/config.h.in (-23 / +106 lines)
1	/*	1	/* include/config.h.in. Generated from configure.ac by autoheader. */
2	* Copyright (c) 2002 Silicon Graphics, Inc. All Rights Reserved.
3	*
4	* @configure_input@
5	*/
6	#ifndef __CONFIG_H__
7	#define __CONFIG_H__
8
9	/* Define if you want gettext (I18N) support */
10	#undef ENABLE_GETTEXT
11
12	#ifndef _
13	# ifdef ENABLE_GETTEXT
14	# include <libintl.h>
15	# define _(x) gettext(x)
16	# else
17	# define _(x) (x)
18	# define textdomain(d) do { } while (0)
19	# define bindtextdomain(d,dir) do { } while (0)
20	# endif
21	#endif
22	#include <locale.h>
23		2
24	#endif /* __CONFIG_H__ */	3	/* Define to 1 if you have the <attr/attributes.h> header file. */
		4	#undef HAVE_ATTR_ATTRIBUTES_H
		5
		6	/* Define to 1 if you have the <dlfcn.h> header file. */
		7	#undef HAVE_DLFCN_H
		8
		9	/* Define to 1 if you have the <inttypes.h> header file. */
		10	#undef HAVE_INTTYPES_H
		11
		12	/* Define to 1 if you have the `attr' library (-lattr). */
		13	#undef HAVE_LIBATTR
		14
		15	/* Define to 1 if you have the `handle' library (-lhandle). */
		16	#undef HAVE_LIBHANDLE
		17
		18	/* Define to 1 if you have the `ncurses' library (-lncurses). */
		19	#undef HAVE_LIBNCURSES
		20
		21	/* Define to 1 if you have the `pthread' library (-lpthread). */
		22	#undef HAVE_LIBPTHREAD
		23
		24	/* Define to 1 if you have the `uuid' library (-luuid). */
		25	#undef HAVE_LIBUUID
		26
		27	/* Define to 1 if you have the <memory.h> header file. */
		28	#undef HAVE_MEMORY_H
		29
		30	/* Define to 1 if you have the <ncurses.h> header file. */
		31	#undef HAVE_NCURSES_H
		32
		33	/* Define to 1 if you have the <pthread.h> header file. */
		34	#undef HAVE_PTHREAD_H
		35
		36	/* Define to 1 if you have the <stdint.h> header file. */
		37	#undef HAVE_STDINT_H
		38
		39	/* Define to 1 if you have the <stdlib.h> header file. */
		40	#undef HAVE_STDLIB_H
		41
		42	/* Define to 1 if you have the <strings.h> header file. */
		43	#undef HAVE_STRINGS_H
		44
		45	/* Define to 1 if you have the <string.h> header file. */
		46	#undef HAVE_STRING_H
		47
		48	/* Define to 1 if you have the <sys/attributes.h> header file. */
		49	#undef HAVE_SYS_ATTRIBUTES_H
		50
		51	/* Define to 1 if you have the <sys/stat.h> header file. */
		52	#undef HAVE_SYS_STAT_H
		53
		54	/* Define to 1 if you have the <sys/types.h> header file. */
		55	#undef HAVE_SYS_TYPES_H
		56
		57	/* Define to 1 if you have the <sys/uuid.h> header file. */
		58	#undef HAVE_SYS_UUID_H
		59
		60	/* Define to 1 if you have the <unistd.h> header file. */
		61	#undef HAVE_UNISTD_H
		62
		63	/* Define to 1 if you have the `uuid_compare' function. */
		64	#undef HAVE_UUID_COMPARE
		65
		66	/* Define to 1 if you have the <uuid.h> header file. */
		67	#undef HAVE_UUID_H
68
69	/* Define to 1 if you have the <uuid/uuid.h> header file. */
70	#undef HAVE_UUID_UUID_H
71
72	/* Define to 1 if you have the <xfs/handle.h> header file. */
73	#undef HAVE_XFS_HANDLE_H
74
75	/* Define to 1 if you have the <xfs/xfs.h> header file. */
76	#undef HAVE_XFS_XFS_H
77
78	/* Define to the sub-directory in which libtool stores uninstalled libraries.
79	*/
80	#undef LT_OBJDIR
81
82	/* Define to the address where bug reports for this package should be sent. */
83	#undef PACKAGE_BUGREPORT
84
85	/* Define to the full name of this package. */
86	#undef PACKAGE_NAME
87
88	/* Define to the full name and version of this package. */
89	#undef PACKAGE_STRING
90
91	/* Define to the one symbol short name of this package. */
92	#undef PACKAGE_TARNAME
93
94	/* Define to the home page for this package. */
95	#undef PACKAGE_URL
96
97	/* Define to the version of this package. */
98	#undef PACKAGE_VERSION
99
100	/* The size of `char ', as computed by sizeof. /
101	#undef SIZEOF_CHAR_P
102
103	/* The size of `long', as computed by sizeof. */
104	#undef SIZEOF_LONG
105
106	/* Define to 1 if you have the ANSI C header files. */
107	#undef STDC_HEADERS

Line 0 Link Here

(-)xfsdump-3.1.4.orig/include/fake_platform_defs.h.in (+163 lines)
		1	/*
		2	* Copyright (c) 2000-2015 Silicon Graphics, Inc.
		3	* All Rights Reserved.
		4	*
		5	* This program is free software; you can redistribute it and/or
		6	* modify it under the terms of the GNU Lesser General Public License
		7	* as published by the Free Software Foundation.
		8	*
		9	* This program is distributed in the hope that it would be useful,
		10	* but WITHOUT ANY WARRANTY; without even the implied warranty of
		11	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		12	* GNU Lesser General Public License for more details.
		13	*
		14	* You should have received a copy of the GNU Lesser General Public License
		15	* along with this program; if not, write the Free Software Foundation,
		16	* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
		17	*
		18	* @configure_input@
		19	*/
		20	#ifndef _FAKE_PLATFORM_DEFS_H
		21	#define _FAKE_PLATFORM_DEFS_H
		22
		23	#include <stdio.h>
		24	#include <errno.h>
		25	#include <fcntl.h>
		26	#include <stdarg.h>
		27	#include <assert.h>
		28	#include <stddef.h>
		29	#include <stdlib.h>
		30	#include <string.h>
		31	#include <stdint.h>
		32	#include <unistd.h>
		33	#include <pthread.h>
		34	#include <ctype.h>
		35	#include <sys/types.h>
		36	#include <limits.h>
		37	#include <stdbool.h>
		38
		39	#undef HAVE___U32
		40	#ifdef HAVE___U32
		41	#include <asm/types.h>
		42	#else
		43	typedef unsigned char __u8;
		44	typedef signed char __s8;
		45	typedef unsigned short __u16;
		46	typedef signed short __s16;
		47	typedef unsigned int __u32;
		48	typedef signed int __s32;
		49	typedef unsigned long long int __u64;
		50	typedef signed long long int __s64;
		51	#endif
		52
		53	#ifdef __CHECKER__
		54	#define __bitwise __attribute__((bitwise))
		55	#define __force __attribute__((force))
		56	#else
		57	#define __bitwise
		58	#define __force
		59	#endif
		60
		61	typedef __u16 __bitwise __le16;
		62	typedef __u32 __bitwise __le32;
		63	typedef __u64 __bitwise __le64;
		64
65	typedef __u16 __bitwise __be16;
66	typedef __u32 __bitwise __be32;
67	typedef __u64 __bitwise __be64;
68
69	typedef struct filldir filldir_t;
70
71	#if defined(__linux__)
72	#include <xfs/linux.h>
73	#elif defined(__FreeBSD__)
74	#include <xfs/freebsd.h>
75	#elif defined(__FreeBSD_kernel__)
76	#include <xfs/gnukfreebsd.h>
77	#elif defined(__APPLE__)
78	#include <xfs/darwin.h>
79	#elif defined(__sgi__) \|\| defined(__sgi)
80	#include <xfs/irix.h>
81	#else
82	# error unknown platform... have fun porting!
83	#endif
84
85	/* long and pointer must be either 32 bit or 64 bit */
86	#undef SIZEOF_LONG
87	#undef SIZEOF_CHAR_P
88	#define BITS_PER_LONG (SIZEOF_LONG * CHAR_BIT)
89
90	/* Check if __psint_t is set to something meaningful */
91	#undef HAVE___PSINT_T
92	#ifndef HAVE___PSINT_T
93	# if (SIZEOF_CHAR_P * CHAR_BIT) == 32
94	typedef int __psint_t;
95	# elif (SIZEOF_CHAR_P * CHAR_BIT) == 64
96	# if BITS_PER_LONG == 64
97	typedef long __psint_t;
98	# else
99	/* This is a very strange architecture, which has 64 bit pointers but */
100	/* not 64 bit longs. So, just punt here and assume long long is OK. */
101	typedef long long __psint_t;
102	# endif
103	# else
104	# error Unknown pointer size
105	# endif
106	#endif
107
108	/* Check whether to define umode_t ourselves. */
109	#ifndef HAVE_UMODE_T
110	typedef unsigned short umode_t;
111	#endif
112
113	/* Define if you want gettext (I18N) support */
114	#undef ENABLE_GETTEXT
115	#ifdef ENABLE_GETTEXT
116	# include <libintl.h>
117	# define _(x) gettext(x)
118	# define N_(x) x
119	#else
120	# define _(x) (x)
121	# define N_(x) x
122	# define textdomain(d) do { } while (0)
123	# define bindtextdomain(d,dir) do { } while (0)
124	#endif
125	#include <locale.h>
126
127	#ifdef DEBUG
128	# define ASSERT(EX) assert(EX)
129	#else
130	# define ASSERT(EX) ((void) 0)
131	#endif
132
133	/*
134	* sparse kernel source annotations
135	*/
136	#ifndef __user
137	#define __user
138	#endif
139
140	#define IRIX_DEV_BITSMAJOR 14
141	#define IRIX_DEV_BITSMINOR 18
142	#define IRIX_DEV_MAXMAJ 0x1ff
143	#define IRIX_DEV_MAXMIN 0x3ffff
144	#define IRIX_DEV_MAJOR(dev) ((int)(((unsigned)(dev) >> IRIX_DEV_BITSMINOR) \
145	& IRIX_DEV_MAXMAJ))
146	#define IRIX_DEV_MINOR(dev) ((int)((dev) & IRIX_DEV_MAXMIN))
147	#define IRIX_MKDEV(major,minor) ((xfs_dev_t)(((major) << IRIX_DEV_BITSMINOR) \
148	\| (minor&IRIX_DEV_MAXMIN)))
149	#define IRIX_DEV_TO_KDEVT(dev) makedev(IRIX_DEV_MAJOR(dev),IRIX_DEV_MINOR(dev))
150
151	/* ARM old ABI has some weird alignment/padding */
152	#if defined(__arm__) && !defined(__ARM_EABI__)
153	#define __arch_pack __attribute__((packed))
154	#else
155	#define __arch_pack
156	#endif
157
158	#ifndef min
159	#define min(a,b) (((a)<(b))?(a):(b))
160	#define max(a,b) (((a)>(b))?(a):(b))
161	#endif
162
163	#endif /* !defined(_FAKE_PLATFORM_DEFS_H) */

Line 0 Link Here

(-)xfsdump-3.1.4.orig/m4/package_types.m4 (+52 lines)
	1	#
	2	# Check if we have a type for the pointer's size integer (__psint_t)
	3	#
	4	AC_DEFUN([AC_TYPE_PSINT],
	5	[ AC_MSG_CHECKING([for __psint_t ])
	6	AC_TRY_COMPILE([
	7	#include <sys/types.h>
	8	#include <stdlib.h>
	9	#include <stddef.h>
	10	], [
	11	__psint_t psint;
	12	], AC_DEFINE(HAVE___PSINT_T) AC_MSG_RESULT(yes) , AC_MSG_RESULT(no))
	13	])
	14
	15	#
	16	# Check if we have a type for the pointer's size unsigned (__psunsigned_t)
	17	#
	18	AC_DEFUN([AC_TYPE_PSUNSIGNED],
	19	[ AC_MSG_CHECKING([for __psunsigned_t ])
	20	AC_TRY_COMPILE([
	21	#include <sys/types.h>
	22	#include <stdlib.h>
	23	#include <stddef.h>
	24	], [
	25	__psunsigned_t psuint;
	26	], AC_DEFINE(HAVE___PSUNSIGNED_T) AC_MSG_RESULT(yes) , AC_MSG_RESULT(no))
	27	])
	28
	29	#
	30	# Check if we have a type for __u32
	31	#
	32	AC_DEFUN([AC_TYPE_U32],
	33	[ AC_MSG_CHECKING([for __u32 ])
	34	AC_TRY_COMPILE([
	35	#include <asm/types.h>
	36	#include <stdlib.h>
	37	#include <stddef.h>
	38	], [
	39	__u32 u32;
	40	], AC_DEFINE(HAVE___U32) AC_MSG_RESULT(yes) , AC_MSG_RESULT(no))
	41	])
	42	#
	43	# Check if we have umode_t
	44	#
	45	AC_DEFUN([AC_TYPE_UMODE_T],
	46	[ AC_MSG_CHECKING([for umode_t])
	47	AC_TRY_COMPILE([
	48	#include <asm/types.h>
	49	], [
	50	umode_t umode;
	51	], AC_DEFINE(HAVE_UMODE_T) AC_MSG_RESULT(yes) , AC_MSG_RESULT(no))
	52	])