[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/rpmio/ librpmio.vers msqio.c rpmi...
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: 21-May-2017 07:30:35
Branch: rpm-5_4 Handle: 2017052105303500
Modified files: (Branch: rpm-5_4)
rpm CHANGES
rpm/rpmio librpmio.vers msqio.c rpmio.c rpmmsq.h tmq.c
Log:
- msqio: add (and prefer) POSIX message queues (if available).
Summary:
RevisionChanges Path
1.3501.2.554+4 -3 rpm/CHANGES
2.199.2.78 +1 -0 rpm/rpmio/librpmio.vers
1.1.2.4 +192 -48rpm/rpmio/msqio.c
1.230.2.48 +11 -7 rpm/rpmio/rpmio.c
1.1.2.4 +12 -3 rpm/rpmio/rpmmsq.h
1.1.2.4 +6 -0 rpm/rpmio/tmq.c
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.553 -r1.3501.2.554 CHANGES
--- rpm/CHANGES 20 May 2017 19:21:07 - 1.3501.2.553
+++ rpm/CHANGES 21 May 2017 05:30:35 - 1.3501.2.554
@@ -1,7 +1,8 @@
5.4.17 -> 5.4.18:
-- jbj: rpmmsq: permit building --without-msq.
-- jbj: rpmmsq: add per-executable and per-rpm message queue id's.
-- jbj: rpmmsq: use pool allocation. permit queue deletion.
+- jbj: msqio: add (and prefer) POSIX message queues (if available).
+- jbj: msqio: permit building --without-msq.
+- jbj: msqio: add per-executable and per-rpm message queue id's.
+- jbj: rmsqio: use pool allocation. permit queue deletion.
- jbj: rpmio: add ".msqio" to send/receive SysV messages.
- jbj: rpmsw: use clock_gettime (if available).
- jbj: poptALL: spew info for rpm itself with -vv.
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/librpmio.vers
$ cvs diff -u -r2.199.2.77 -r2.199.2.78 librpmio.vers
--- rpm/rpmio/librpmio.vers 20 May 2017 19:21:07 - 2.199.2.77
+++ rpm/rpmio/librpmio.vers 21 May 2017 05:30:35 - 2.199.2.78
@@ -737,6 +737,7 @@
rpmmsqDump;
rpmmsqFree;
rpmmsqNew;
+rpmmsqNotify;
rpmmsqRead;
rpmmsqWrite;
_nix;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/msqio.c
$ cvs diff -u -r1.1.2.3 -r1.1.2.4 msqio.c
--- rpm/rpmio/msqio.c 20 May 2017 19:21:07 - 1.1.2.3
+++ rpm/rpmio/msqio.c 21 May 2017 05:30:35 - 1.1.2.4
@@ -5,14 +5,17 @@
#include "system.h"
-#if defined(WITH_MSQ)
+#if defined(WITH_MQ) || defined(WITH_MSQ)
#if defined(HAVE_SYS_MSG_H)
# include
#endif
#if defined(HAVE_SYS_IPC_H)
# include
#endif
-#endif /* WITH_MSQ */
+#if defined(HAVE_MQUEUE_H)
+# include
+#endif
+#endif /* WITH_MQ */
#include "rpmio_internal.h"
#include
@@ -38,9 +41,12 @@
{
rpmmsq msq = (rpmmsq) _msq;
if (msq) {
- msq->key = 0;
- msq->perms = 0;
+ msq->flags = 0;
+ msq->qname = _free(msq->qname);
msq->qid = 0;
+ msq->oflags = 0;
+ msq->omode = 0;
+ msq->key = 0;
msq->mtype = 0;
}
}
@@ -75,35 +81,95 @@
assert(fmode != NULL); /* XXX return NULL instead? */
msq->qid = -1;
-#if defined(WITH_MSQ)
const char * s = fmode;
int c;
-int perms = 0664;
+int oflags = 0;
+int omode = 0664;
switch ((c = *s++)) {
-case 'a':perms |= IPC_CREAT; break;
-case 'w':perms |= IPC_CREAT; break;
+case 'a':
+ oflags = O_WRONLY | O_CREAT | O_APPEND;
+ omode |= IPC_CREAT;
+ break;
+case 'w':
+ oflags = O_WRONLY | O_CREAT | O_TRUNC;
+ omode |= IPC_CREAT;
+ break;
+case 'r':
+ oflags = O_RDONLY;
+ break;
}
while ((c = *s++) != 0) {
switch (c) {
- case '.': break;
- case '+': continue;
- case 'x': perms |= IPC_EXCL; continue;
- default:continue;
+ case '.':
+ break;
+ case '+':
+ oflags &= ~(O_RDONLY|O_WRONLY);
+ oflags |= O_RDWR;
+ continue;
+ break;
+ case 'c': /* XXX no cancel */
+ continue;
+ break;
+ case 'm': /* XXX mmap */
+ continue;
+ break;
+ case 'e': /* O_CLOEXEC */
+ oflags |= O_CLOEXEC;
+ continue;
+ break;
+ case 'n': /* XXX O_NONBLOCK */
+ oflags |= O_NONBLOCK;
+
[CVS] RPM: rpm-5_4: rpm/rpmio/ rpmbz.h
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: 21-May-2017 07:25:47 Branch: rpm-5_4 Handle: 2017052105254700 Modified files: (Branch: rpm-5_4) rpm/rpmio rpmbz.h Log: - typo. Summary: RevisionChanges Path 1.6.4.3 +1 -1 rpm/rpmio/rpmbz.h patch -p0 <<'@@ .' Index: rpm/rpmio/rpmbz.h $ cvs diff -u -r1.6.4.2 -r1.6.4.3 rpmbz.h --- rpm/rpmio/rpmbz.h 17 May 2017 12:34:39 - 1.6.4.2 +++ rpm/rpmio/rpmbz.h 21 May 2017 05:25:47 - 1.6.4.3 @@ -18,7 +18,7 @@ FILE * fp; /*!< file pointer */ int B; /*!< blockSize100K (default: 9) */ int S; /*!< small (default: 0) */ -int V; /*!< verboisty (default: 0) */ +int V; /*!< verbosity (default: 0) */ int W; /*!< workFactor (default: 30) */ unsigned int nbytes_in; unsigned int nbytes_out; @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/rpmio/ .cvsignore
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: 20-May-2017 21:25:27 Branch: rpm-5_4 Handle: 2017052019252700 Modified files: (Branch: rpm-5_4) rpm/rpmio .cvsignore Log: - ignore cruft. Summary: RevisionChanges Path 1.41.2.17 +6 -0 rpm/rpmio/.cvsignore patch -p0 <<'@@ .' Index: rpm/rpmio/.cvsignore $ cvs diff -u -r1.41.2.16 -r1.41.2.17 .cvsignore --- rpm/rpmio/.cvsignore 17 Apr 2017 18:21:53 - 1.41.2.16 +++ rpm/rpmio/.cvsignore 20 May 2017 19:25:27 - 1.41.2.17 @@ -46,6 +46,9 @@ tblake2bp tblake2s tblake2sp +tcap +tcpuid +tder tdigest tdir tfts @@ -61,6 +64,8 @@ tmagic tmicrojson tmire +tmq +tmqtt todbc toid tperl @@ -76,6 +81,7 @@ tsw ttcl ttpm +turg twitter y.tab.h cppcheck.out @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/python/ rpmdebug-py.c rpmds-py.c rpmts-py.c
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: 20-May-2017 21:22:05
Branch: rpm-5_4 Handle: 2017052019220500
Modified files: (Branch: rpm-5_4)
rpm/python rpmdebug-py.c rpmds-py.c rpmts-py.c
Log:
- splint: RIP.
Summary:
RevisionChanges Path
1.12.10.2 +0 -5 rpm/python/rpmdebug-py.c
1.44.6.5+0 -1 rpm/python/rpmds-py.c
1.111.2.17 +0 -3 rpm/python/rpmts-py.c
patch -p0 <<'@@ .'
Index: rpm/python/rpmdebug-py.c
$ cvs diff -u -r1.12.10.1 -r1.12.10.2 rpmdebug-py.c
--- rpm/python/rpmdebug-py.c 3 Sep 2014 20:07:18 - 1.12.10.1
+++ rpm/python/rpmdebug-py.c 20 May 2017 19:22:05 - 1.12.10.2
@@ -1,9 +1,6 @@
-/*@unchecked@*/
extern PyTypeObject PyCode_Type;
-/*@unchecked@*/
extern PyTypeObject PyDictIter_Type;
-/*@unchecked@*/
extern PyTypeObject PyFrame_Type;
#include /* XXX debug only */
@@ -21,9 +18,7 @@
/**
*/
-/*@observer@*/
static inline const char * lbl(void * s)
- /*@*/
{
PyObject * o = s;
@@ .
patch -p0 <<'@@ .'
Index: rpm/python/rpmds-py.c
$ cvs diff -u -r1.44.6.4 -r1.44.6.5 rpmds-py.c
--- rpm/python/rpmds-py.c 3 Sep 2014 21:34:33 - 1.44.6.4
+++ rpm/python/rpmds-py.c 20 May 2017 19:22:05 - 1.44.6.5
@@ -118,7 +118,6 @@
case Py_GT:
case Py_GE:
case Py_EQ:
- /*@fallthrough@*/
default:
rc = -1;
break;
@@ .
patch -p0 <<'@@ .'
Index: rpm/python/rpmts-py.c
$ cvs diff -u -r1.111.2.16 -r1.111.2.17 rpmts-py.c
--- rpm/python/rpmts-py.c 19 Apr 2016 13:14:30 - 1.111.2.16
+++ rpm/python/rpmts-py.c 20 May 2017 19:22:05 - 1.111.2.17
@@ -287,7 +287,6 @@
if (!result) {
die(cbInfo->cb);
- /*@notreached@*/
} else {
if (PyInt_Check(result))
res = PyInt_AsLong(result);
@@ -722,7 +721,6 @@
if (!result) {
die(cbInfo->cb);
- /*@notreached@*/
}
if (what == RPMCALLBACK_INST_OPEN_FILE) {
@@ -730,7 +728,6 @@
if (!PyArg_Parse(result, "i", )) {
die(cbInfo->cb);
- /*@notreached@*/
}
Py_DECREF(result);
cbInfo->_save = PyEval_SaveThread();
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac rpm/lib/ poptALL.c rpm/r...
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: 20-May-2017 21:21:07 Branch: rpm-5_4 Handle: 2017052019210700 Modified files: (Branch: rpm-5_4) rpm CHANGES configure.ac rpm/lib poptALL.c rpm/rpmio librpmio.vers msqio.c poptIO.c poptIO.h rpmio.h rpmmsq.h tmq.c Log: - rpmmsq: permit building --without-msq. - rpmmsq: add per-executable and per-rpm message queue id's. Summary: RevisionChanges Path 1.3501.2.553+2 -0 rpm/CHANGES 2.472.2.172 +20 -7 rpm/configure.ac 2.144.2.19 +7 -1 rpm/lib/poptALL.c 2.199.2.77 +2 -0 rpm/rpmio/librpmio.vers 1.1.2.3 +76 -20 rpm/rpmio/msqio.c 1.94.2.29 +9 -1 rpm/rpmio/poptIO.c 1.8.4.4 +2 -2 rpm/rpmio/poptIO.h 1.97.2.18 +3 -0 rpm/rpmio/rpmio.h 1.1.2.3 +0 -2 rpm/rpmio/rpmmsq.h 1.1.2.3 +1 -1 rpm/rpmio/tmq.c patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.552 -r1.3501.2.553 CHANGES --- rpm/CHANGES 20 May 2017 16:30:10 - 1.3501.2.552 +++ rpm/CHANGES 20 May 2017 19:21:07 - 1.3501.2.553 @@ -1,4 +1,6 @@ 5.4.17 -> 5.4.18: +- jbj: rpmmsq: permit building --without-msq. +- jbj: rpmmsq: add per-executable and per-rpm message queue id's. - jbj: rpmmsq: use pool allocation. permit queue deletion. - jbj: rpmio: add ".msqio" to send/receive SysV messages. - jbj: rpmsw: use clock_gettime (if available). @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.171 -r2.472.2.172 configure.ac --- rpm/configure.ac 13 May 2017 07:03:14 - 2.472.2.171 +++ rpm/configure.ac 20 May 2017 19:21:07 - 2.472.2.172 @@ -1373,19 +1373,15 @@ dnl # oddball system calls AC_CHECK_HEADERS(sys/syscall.h) +AC_CHECK_HEADERS(linux/memfd.h) +AC_CHECK_FUNCS(memfd_create) AC_CHECK_HEADERS(linux/random.h) AC_CHECK_FUNCS(getentropy) AC_CHECK_FUNCS(getrandom) AC_CHECK_FUNCS(splice tee vmsplice) -AC_CHECK_HEADERS(linux/memfd.h) -AC_CHECK_FUNCS(memfd_create) - -AC_CHECK_HEADERS(sched.h) AC_CHECK_FUNCS(clone setns unshare) -AC_CHECK_HEADERS(linux/kcmp.h) -AC_CHECK_FUNCS(kcmp) AC_CHECK_FUNCS(fadvise posix_fadvise) AC_CHECK_FUNCS(fallocate posix_fallocate) @@ -4183,7 +4179,7 @@ RPM_CHECK_LIB( [POSIX Message Queues in RT], [mq], [rt], [mq_open], [mqueue.h], -[no,external:none], [], +[yes,external:none], [], [ $(echo "$OLIBS" | grep -- ' -lrt' > /dev/null) && LIBS="$OLIBS" AC_CHECK_FUNCS(mq_close) AC_CHECK_FUNCS(mq_getattr) @@ -4197,6 +4193,21 @@ AC_CHECK_FUNCS(mq_unlink) ], []) +dnl # SysV Message Queues +OLIBS="$LIBS" +RPM_CHECK_LIB( +[SysV Message Queues in C], [msq], +[c], [msgget], [sys/msg.h], +[yes,external:none], [], +[ LIBS="$OLIBS" +AC_CHECK_HEADERS(sys/ipc.h) +AC_CHECK_FUNCS(ftok) +AC_CHECK_FUNCS(msgctl) +AC_CHECK_FUNCS(msgget) +AC_CHECK_FUNCS(msgrcv) +AC_CHECK_FUNCS(msgsnd) +], []) + dnl # MOUNT OLIBS="$LIBS" RPM_CHECK_LIB( @@ -4308,6 +4319,8 @@ [c], [sched_yield], [sched.h], [yes,external:none], [], [ LIBS="$OLIBS" +AC_CHECK_HEADERS(linux/kcmp.h) +AC_CHECK_FUNCS(kcmp) AC_CHECK_FUNCS(sched_getaffinity) AC_CHECK_FUNCS(sched_setaffinity) AC_CHECK_FUNCS(sched_getparam) @@ . patch -p0 <<'@@ .' Index: rpm/lib/poptALL.c $ cvs diff -u -r2.144.2.18 -r2.144.2.19 poptALL.c --- rpm/lib/poptALL.c 16 May 2017 18:29:10 - 2.144.2.18 +++ rpm/lib/poptALL.c 20 May 2017 19:21:07 - 2.144.2.19 @@ -4,7 +4,10 @@ */ #include "system.h" -extern const char *__progname; + +#if defined(HAVE_SYS_IPC_H) +# include +#endif #if defined(RPM_VENDOR_WINDRIVER) const char *__usrlibrpm = USRLIBRPM; @@ -579,6 +582,9 @@ int i; rpmioMtrace(); +#if defined(HAVE_FTOK) +__progname_key = ftok(arg0, __progname_projid); +#endif rpmioInitUsage(RPMLOG_DEBUG, __FUNCTION__); setprogname(arg0); /* Retrofit glibc __progname */ @@ . patch
[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/rpmio/ librpmio.vers msqio.c rpmi...
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: 20-May-2017 18:30:10
Branch: rpm-5_4 Handle: 2017052016301000
Modified files: (Branch: rpm-5_4)
rpm CHANGES
rpm/rpmio librpmio.vers msqio.c rpmio.c rpmmsq.h tmq.c
Log:
- rpmmsq: use pool allocation. permit queue deletion.
Summary:
RevisionChanges Path
1.3501.2.552+1 -0 rpm/CHANGES
2.199.2.76 +1 -0 rpm/rpmio/librpmio.vers
1.1.2.2 +60 -70 rpm/rpmio/msqio.c
1.230.2.47 +2 -0 rpm/rpmio/rpmio.c
1.1.2.2 +26 -61 rpm/rpmio/rpmmsq.h
1.1.2.2 +7 -6 rpm/rpmio/tmq.c
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.551 -r1.3501.2.552 CHANGES
--- rpm/CHANGES 20 May 2017 13:40:40 - 1.3501.2.551
+++ rpm/CHANGES 20 May 2017 16:30:10 - 1.3501.2.552
@@ -1,4 +1,5 @@
5.4.17 -> 5.4.18:
+- jbj: rpmmsq: use pool allocation. permit queue deletion.
- jbj: rpmio: add ".msqio" to send/receive SysV messages.
- jbj: rpmsw: use clock_gettime (if available).
- jbj: poptALL: spew info for rpm itself with -vv.
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/librpmio.vers
$ cvs diff -u -r2.199.2.75 -r2.199.2.76 librpmio.vers
--- rpm/rpmio/librpmio.vers 20 May 2017 13:40:40 - 2.199.2.75
+++ rpm/rpmio/librpmio.vers 20 May 2017 16:30:10 - 2.199.2.76
@@ -730,6 +730,7 @@
rpmmrbRunFile;
_rpmmsq_debug;
msqio;
+rpmmsqClose;
rpmmsqCtl;
rpmmsqDump;
rpmmsqFree;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/msqio.c
$ cvs diff -u -r1.1.2.1 -r1.1.2.2 msqio.c
--- rpm/rpmio/msqio.c 20 May 2017 13:40:40 - 1.1.2.1
+++ rpm/rpmio/msqio.c 20 May 2017 16:30:10 - 1.1.2.2
@@ -17,106 +17,85 @@
int _rpmmsq_debug;
+#define SPEW(_list) if (_rpmmsq_debug || _rpmio_debug) fprintf _list
+
#define MSQONLY(fd) assert(fdGetIo(fd) == bzdio)
-const char * rpmmsqStrerror(rpmmsq msq)
-{
-return __FUNCTION__; /* XXX */
-}
+#ifdef __cplusplus
+GENfree(rpmmsq)
+#endif /* __cplusplus */
-void rpmmsqClose(rpmmsq msq, int abort, const char ** errmsq)
+static void rpmmsqFini(void *_msq)
{
-if (_rpmmsq_debug)
- rpmmsqDump(__FUNCTION__, msq);
+rpmmsq msq = (rpmmsq) _msq;
+if (msq) {
+ msq->key = 0;
+ msq->perms = 0;
+ msq->qid = 0;
+ msq->mtype = 0;
+}
}
-rpmmsq rpmmsqFree(rpmmsq msq, int abort)
-{
-if (msq && abort)
- rpmmsqCtl(msq, IPC_RMID, NULL);
-return rpmmsqFini(msq);
-}
+RPMIOPOOL_MODULE(msq)
-rpmmsq rpmmsqNew(const char * path, const char * fmode, int fdno)
+rpmmsq rpmmsqNew(const char * path, const char * fmode, int fdno, int flags)
{
-rpmmsq msq;
-mode_t flags = 0;
-int perms = 0644;
+rpmmsq msq = rpmmsqGetPool(_rpmmsqPool);
+int perms = 0664;
const char * s = fmode;
int c;
assert(fmode != NULL); /* XXX return NULL instead? */
switch ((c = *s++)) {
-case 'a':
- flags = O_WRONLY | O_CREAT | O_APPEND;
- perms |= IPC_CREAT;
- break;
-case 'w':
- flags = O_WRONLY | O_CREAT | O_TRUNC;
- perms |= IPC_CREAT;
- break;
-case 'r':
- flags = O_RDONLY;
- break;
+case 'a':perms |= IPC_CREAT; break;
+case 'w':perms |= IPC_CREAT; break;
}
while ((c = *s++) != 0) {
switch (c) {
- case '.':
- break;
- case '+':
- flags &= ~(O_RDONLY|O_WRONLY);
- flags |= O_RDWR;
- continue;
- break;
- case 'x':
- flags |= O_EXCL;
- perms |= IPC_EXCL;
- continue;
- break;
- default:
- continue;
- break;
+ case '.': break;
+ case '+': continue;
+ case 'x': perms |= IPC_EXCL; continue;
+ default:continue;
}
break;
}
-int _projid = 42;
-long _mtype = getpid(); /* XXX single queue, multiple processes. */
-msq = rpmmsqInit(path, _projid, _mtype, perms);
+msq->key = path && *path
+ ? ftok(path, 42)
+
[CVS] RPM: rpm-5_4: rpm/rpmio/ rpmrpc.c
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: 20-May-2017 15:42:14
Branch: rpm-5_4 Handle: 2017052013421400
Modified files: (Branch: rpm-5_4)
rpm/rpmio rpmrpc.c
Log:
- typo.
Summary:
RevisionChanges Path
2.99.2.14 +15 -15 rpm/rpmio/rpmrpc.c
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmrpc.c
$ cvs diff -u -r2.99.2.13 -r2.99.2.14 rpmrpc.c
--- rpm/rpmio/rpmrpc.c17 May 2017 12:34:40 - 2.99.2.13
+++ rpm/rpmio/rpmrpc.c20 May 2017 13:42:14 - 2.99.2.14
@@ -3,7 +3,7 @@
*/
#include "system.h"
-
+
#if defined(HAVE_SYS_SYSCALL_H)
# include
#endif
@@ -1408,7 +1408,7 @@
st->st_nlink = 1;
st->st_mode = (S_IFREG | 0644);
}
- st->st_ino = hashFunctionString(0, path, 0);;
+ st->st_ino = hashFunctionString(0, path, 0);
st->st_size = fd->contentLength;
st->st_mtime = fd->lastModified;
@@ -1810,7 +1810,7 @@
int Chown(const char * path, uid_t owner, gid_t group)
{
int rc = -2;
-const char * lpath = fdSyscallPrePath(__FUNCTION__, path, 1);;
+const char * lpath = fdSyscallPrePath(__FUNCTION__, path, 1);
rc = lpath != NULL
? chown(lpath, owner, group)
: -2;
@@ -1820,7 +1820,7 @@
int Lchown(const char * path, uid_t owner, gid_t group)
{
int rc = -2;
-const char * lpath = fdSyscallPrePath(__FUNCTION__, path, 1);;
+const char * lpath = fdSyscallPrePath(__FUNCTION__, path, 1);
rc = lpath != NULL
? lchown(lpath, owner, group)
: -2;
@@ -1830,7 +1830,7 @@
int Chmod(const char * path, mode_t mode)
{
int rc = -2;
-const char * lpath = fdSyscallPrePath(__FUNCTION__, path, 1);;
+const char * lpath = fdSyscallPrePath(__FUNCTION__, path, 1);
rc = lpath != NULL
? chmod(lpath, mode)
: -2;
@@ -1840,7 +1840,7 @@
int Lchmod(const char * path, mode_t mode)
{
int rc = -2;
-const char * lpath = fdSyscallPrePath(__FUNCTION__, path, 1);;
+const char * lpath = fdSyscallPrePath(__FUNCTION__, path, 1);
#if defined(HAVE_LCHMOD)
rc = lpath != NULL
? lchmod(lpath, mode)
@@ -1854,7 +1854,7 @@
int Chflags(const char * path, unsigned int flags)
{
int rc = -2;
-const char * lpath = fdSyscallPrePath(__FUNCTION__, path, 1);;
+const char * lpath = fdSyscallPrePath(__FUNCTION__, path, 1);
#if defined(HAVE_CHFLAGS)
rc = lpath != NULL
? chflags(lpath, flags)
@@ -1868,7 +1868,7 @@
int Lchflags(const char * path, unsigned int flags)
{
int rc = -2;
-const char * lpath = fdSyscallPrePath(__FUNCTION__, path, 1);;
+const char * lpath = fdSyscallPrePath(__FUNCTION__, path, 1);
#if defined(HAVE_LCHFLAGS)
rc = lpath != NULL
? lchflags(lpath, flags)
@@ -1882,7 +1882,7 @@
int Mkfifo(const char * path, mode_t mode)
{
int rc = -2;
-const char * lpath = fdSyscallPrePath(__FUNCTION__, path, 1);;
+const char * lpath = fdSyscallPrePath(__FUNCTION__, path, 1);
rc = lpath != NULL
? mkfifo(lpath, mode)
: -2;
@@ -1892,7 +1892,7 @@
int Mknod(const char * path, mode_t mode, dev_t dev)
{
int rc = -2;
-const char * lpath = fdSyscallPrePath(__FUNCTION__, path, 1);;
+const char * lpath = fdSyscallPrePath(__FUNCTION__, path, 1);
rc = lpath != NULL
? mknod(lpath, mode, dev)
: -2;
@@ -1902,7 +1902,7 @@
int Utime(const char * path, const struct utimbuf *buf)
{
int rc = -2;
-const char * lpath = fdSyscallPrePath(__FUNCTION__, path, 1);;
+const char * lpath = fdSyscallPrePath(__FUNCTION__, path, 1);
rc = lpath != NULL
? utime(lpath, buf)
: -2;
@@ -1912,7 +1912,7 @@
int Utimes(const char * path, const struct timeval times[2])
{
int rc = -2;
-const char * lpath = fdSyscallPrePath(__FUNCTION__, path, 1);;
+const char * lpath = fdSyscallPrePath(__FUNCTION__, path, 1);
rc = lpath != NULL
? utimes(lpath, times)
: -2;
@@ -1922,7 +1922,7 @@
int Lutimes(const char * path, const struct timeval times[2])
{
int rc = -2;
-const char * lpath = fdSyscallPrePath(__FUNCTION__, path, 1);;
+const char * lpath = fdSyscallPrePath(__FUNCTION__, path, 1);
#ifdef HAVE_LUTIMES
rc = lpath != NULL
? lutimes(lpath, times)
@@ -2002,7 +2002,7 @@
int Access(const
[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/rpmio/ Makefile.am librpmio.vers ...
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: 20-May-2017 15:40:40 Branch: rpm-5_4 Handle: 2017052013404000 Added files: (Branch: rpm-5_4) rpm/rpmio msqio.c rpmmsq.h tmq.c Modified files: (Branch: rpm-5_4) rpm CHANGES rpm/rpmio Makefile.am librpmio.vers poptIO.c rpmio.c rpmio.h Log: - rpmio: add ".msqio" to send/receive SysV messages. Summary: RevisionChanges Path 1.3501.2.551+1 -0 rpm/CHANGES 1.293.2.80 +13 -9 rpm/rpmio/Makefile.am 2.199.2.75 +8 -0 rpm/rpmio/librpmio.vers 1.1.2.1 +400 -0 rpm/rpmio/msqio.c 1.94.2.28 +6 -3 rpm/rpmio/poptIO.c 1.230.2.46 +39 -26 rpm/rpmio/rpmio.c 1.97.2.17 +5 -1 rpm/rpmio/rpmio.h 1.1.2.1 +112 -0 rpm/rpmio/rpmmsq.h 1.1.2.1 +400 -0 rpm/rpmio/tmq.c patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.550 -r1.3501.2.551 CHANGES --- rpm/CHANGES 13 May 2017 07:04:47 - 1.3501.2.550 +++ rpm/CHANGES 20 May 2017 13:40:40 - 1.3501.2.551 @@ -1,4 +1,5 @@ 5.4.17 -> 5.4.18: +- jbj: rpmio: add ".msqio" to send/receive SysV messages. - jbj: rpmsw: use clock_gettime (if available). - jbj: poptALL: spew info for rpm itself with -vv. - jbj: poptIO: spew info for rpm utilities with -vv. @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/Makefile.am $ cvs diff -u -r1.293.2.79 -r1.293.2.80 Makefile.am --- rpm/rpmio/Makefile.am 10 May 2017 17:05:20 - 1.293.2.79 +++ rpm/rpmio/Makefile.am 20 May 2017 13:40:40 - 1.293.2.80 @@ -15,12 +15,12 @@ rpmcpio.c rpmcpio.h rpmgenbasedir.c rpmgenpkglist.c rpmgensrclist.c \ rpmjsio.msg rpmtar.c rpmtar.h \ tdir.c tfts.c tget.c tgfs.c tgit.c tglob.c thkp.c thtml.c tinv.c tkey.c \ - tmire.c tmqtt.c todbc.c tput.c tpython.c trpmio.c tsexp.c tsvn.c tsw.c \ - lookup3.c duktape.c tjsmn.c tjson.c yajl.c testit.sh \ + tmire.c tmq.c tmqtt.c todbc.c tput.c tpython.c trpmio.c tsexp.c \ + tsvn.c tsw.c lookup3.c duktape.c tjsmn.c tjson.c yajl.c testit.sh \ microjson.c mongoc-counters.defs EXTRA_PROGRAMS = rpmcpio rpmdpkg rpmtar rpmz -EXTRA_PROGRAMS += bdes duk thtml tinv tkey tmacro tpw turg +EXTRA_PROGRAMS += bdes duk thtml tinv tkey tmacro tmq tpw turg noinst_PROGRAMS = tjsmn tmqtt EXTRA_PROGRAMS += bsdiff bspatch pcrsed rpmborg rpmcurl \ @@ -37,17 +37,17 @@ noinst_PROGRAMS += tgit else EXTRA_PROGRAMS += tgit -endif +endif if WITH_LIBTPM noinst_PROGRAMS += ttpm else EXTRA_PROGRAMS += ttpm -endif +endif if WITH_UNIXODBC noinst_PROGRAMS += todbc else EXTRA_PROGRAMS += todbc -endif +endif bin_PROGRAMS = man_MANS = @@ -157,8 +157,8 @@ rpmcdsa.h rpmct.h rpmcudf.h rpmcvs.h rpmdate.h rpmdav.h rpmdir.h \ rpmficl.h rpmgc.h rpmgfs.h rpmgit.h rpmhash.h \ rpmhkp.h rpmhook.h rpmio_internal.h rpmjni.h rpmjs.h rpmjsio.h \ - rpmkeyring.h \ - rpmku.h rpmltc.h rpmlua.h rpmmqtt.h rpmmrb.h rpmnix.h rpmnss.h \ + rpmkeyring.h rpmku.h rpmltc.h rpmlua.h \ + rpmmqtt.h rpmmrb.h rpmmsq.h rpmnix.h rpmnss.h \ rpmodbc.h rpmperl.h rpmpgp.h rpmpython.h rpmruby.h rpmsed.h rpmsm.h rpmsp.h \ rpmsq.h rpmsql.h rpmsquirrel.h rpmssl.h rpmsvn.h rpmsx.h rpmsyck.h \ rpmtcl.h rpmtpm.h rpmuuid.h rpmxar.h rpmz.h rpmzq.h \ @@ -194,6 +194,7 @@ mire.c \ mongoc.c \ mount.c \ + msqio.c \ pcrs.c \ poptIO.c \ rpmacl.c \ @@ -280,7 +281,7 @@ librpmio_la_LDFLAGS += $(LDFLAGS) #librpmio_la_LIBADD += $(LIBS) endif -#librpmio.la: $(librpmio_la_OBJECTS) $(librpmio_la_DEPENDENCIES) +#librpmio.la: $(librpmio_la_OBJECTS) $(librpmio_la_DEPENDENCIES) #$(librpmio_la_LINK) -rpath $(usrlibdir) $(librpmio_la_OBJECTS) $(librpmio_la_LIBADD) #libsqlio_la_SOURCES = libsqlio.c @@ -661,6 +662,9 @@ tjsmn_SOURCES = tjsmn.c tjsmn_LDADD = $(RPMIO_LDADD_COMMON) +tmq_SOURCES = tmq.c +tmq_LDADD = $(RPMIO_LDADD_COMMON) + tmqtt_SOURCES = tmqtt.c tmqtt_LDADD = $(RPMIO_LDADD_COMMON) @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/librpmio.vers $ cvs diff -u -r2.199.2.74 -r2.199.2.75 librpmio.vers ---
