RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 03-May-2017 17:03:53
Branch: rpm-5_4 Handle: 2017050315035300
Modified files: (Branch: rpm-5_4)
rpm/rpmio rpmrpc.c
Log:
- orphan.
Summary:
Revision Changes Path
2.99.2.11 +15 -93 rpm/rpmio/rpmrpc.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmrpc.c
============================================================================
$ cvs diff -u -r2.99.2.10 -r2.99.2.11 rpmrpc.c
--- rpm/rpmio/rpmrpc.c 21 Apr 2017 06:19:16 -0000 2.99.2.10
+++ rpm/rpmio/rpmrpc.c 3 May 2017 15:03:53 -0000 2.99.2.11
@@ -3,6 +3,10 @@
*/
#include "system.h"
+
+#if defined(HAVE_SYS_SYSCALL_H)
+# include <sys/syscall.h>
+#endif
#include <rpmio_internal.h>
#include <rpmmacro.h>
@@ -1511,18 +1515,18 @@
return rc;
}
-#if defined(HAVE_SYS_SYSCALL_H)
-#include <sys/syscall.h>
-#endif
-
/* XXX added in kernel >= 3.17, wrapped in glibc >= 2.25 */
+#ifdef REF /* <sys/random.h> */
+#define GRND_NONBLOCK 0x01
+#define GRND_RANDOM 0x02
+#endif
int Getrandom(void *buf, size_t buflen, unsigned int flags);
int Getrandom(void *buf, size_t buflen, unsigned int flags)
{
int rc = -2;
#if defined(HAVE_GETRANDOM)
rc = getrandom(buf, buflen, flags);
-#elif defined(linux) && defined(x86_64) && defined(SYS_getrandom)
+#elif defined(__linux__) && defined(SYS_getrandom)
rc = syscall(SYS_getrandom, buf, buflen, flags);
#else
errno = ENOSYS;
@@ -1535,88 +1539,6 @@
return rc;
}
-#if defined(HAVE_KEYUTILS_H)
-#include <keyutils.h>
-
-key_serial_t Add_key(const char *type, const char *description,
- const void *payload, size_t plen,
- key_serial_t keyring);
-key_serial_t Add_key(const char *type, const char *description,
- const void *payload, size_t plen,
- key_serial_t keyring)
-{
- key_serial_t rc = -2;
-#if defined(HAVE_ADD_KEY)
- rc = add_key(type, description, payload, plen, keyring);
-#elif defined(linux) && defined(x86_64) && defined(SYS_add_key)
- rc = syscall(SYS_add_key, type, description, payload, plen, keyring);
-#else
- errno = ENOSYS;
-#endif
- if (rc < 0)
- rpmlog(RPMLOG_ERR, _("%s(%s,%s,%p[%u],%ld) failed: %m\n"),
- __FUNCTION__, type, description, payload, (unsigned)plen,
(long)keyring);
-if (_rpmio_debug)
-fprintf(stderr, _("<-- %s(%s,%s,%p[%u],%ld) rc %ld\n"), __FUNCTION__, type,
description, payload, (unsigned)plen, (long)keyring, (long)rc);
- return rc;
-}
-
-key_serial_t Keyctl(int cmd, ...);
-key_serial_t Keyctl(int cmd, ...)
-{
- long rc = -2;
- va_list va;
- unsigned long arg2, arg3, arg4, arg5;
-
- va_start(va, cmd);
- arg2 = va_arg(va, unsigned long);
- arg3 = va_arg(va, unsigned long);
- arg4 = va_arg(va, unsigned long);
- arg5 = va_arg(va, unsigned long);
- va_end(va);
-
-#if defined(HAVE_KEYCTL)
- rc = keyctl(cmd, arg2, arg3, arg4, arg5);
-#elif defined(linux) && defined(x86_64) && defined(SYS_keyctl)
- rc = syscall(SYS_keyctl, cmd, arg2, arg3, arg4, arg5);
-#else
- errno = ENOSYS;
-#endif
- if (rc < 0)
- rpmlog(RPMLOG_ERR, _("%s(%d) failed: %m\n"),
- __FUNCTION__, cmd);
-if (_rpmio_debug)
-fprintf(stderr, _("<-- %s(%d) rc %ld\n"), __FUNCTION__, cmd, (long)rc);
- return rc;
-}
-
-key_serial_t request_key(const char *type,
- const char *description,
- const char *callout_info,
- key_serial_t keyring);
-key_serial_t request_key(const char *type,
- const char *description,
- const char *callout_info,
- key_serial_t keyring)
-{
- key_serial_t rc = -2;
-#if defined(HAVE_REQUEST_KEY)
- rc = request_key(type, description, callout_info, keyring);
-#elif defined(linux) && defined(x86_64) && defined(SYS_request_key)
- rc = syscall(SYS_request_key, type, description, callout_info, keyring);
-#else
- errno = ENOSYS;
-#endif
- if (rc < 0)
- rpmlog(RPMLOG_ERR, _("%s(%s,%s,%s,%ld) failed: %m\n"),
- __FUNCTION__, type, description, callout_info, (long)keyring);
-if (_rpmio_debug)
-fprintf(stderr, _("<-- %s(%s,%s,%s,%ld) rc %ld\n"), __FUNCTION__, type,
description, callout_info, (long)keyring, (long)rc);
- return rc;
-}
-
-#endif /* HAVE_KEYUTILS_H */
-
#ifdef NOTYET
#if defined(HAVE_SYS_SENDFILE_H)
@@ -1630,7 +1552,7 @@
int rc;
#if defined(HAVE_SENDFILE)
rc = sendfile(out_fd, in_fd, offset, count);
-#elif defined(linux) && defined(x86_64) && defined(SYS_sendfile)
+#elif defined(__linux__) && defined(SYS_sendfile)
rc = syscall(SYS_sendfile, out_fd, in_fd, offset, count);
#endif
if (rc < 0)
@@ -1651,7 +1573,7 @@
loff_t rc = -2;
#if defined(HAVE_COPY_FILE_RANGE)
rc = copy_file_range(fd_in, off_in, fd_out, off_out, len, flags);
-#elif defined(linux) && defined(x86_64) && defined(SYS_copy_file_range)
+#elif defined(__linux__) && defined(SYS_copy_file_range)
rc = syscall(SYS_copy_file_range, fd_in, off_in, fd_out, off_out, len,
flags);
#else
errno = ENOSYS;
@@ -1675,7 +1597,7 @@
int rc = -2;
#if defined(HAVE_SPLICE)
rc = splice(fd_in, off_in, fd_out, off_out, len, flags);
-#elif defined(linux) && defined(x86_64) && defined(SYS_splice)
+#elif defined(__linux__) && defined(SYS_splice)
rc = syscall(SYS_splice, fd_in, off_in, fd_out, off_out, len, flags);
#else
errno = ENOSYS;
@@ -1695,7 +1617,7 @@
int rc = -2;
#if defined(HAVE_TEE)
rc = tee(fd_in, fd_out, len, flags);
-#elif defined(linux) && defined(x86_64) && defined(SYS_tee)
+#elif defined(__linux__) && defined(SYS_tee)
rc = syscall(SYS_tee, fd_in, fd_out, len, flags);
#else
errno = ENOSYS;
@@ -1717,7 +1639,7 @@
int rc = -2;
#if defined(HAVE_VMSPLICE)
rc = vmsplice(fd, iov, nr_segs, flags);
-#elif defined(linux) && defined(x86_64) && defined(SYS_vmsplice)
+#elif defined(__linux__) && defined(SYS_vmsplice)
rc = syscall(SYS_vmsplice, fd, iov, nr_segs, flags);
#else
errno = ENOSYS;
@@ -1896,7 +1818,7 @@
int rc = -2;
#if defined(HAVE_PRCTL)
rc = prctl(option, arg2, arg3, arg4, arg5);
-#elif defined(linux) && defined(x86_64) && defined(SYS_prctl)
+#elif defined(__linux__) && defined(SYS_prctl)
rc = syscall(SYS_prctl, option, arg2, arg3, arg4, arg5);
#else
errno = ENOSYS;
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
