Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/mlocate/patches/htonll-configure.patch
author Sunil Kumar H G - Oracle Corporation - Bangalore India <sunil.kumar.h.g@oracle.com>
Tue, 02 Jul 2013 22:08:00 -0700
branchs11-update
changeset 2662 240ac3c3ac55
parent 2549 66da0486207a
permissions -rw-r--r--
16730811 convert(1) dumps core when processing PDF file
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2549
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
     1
 
This patch removes htonll/ntohll substitution on platforms that already
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
     2
 
support it.
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
     3
 
We have upstream support ticket #12 to track the Solaris port, available
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
     4
 
at: https://fedorahosted.org/mlocate/ticket/12
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
     5
 
diff -rupN mlocate-0.25-clean/configure.ac mlocate-0.25/configure.ac
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
     6
 
--- mlocate-0.25-clean/configure.ac	2012-03-03 04:58:54.000000000 +0000
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
     7
 
+++ mlocate-0.25/configure.ac	2013-02-18 20:09:21.901723375 +0000
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
     8
 
@@ -48,6 +48,8 @@ AM_GNU_GETTEXT_VERSION([0.17])
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
     9
 
 # Checks for library functions.
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    10
 
 ## getopt_long () availability should be checked here
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    11
 
 AC_CHECK_FUNCS_ONCE([fdopendir])
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    12
 
+AC_CHECK_FUNCS_ONCE([htonll])
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    13
 
+AC_CHECK_FUNCS_ONCE([ntohll])
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    14
 
 AC_FUNC_GETMNTENT
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    15
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    16
 
 # Checks for system services.
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    17
 
diff -rupN mlocate-0.25-clean/src/lib.c mlocate-0.25/src/lib.c
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    18
 
--- mlocate-0.25-clean/src/lib.c	2011-04-28 16:20:42.000000000 +0100
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    19
 
+++ mlocate-0.25/src/lib.c	2013-02-18 20:09:43.618165760 +0000
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    20
 
@@ -36,6 +36,7 @@ Author: Miloslav Trmac <[email protected]>
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    21
 
 #include "db.h"
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    22
 
 #include "lib.h"
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    23
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    24
 
+#if !defined (HAVE_HTONLL)
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    25
 
 /* Convert VAL to big endian */
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    26
 
 uint64_t
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    27
 
 htonll (uint64_t val)
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    28
 
@@ -50,7 +51,9 @@ htonll (uint64_t val)
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    29
 
   memcpy ((unsigned char *)&ret + sizeof (high), &low, sizeof (low));
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    30
 
   return ret;
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    31
 
 }
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    32
 
+#endif
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    33
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    34
 
+#if !defined (HAVE_NTOHLL)
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    35
 
 /* Convert VAL from big endian */
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    36
 
 uint64_t
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    37
 
 ntohll (uint64_t val)
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    38
 
@@ -62,6 +65,7 @@ ntohll (uint64_t val)
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    39
 
   memcpy (&low, (unsigned char *)&val + sizeof (high), sizeof (low));
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    40
 
   return (uint64_t)ntohl (high) << 32 | ntohl (low);
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    41
 
 }
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    42
 
+#endif
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    43
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    44
 
 /* A mapping table for dir_path_cmp: '\0' < '/' < anything else */
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    45
 
 static unsigned char dir_path_cmp_table[UCHAR_MAX + 1];
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    46
 
diff -rupN mlocate-0.25-clean/src/lib.h mlocate-0.25/src/lib.h
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    47
 
--- mlocate-0.25-clean/src/lib.h	2011-03-29 22:59:00.000000000 +0100
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    48
 
+++ mlocate-0.25/src/lib.h	2013-02-18 20:09:43.619270168 +0000
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    49
 
@@ -41,11 +41,15 @@ Author: Miloslav Trmac <[email protected]>
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    50
 
 /* Number of entries in ARRAY */
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    51
 
 #define ARRAY_SIZE(array) (sizeof (array) / sizeof (*array))
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    52
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    53
 
+#if !defined (HAVE_HTONLL)
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    54
 
 /* Convert VAL to big endian */
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    55
 
 extern uint64_t htonll (uint64_t val);
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    56
 
+#endif
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    57
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    58
 
+#if !defined (HAVE_NTOHLL)
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    59
 
 /* Convert VAL from big endian */
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    60
 
 extern uint64_t ntohll (uint64_t val);
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    61
 
+#endif
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    62
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    63
 
 /* Initialize dir_path_cmp_table */
66da0486207a PSARC/2012/123 Replace slocate(1) with mlocate(1)
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff changeset 
    64
 
 extern void dir_path_cmp_init (void);
upstream/oracle/userland-gate