RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 01-Jan-2008 21:27:53
Branch: HEAD Handle: 2008010120275200
Modified files:
rpm CHANGES
rpm/rpmio librpmio.vers rpmlog.c rpmlog.h rpmlua.c rpmlua.h
Log:
- add rpmlogGetCallback() function to allow one to restore the complete
rpmlog() callback information
- add rpmluaGetGlobalState() function to allow foreign code to further
extend the RPM Lua environment
PS: The availability of those two functions is a prerequisite for the
implemention of the RPM Lua extensions rpm.digest(), rpm.signature()
and rpm.query() as those are based on RPM "lib" (and not just "rpmio")
code and hence have to stay under "lib" and cannot directly use "rpmio"
internals.
Summary:
Revision Changes Path
1.2046 +2 -0 rpm/CHANGES
2.31 +2 -0 rpm/rpmio/librpmio.vers
2.40 +8 -0 rpm/rpmio/rpmlog.c
2.20 +9 -0 rpm/rpmio/rpmlog.h
2.37 +5 -0 rpm/rpmio/rpmlua.c
2.9 +1 -0 rpm/rpmio/rpmlua.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2045 -r1.2046 CHANGES
--- rpm/CHANGES 31 Dec 2007 21:43:20 -0000 1.2045
+++ rpm/CHANGES 1 Jan 2008 20:27:52 -0000 1.2046
@@ -1,4 +1,6 @@
5.0b4 -> 5.0.0:
+ - rse: add rpmlogGetCallback() function to allow one to restore the
complete rpmlog() callback information
+ - rse: add rpmluaGetGlobalState() function to allow foreign code to
further extend the RPM Lua environment
- rse: add RPM Lua function rpm.verbose() to be able to check CLI option
--verbose
- rse: add often required RPM Lua convenience function util.slurp()
- rse: add PCRE to "devtool standalone" procedure
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/librpmio.vers
============================================================================
$ cvs diff -u -r2.30 -r2.31 librpmio.vers
--- rpm/rpmio/librpmio.vers 27 Dec 2007 19:05:37 -0000 2.30
+++ rpm/rpmio/librpmio.vers 1 Jan 2008 20:27:52 -0000 2.31
@@ -250,6 +250,7 @@
rpmlogOpen;
rpmlogPrint;
rpmlogSetCallback;
+ rpmlogGetCallback;
rpmlogSetFile;
rpmlogSetMask;
rpmluaCheckScript;
@@ -258,6 +259,7 @@
rpmluaGetPrintBuffer;
rpmluaGetVar;
rpmluaInteractive;
+ rpmluaGetGlobalState;
rpmluaNew;
rpmluaPop;
rpmluaPushTable;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmlog.c
============================================================================
$ cvs diff -u -r2.39 -r2.40 rpmlog.c
--- rpm/rpmio/rpmlog.c 16 Dec 2007 22:54:40 -0000 2.39
+++ rpm/rpmio/rpmlog.c 1 Jan 2008 20:27:52 -0000 2.40
@@ -129,6 +129,14 @@
return ocb;
}
+void rpmlogGetCallback(rpmlogCallback *cb, rpmlogCallbackData *data)
+ /[EMAIL PROTECTED] _rpmlogCallback, _rpmlogCallbackData @*/
+{
+ *cb = _rpmlogCallback;
+ *data = _rpmlogCallbackData;
+ return;
+}
+
/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/
static FILE * _stdlog = NULL;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmlog.h
============================================================================
$ cvs diff -u -r2.19 -r2.20 rpmlog.h
--- rpm/rpmio/rpmlog.h 16 Dec 2007 22:54:40 -0000 2.19
+++ rpm/rpmio/rpmlog.h 1 Jan 2008 20:27:52 -0000 2.20
@@ -208,6 +208,15 @@
/[EMAIL PROTECTED] internalState @*/;
/**
+ * Get rpmlog callback function and data.
+ * @param cb pointer to rpmlog callback function
+ * @param data pointer to callback private (user) data
+ * @return none
+ */
+void rpmlogGetCallback(rpmlogCallback *cb, rpmlogCallbackData *data)
+ /[EMAIL PROTECTED]/;
+
+/**
* Return number of messages.
* @return number of messages
*/
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmlua.c
============================================================================
$ cvs diff -u -r2.36 -r2.37 rpmlua.c
--- rpm/rpmio/rpmlua.c 1 Jan 2008 18:55:38 -0000 2.36
+++ rpm/rpmio/rpmlua.c 1 Jan 2008 20:27:52 -0000 2.37
@@ -52,6 +52,11 @@
/[EMAIL PROTECTED] fileSystem @*/
/[EMAIL PROTECTED] L, fileSystem @*/;
+rpmlua rpmluaGetGlobalState(void)
+{
+ return globalLuaState;
+}
+
/[EMAIL PROTECTED]@*/ /* XXX hide rpmGlobalMacroContext mods for now.
*/
rpmlua rpmluaNew()
{
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmlua.h
============================================================================
$ cvs diff -u -r2.8 -r2.9 rpmlua.h
--- rpm/rpmio/rpmlua.h 6 Oct 2007 19:40:23 -0000 2.8
+++ rpm/rpmio/rpmlua.h 1 Jan 2008 20:27:52 -0000 2.9
@@ -45,6 +45,7 @@
/[EMAIL PROTECTED]@*/
/[EMAIL PROTECTED]@*/
+rpmlua rpmluaGetGlobalState(void);
rpmlua rpmluaNew(void)
/[EMAIL PROTECTED] fileSystem, internalState @*/
/[EMAIL PROTECTED] fileSystem, internalState @*/;
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
