Line
Link Here
|
0 |
-- boxbackup-0.10/bin/bbackupquery/BackupQueries.cpp |
0 |
++ boxbackup-0.10/bin/bbackupquery/BackupQueries.cpp |
Lines 64-69
Link Here
|
64 |
#endif |
64 |
#endif |
65 |
|
65 |
|
66 |
#include <set> |
66 |
#include <set> |
|
|
67 |
#include <limits> |
67 |
|
68 |
|
68 |
#include "BackupQueries.h" |
69 |
#include "BackupQueries.h" |
69 |
#include "Utils.h" |
70 |
#include "Utils.h" |
Lines 815-821
Link Here
|
815 |
} |
816 |
} |
816 |
|
817 |
|
817 |
int64_t id = ::strtoll(args[0].c_str(), 0, 16); |
818 |
int64_t id = ::strtoll(args[0].c_str(), 0, 16); |
818 |
if(id == LLONG_MIN || id == LLONG_MAX || id == 0) |
819 |
if(id == std::numeric_limits<long long>::min() || id == std::numeric_limits<long long>::max() || id == 0) |
819 |
{ |
820 |
{ |
820 |
printf("Not a valid object ID (specified in hex)\n"); |
821 |
printf("Not a valid object ID (specified in hex)\n"); |
821 |
return; |
822 |
return; |
Lines 901-907
Link Here
|
901 |
{ |
902 |
{ |
902 |
// Specified as ID. |
903 |
// Specified as ID. |
903 |
id = ::strtoll(args[0].c_str(), 0, 16); |
904 |
id = ::strtoll(args[0].c_str(), 0, 16); |
904 |
if(id == LLONG_MIN || id == LLONG_MAX || id == 0) |
905 |
if(id == std::numeric_limits<long long>::min() || id == std::numeric_limits<long long>::max() || id == 0) |
905 |
{ |
906 |
{ |
906 |
printf("Not a valid object ID (specified in hex)\n"); |
907 |
printf("Not a valid object ID (specified in hex)\n"); |
907 |
return; |
908 |
return; |
Lines 1694-1700
Link Here
|
1694 |
{ |
1695 |
{ |
1695 |
// Specified as ID. |
1696 |
// Specified as ID. |
1696 |
dirID = ::strtoll(args[0].c_str(), 0, 16); |
1697 |
dirID = ::strtoll(args[0].c_str(), 0, 16); |
1697 |
if(dirID == LLONG_MIN || dirID == LLONG_MAX || dirID == 0) |
1698 |
if(dirID == std::numeric_limits<long long>::min() || dirID == std::numeric_limits<long long>::max() || dirID == 0) |
1698 |
{ |
1699 |
{ |
1699 |
printf("Not a valid object ID (specified in hex)\n"); |
1700 |
printf("Not a valid object ID (specified in hex)\n"); |
1700 |
return; |
1701 |
return; |
1701 |
-- boxbackup-0.10/configure.ac |
1702 |
++ boxbackup-0.10/configure.ac |
Lines 114-120
Link Here
|
114 |
AC_STRUCT_TM |
114 |
AC_STRUCT_TM |
115 |
AX_CHECK_DIRENT_D_TYPE |
115 |
AX_CHECK_DIRENT_D_TYPE |
116 |
AC_SYS_LARGEFILE |
116 |
AC_SYS_LARGEFILE |
117 |
AX_CHECK_LLONG_MINMAX |
|
|
118 |
AX_CHECK_DEFINE_PRAGMA |
117 |
AX_CHECK_DEFINE_PRAGMA |
119 |
if test "x$ac_cv_c_bigendian" != "xyes"; then |
118 |
if test "x$ac_cv_c_bigendian" != "xyes"; then |
120 |
AX_BSWAP64 |
119 |
AX_BSWAP64 |
121 |
-- boxbackup-0.10/infrastructure/m4/ax_check_llong_minmax.m4 |
120 |
++ boxbackup-0.10/infrastructure/m4/ax_check_llong_minmax.m4 |
Lines 1-76
Link Here
|
1 |
dnl @synopsis AX_CHECK_LLONG_MINMAX |
0 |
++ boxbackup-0.10/lib/win32/config.h.win32 |
2 |
dnl |
|
|
3 |
dnl This macro will fix up LLONG_MIN and LLONG_MAX as appropriate. I'm finding |
4 |
dnl it quite difficult to believe that so many hoops are necessary. The world |
5 |
dnl seems to have gone quite mad. |
6 |
dnl |
7 |
dnl This gem is adapted from the OpenSSH configure script so here's |
8 |
dnl the original copyright notice: |
9 |
dnl |
10 |
dnl Copyright (c) 1999-2004 Damien Miller |
11 |
dnl |
12 |
dnl Permission to use, copy, modify, and distribute this software for any |
13 |
dnl purpose with or without fee is hereby granted, provided that the above |
14 |
dnl copyright notice and this permission notice appear in all copies. |
15 |
dnl |
16 |
dnl @category C |
17 |
dnl @author Martin Ebourne and Damien Miller |
18 |
dnl @version 2005/07/07 |
19 |
|
20 |
AC_DEFUN([AX_CHECK_LLONG_MINMAX], [ |
21 |
AC_CHECK_DECL([LLONG_MAX], [have_llong_max=1], , [[#include <limits.h>]]) |
22 |
if test -z "$have_llong_max"; then |
23 |
AC_MSG_CHECKING([[for max value of long long]]) |
24 |
AC_RUN_IFELSE([AC_LANG_SOURCE([[ |
25 |
#include <stdio.h> |
26 |
/* Why is this so damn hard? */ |
27 |
#undef __GNUC__ |
28 |
#undef __USE_ISOC99 |
29 |
#define __USE_ISOC99 |
30 |
#include <limits.h> |
31 |
#define DATA "conftest.llminmax" |
32 |
int main(void) { |
33 |
FILE *f; |
34 |
long long i, llmin, llmax = 0; |
35 |
|
36 |
if((f = fopen(DATA,"w")) == NULL) |
37 |
exit(1); |
38 |
|
39 |
#if defined(LLONG_MIN) && defined(LLONG_MAX) |
40 |
fprintf(stderr, "Using system header for LLONG_MIN and LLONG_MAX\n"); |
41 |
llmin = LLONG_MIN; |
42 |
llmax = LLONG_MAX; |
43 |
#else |
44 |
fprintf(stderr, "Calculating LLONG_MIN and LLONG_MAX\n"); |
45 |
/* This will work on one's complement and two's complement */ |
46 |
for (i = 1; i > llmax; i <<= 1, i++) |
47 |
llmax = i; |
48 |
llmin = llmax + 1LL; /* wrap */ |
49 |
#endif |
50 |
|
51 |
/* Sanity check */ |
52 |
if (llmin + 1 < llmin || llmin - 1 < llmin || llmax + 1 > llmax || llmax - 1 > llmax) { |
53 |
fprintf(f, "unknown unknown\n"); |
54 |
exit(2); |
55 |
} |
56 |
|
57 |
if (fprintf(f ,"%lld %lld", llmin, llmax) < 0) |
58 |
exit(3); |
59 |
|
60 |
exit(0); |
61 |
} |
62 |
]])], [ |
63 |
read llong_min llong_max < conftest.llminmax |
64 |
AC_MSG_RESULT([$llong_max]) |
65 |
AC_DEFINE_UNQUOTED([LLONG_MAX], [${llong_max}LL], |
66 |
[max value of long long calculated by configure]) |
67 |
AC_MSG_CHECKING([[for min value of long long]]) |
68 |
AC_MSG_RESULT([$llong_min]) |
69 |
AC_DEFINE_UNQUOTED([LLONG_MIN], [${llong_min}LL], |
70 |
[min value of long long calculated by configure]) |
71 |
], |
72 |
[AC_MSG_RESULT(not found)], |
73 |
[AC_MSG_WARN([[cross compiling: not checking]])] |
74 |
) |
75 |
fi |
76 |
])dnl |
77 |
-- boxbackup-0.10/lib/win32/config.h.win32 |
Lines 318-329
Link Here
|
318 |
/* Define to 1 if __syscall is available but needs a definition */ |
318 |
/* Define to 1 if __syscall is available but needs a definition */ |
319 |
/* #undef HAVE___SYSCALL_NEED_DEFN */ |
319 |
/* #undef HAVE___SYSCALL_NEED_DEFN */ |
320 |
|
320 |
|
321 |
/* max value of long long calculated by configure */ |
|
|
322 |
/* #undef LLONG_MAX */ |
323 |
|
324 |
/* min value of long long calculated by configure */ |
325 |
/* #undef LLONG_MIN */ |
326 |
|
327 |
/* Define to 1 if `lstat' dereferences a symlink specified with a trailing |
321 |
/* Define to 1 if `lstat' dereferences a symlink specified with a trailing |
328 |
slash. */ |
322 |
slash. */ |
329 |
/* #undef LSTAT_FOLLOWS_SLASHED_SYMLINK */ |
323 |
/* #undef LSTAT_FOLLOWS_SLASHED_SYMLINK */ |
330 |
-- boxbackup-0.10/VERSION.txt |
324 |
++ boxbackup-0.10/VERSION.txt |
Lines 1-2
Link Here
|
1 |
0.10 |
1 |
0.10-r1 |
2 |
boxbackup |
2 |
boxbackup |