[CVS] RPM: rpm-5_4: rpm/rpmdb/ Makefile.am lmdb.c

2017-07-22 Thread Jeff Johnson 
  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:   22-Jul-2017 16:19:33
  Branch: rpm-5_4  Handle: 2017072214193300

  Modified files:   (Branch: rpm-5_4)
rpm/rpmdb   Makefile.am lmdb.c

  Log:
- lmdb: stub-in the rpm.org lib/backend/ndb/glue.c layer.

  Summary:
RevisionChanges Path
1.134.2.38  +6  -0  rpm/rpmdb/Makefile.am
1.1.2.2 +905 -6 rpm/rpmdb/lmdb.c
  

  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/Makefile.am
  
  $ cvs diff -u -r1.134.2.37 -r1.134.2.38 Makefile.am
  --- rpm/rpmdb/Makefile.am 21 Jul 2017 15:14:23 -  1.134.2.37
  +++ rpm/rpmdb/Makefile.am 22 Jul 2017 14:19:33 -  1.134.2.38
  @@ -329,9 +329,15 @@
   logio_SOURCES = logio.c logio.h
   logio_LDADD = $(mylibs)
   
  +lmdb_CFLAGS = -I/X/src/rpm/include -I/X/src/rpm
   lmdb_SOURCES = lmdb.c
   lmdb_LDADD = $(mylibs)
   
  +ltest: lmdb
  + rm -rf testdb && mkdir testdb
  + ./lmdb
  + ls -al testdb
  +
   #libsqldb_la_SOURCES = libsqldb.c # sqlite.c
   #libsqldb_la_LIBADD  = $(RPMIO_LDADD_COMMON)
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/lmdb.c
  
  $ cvs diff -u -r1.1.2.1 -r1.1.2.2 lmdb.c
  --- rpm/rpmdb/lmdb.c  21 Jul 2017 15:14:23 -  1.1.2.1
  +++ rpm/rpmdb/lmdb.c  22 Jul 2017 14:19:33 -  1.1.2.2
  @@ -1,16 +1,909 @@
  -#include 
  -#include 
  -#include 
  +#include "system.h"
  +
  +#include 
  +#include 
  +#include 
  +#include 
  +
   #include "lmdb.h"
   
  +#include "debug.h"
  +
  +static int _debug = -1;
  +
   #define E(expr) CHECK((rc = (expr)) == MDB_SUCCESS, #expr)
   #define RES(err, expr) ((rc = expr) == (err) || (CHECK(!rc, #expr), 0))
   #define CHECK(test, msg) ((test) ? (void)0 : ((void)fprintf(stderr, \
"%s:%d: %s: %s\n", __FILE__, __LINE__, msg, mdb_strerror(rc)), abort()))
   
  +/*==*/
  +
  +#define H_RPMSW
  +
  +#define _RPMTYPES_H
  +typedef struct headerToken_s * Header;
  +typedef int32_t rpm_tag_t;
  +typedef uint32_trpm_tagtype_t;
  +typedef uint32_trpm_count_t;
  +typedef rpm_tag_t   rpmTagVal;
  +
  +typedef struct rpmts_s * rpmts;
  +typedef  void *  rpmDbiTag;
  +
  +typedef rpm_tag_t   rpmDbiTagVal;
  +
  +typedef struct dbiIndex_s * dbiIndex;
  +typedef struct dbiCursor_s * dbiCursor;
  +typedef struct dbiIndexSet_s * dbiIndexSet;
  +
  +typedef struct rpmdb_s * rpmdb;
  +
  +#ifdef   REFERENCE
  +struct dbConfig_s {
  +int  db_mmapsize;/*!< (10Mb) */
  +int  db_cachesize;   /*!< (128Kb) */
  +int  db_verbose;
  +int  db_no_fsync;/*!< no-op fsync for db */
  +int db_eflags;   /*!< obsolete */
  +};
  +
  +struct dbiConfig_s {
  +int  dbi_oflags; /*!< open flags */
  +int  dbi_no_dbsync;  /*!< don't call dbiSync */
  +int  dbi_lockdbfd;   /*!< do fcntl lock on db fd */
  +};
  +
  +struct rpmdbOps_s;
  +
  +/** \ingroup rpmdb
  + * Describes the collection of index databases used by rpm.
  + */
  +struct rpmdb_s {
  +char * db_root;/*!< path prefix */
  +char * db_home;/*!< directory path */
  +char * db_fullpath;  /*!< full db path including prefix */
  +int  db_flags;
  +int  db_mode;/*!< open mode */
  +int  db_perms;   /*!< open permissions */
  +char * db_descr; /*!< db backend description (for error msgs) */
  +struct dbChk_s * db_checked;/*!< headerCheck()'ed package instances */
  +rpmdbdb_next;
  +int  db_opens;
  +dbiIndex db_pkgs;/*!< Package db */
  +const rpmDbiTag * db_tags;
  +int  db_ndbi;/*!< No. of tag indices. */
  +dbiIndex * db_indexes;   /*!< Tag indices. */
  +int  db_buildindex;  /*!< Index rebuild indicator */
  +
  +struct rpmdbOps_s * db_ops;  /*!< backend ops */
  +
  +/* dbenv and related parameters */
  +void * db_dbenv; /*!< Backend private handle */
  +struct dbConfig_s cfg;
  +int db_remove_env;
  +
  +struct rpmop_s db_getops;
  +struct rpmop_s db_putops;
  +struct rpmop_s db_delops;
  +
  +int nrefs;   /*!< Reference count. */
  +};
  +#endif   /* REFERENCE */
  +
  +typedef struct miRE_s * miRE;
  +
  +typedef struct rpmdbMatchIterator_s * rpmdbMatchIterator;
  +struct

[CVS] RPM: rpm-5_4: rpm/rpmdb/ Makefile.am _rpmhash.C _rpmhash.H rpmha...

2016-05-07 Thread Jeff Johnson 
  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:   07-May-2016 17:13:04
  Branch: rpm-5_4  Handle: 2015053111061829563606

  Added files:  (Branch: rpm-5_4)
rpm/rpmdb   _rpmhash.C _rpmhash.H
  Modified files:   (Branch: rpm-5_4)
rpm/rpmdb   Makefile.am
  Removed files:(Branch: rpm-5_4)
rpm/rpmdb   rpmhash.C rpmhash.H

  Log:
- fix: add a underscore prefix to avoid name collisions on HFS.

  Summary:
RevisionChanges Path
1.134.2.31  +2  -1  rpm/rpmdb/Makefile.am
1.1.2.1 +309 -0 rpm/rpmdb/_rpmhash.C
1.1.2.1 +178 -0 rpm/rpmdb/_rpmhash.H
1.1 +0  -309rpm/rpmdb/rpmhash.C
1.1 +0  -178rpm/rpmdb/rpmhash.H
  

  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/Makefile.am
  
  $ cvs diff -u -r1.134.2.30 -r1.134.2.31 Makefile.am
  --- rpm/rpmdb/Makefile.am 5 May 2016 22:18:45 -   1.134.2.30
  +++ rpm/rpmdb/Makefile.am 7 May 2016 15:13:04 -   1.134.2.31
  @@ -33,7 +33,8 @@
   EXTRA_DIST = librpmdb.vers \
db3.c sqlite.c db_emu.h librpmdb.vers bdb.sql libsqldb.c \
logio.awk logio.src logio_recover_template logio_template logio.c \
  - logio_rec.c logio_auto.c logio_autop.c logio_auto.h
  + logio_rec.c logio_auto.c logio_autop.c logio_auto.h \
  + _rpmhash.C _rpmhash.H
   
   EXTRA_PROGRAMS = qfcalc qfgraph logio tjfn tqf tprintf # tbdb
   noinst_PROGRAMS = json
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/_rpmhash.C
  
  $ cvs diff -u -r0 -r1.1.2.1 _rpmhash.C
  --- /dev/null 2016-05-07 17:11:00.0 +0200
  +++ _rpmhash.C2016-05-07 17:13:04.330506454 +0200
  @@ -0,0 +1,309 @@
  +/**
  + * \file lib/rpmhash.c
  + * Hash table implemenation
  + */
  +
  +#include "system.h"
  +#include 
  +#include "debug.h"
  +
  +#define Bucket JOIN(HASHTYPE,Buket)
  +#define Bucket_s JOIN(HASHTYPE,Buket_s)
  +
  +typedef  struct  Bucket_s * Bucket;
  +
  +/**
  + */
  +struct  Bucket_s {
  +Bucket next; /*!< pointer to next item in bucket */
  +HTKEYTYPE key;  /*!< hash key */
  +#ifdef HTDATATYPE
  +int dataCount;   /*!< data entries */
  +HTDATATYPE data[1];  /*!< data - grows by resizing whole bucket */
  +#endif
  +};
  +
  +/**
  + */
  +struct HASHSTRUCT {
  +int numBuckets;  /*!< number of hash buckets */
  +Bucket * buckets;/*!< hash bucket array */
  +hashFunctionType fn; /*!< generate hash value for key */
  +hashEqualityType eq; /*!< compare hash keys for equality */
  +hashFreeKey freeKey;
  +int bucketCount; /*!< number of used buckets */
  +int keyCount;/*!< number of keys */
  +#ifdef HTDATATYPE
  +int dataCount;   /*!< number of data entries */
  +hashFreeData freeData;
  +#endif
  +};
  +
  +/**
  + * Find entry in hash table.
  + * @param htpointer to hash table
  + * @param key   pointer to key value
  + * @param keyHashkey hash
  + * @return pointer to hash bucket of key (or NULL)
  + */
  +static
  +Bucket HASHPREFIX(findEntry)(HASHTYPE ht, HTKEYTYPE key, unsigned int 
keyHash)
  +{
  +unsigned int hash = keyHash % ht->numBuckets;
  +Bucket b = ht->buckets[hash];
  +
  +while (b && ht->eq(b->key, key))
  + b = b->next;
  +
  +return b;
  +}
  +
  +HASHTYPE HASHPREFIX(Create)(int numBuckets,
  + hashFunctionType fn, hashEqualityType eq,
  + hashFreeKey freeKey
  +#ifdef HTDATATYPE
  +, hashFreeData freeData
  +#endif
  +)
  +{
  +HASHTYPE ht;
  +
  +ht = xmalloc(sizeof(*ht));
  +ht->numBuckets = numBuckets > 11 ? numBuckets : 11;
  +ht->buckets = xcalloc(ht->numBuckets, sizeof(*ht->buckets));
  +ht->freeKey = freeKey;
  +#ifdef HTDATATYPE
  +ht->freeData = freeData;
  +ht->dataCount = 0;
  +#endif
  +ht->fn = fn;
  +ht->eq = eq;
  +ht->bucketCount = ht->keyCount = 0;
  +return ht;
  +}
  +
  +static void HASHPREFIX(Resize)(HASHTYPE ht, int numBuckets) {
  +Bucket * buckets = xcalloc(numBuckets, sizeof(*ht->buckets));
  +
  +for (int i=0; inumBuckets; i++) {
  + Bucket b = ht->buckets[i];
  + Bucket nextB;
  + while (b != NULL) {
  + unsigned int hash = ht->fn(b->key) % numBuckets;
  + nextB = b->next;
  + b->next = buckets[hash];
  +

[CVS] RPM: rpm-5_4: rpm/rpmdb/ Makefile.am

2016-05-05 Thread Jeff Johnson 
  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:   06-May-2016 00:18:45
  Branch: rpm-5_4  Handle: 2016050522184500

  Modified files:   (Branch: rpm-5_4)
rpm/rpmdb   Makefile.am

  Log:
- add tprintf.

  Summary:
RevisionChanges Path
1.134.2.30  +4  -1  rpm/rpmdb/Makefile.am
  

  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/Makefile.am
  
  $ cvs diff -u -r1.134.2.29 -r1.134.2.30 Makefile.am
  --- rpm/rpmdb/Makefile.am 13 Mar 2016 23:44:47 -  1.134.2.29
  +++ rpm/rpmdb/Makefile.am 5 May 2016 22:18:45 -   1.134.2.30
  @@ -35,7 +35,7 @@
logio.awk logio.src logio_recover_template logio_template logio.c \
logio_rec.c logio_auto.c logio_autop.c logio_auto.h
   
  -EXTRA_PROGRAMS = qfcalc qfgraph logio tjfn tqf # tbdb
  +EXTRA_PROGRAMS = qfcalc qfgraph logio tjfn tqf tprintf # tbdb
   noinst_PROGRAMS = json
   
   RPMMISC_LDADD_COMMON = \
  @@ -380,6 +380,9 @@
-r $(testdir)/fodder/*.rpm \
   $(testdir)/fodder/fmtmod.qf
   
  +tprintf_SOURCES = tprintf.c
  +tprintf_CFLAGS = $(AM_CPPFLAGS)
  +
   #tbdb_SOURCES = tbdb.c bdb.c
   #tbdb_LDADD = $(mylibs)
   
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/rpmdb/ Makefile.am

2016-02-28 Thread Jeff Johnson 
  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:   28-Feb-2016 17:57:00
  Branch: rpm-5_4  Handle: 201602281657

  Modified files:   (Branch: rpm-5_4)
rpm/rpmdb   Makefile.am

  Log:
- autofu: clean up bison/lex built sources in distclean instead.

  Summary:
RevisionChanges Path
1.134.2.28  +2  -1  rpm/rpmdb/Makefile.am
  

  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/Makefile.am
  
  $ cvs diff -u -r1.134.2.27 -r1.134.2.28 Makefile.am
  --- rpm/rpmdb/Makefile.am 28 Feb 2016 16:35:39 -  1.134.2.27
  +++ rpm/rpmdb/Makefile.am 28 Feb 2016 16:57:00 -  1.134.2.28
  @@ -192,9 +192,10 @@
   check-local:
   
   clean-local:
  - rm -f *.o tagtbl.c Tgrammar.* Qgrammar.*
  + rm -f *.o tagtbl.c
   
   distclean-local:
  + rm -f Tgrammar.* Qgrammar.*
rm -f .syntastic_c_config
   
   uninstall-local:
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/rpmdb/ Makefile.am

2016-02-28 Thread Jeff Johnson 
  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:   28-Feb-2016 17:35:39
  Branch: rpm-5_4  Handle: 2016022816353900

  Modified files:   (Branch: rpm-5_4)
rpm/rpmdb   Makefile.am

  Log:
- fix: joy of "make distcheck".

  Summary:
RevisionChanges Path
1.134.2.27  +10 -5  rpm/rpmdb/Makefile.am
  

  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/Makefile.am
  
  $ cvs diff -u -r1.134.2.26 -r1.134.2.27 Makefile.am
  --- rpm/rpmdb/Makefile.am 27 Feb 2016 20:55:24 -  1.134.2.26
  +++ rpm/rpmdb/Makefile.am 28 Feb 2016 16:35:39 -  1.134.2.27
  @@ -33,8 +33,7 @@
   EXTRA_DIST = \
db3.c sqlite.c db_emu.h librpmdb.vers bdb.sql libsqldb.c \
logio.awk logio.src logio_recover_template logio_template logio.c \
  - logio_rec.c logio_auto.c logio_autop.c logio_auto.h \
  - qf.l qf.y qf.inp tqf.l tqf.y tqf.inp grammar.y scanner.l json1.js
  + logio_rec.c logio_auto.c logio_autop.c logio_auto.h
   
   EXTRA_PROGRAMS = qfcalc qfgraph logio tjfn tqf # tbdb
   noinst_PROGRAMS = json
  @@ -193,7 +192,7 @@
   check-local:
   
   clean-local:
  - rm -f *.o tagtbl.c
  + rm -f *.o tagtbl.c Tgrammar.* Qgrammar.*
   
   distclean-local:
rm -f .syntastic_c_config
  @@ -332,8 +331,10 @@
   YACC =   bison
   YFLAGS=  -Dapi.pure -t -d -v --report=all
   
  +EXTRA_DIST += grammar.y scanner.l json1.js
  +EXTRA_DIST += Jgrammar.c Jgrammar.h Jscanner.c
   BUILT_SOURCES += Jgrammar.c Jgrammar.h Jscanner.c
  -Jgrammar.c: grammar.y
  +Jgrammar.c Jgrammar.h: grammar.y
$(YACC) $(YFLAGS) -o $@ $<
   Jscanner.c: scanner.l
$(LEX) -R -o $@ $<
  @@ -342,8 +343,10 @@
   testjson: json1.js json
./json json1.js
   
  +EXTRA_DIST += qf.l qf.y qf.inp
  +#EXTRA_DIST += Qgrammar.c Qgrammar.h Qscanner.c
   BUILT_SOURCES += Qgrammar.c Qgrammar.h Qscanner.c
  -Qgrammar.c: qf.y
  +Qgrammar.c Qgrammar.h: qf.y
$(YACC) $(YFLAGS) -o $@ $<
   Qscanner.c: qf.l
$(LEX) -R -o $@ $<
  @@ -354,6 +357,8 @@
./qfcalc < qf.inp
./qfgraph < qf.inp
   
  +EXTRA_DIST += tqf.l tqf.y tqf.inp
  +#EXTRA_DIST += Tgrammar.c Tgrammar.h Tscanner.c
   BUILT_SOURCES += Tgrammar.c Tgrammar.h Tscanner.c
   Tgrammar.c Tgrammar.h: tqf.y
$(YACC) $(YFLAGS) -o $@ $<
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/rpmdb/ Makefile.am

2016-02-27 Thread Jeff Johnson 
  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:   27-Feb-2016 21:55:24
  Branch: rpm-5_4  Handle: 2016022720552400

  Modified files:   (Branch: rpm-5_4)
rpm/rpmdb   Makefile.am

  Log:
Occasionally the cp -p fails with a non-zero return code.  This will cause
the system abort the build.

Upstream-Status: Pending

Signed-off-by: Mark Hatle 

  Summary:
RevisionChanges Path
1.134.2.26  +7  -4  rpm/rpmdb/Makefile.am
  

  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/Makefile.am
  
  $ cvs diff -u -r1.134.2.25 -r1.134.2.26 Makefile.am
  --- rpm/rpmdb/Makefile.am 27 Feb 2016 20:13:54 -  1.134.2.25
  +++ rpm/rpmdb/Makefile.am 27 Feb 2016 20:55:24 -  1.134.2.26
  @@ -293,11 +293,14 @@
   #lcov-upload: lcov
   #rsync -rvz -e ssh --delete lcov/* ???
   
  +$(builddir)/logio_recover_template: $(srcdir)/logio_recover_template
  + @if test ".$(builddir)" != ".$(srcdir)"; then \
  + cp -fp $(srcdir)/logio_recover_template \
  +   $(builddir)/logio_recover_template ; \
  +  fi
  +
   logio_BUILT = logio_auto.c logio_autop.c logio_auto.h logio_template
  -$(logio_BUILT):  logio.awk logio.src logio_recover_template
  - @test -e $(builddir)/logio_recover_template || \
  - cp -p $(srcdir)/logio_recover_template \
  -   $(builddir)/logio_recover_template
  +$(logio_BUILT):  logio.awk logio.src $(builddir)/logio_recover_template
@rm -f $(logio_BUILT)
@$(AWK) -f $(srcdir)/logio.awk \
-v header_file=logio_auto.h \
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/rpmdb/ Makefile.am

2016-02-27 Thread Jeff Johnson 
  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:   27-Feb-2016 21:13:54
  Branch: rpm-5_4  Handle: 2016022720135400

  Modified files:   (Branch: rpm-5_4)
rpm/rpmdb   Makefile.am

  Log:
During installation, the libtool relink attempts to link to -lrpm...
The problem is that it hasn't been installed yet!  So small change causes
the libtool to instead use the build version.

  Summary:
RevisionChanges Path
1.134.2.25  +3  -0  rpm/rpmdb/Makefile.am
  

  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/Makefile.am
  
  $ cvs diff -u -r1.134.2.24 -r1.134.2.25 Makefile.am
  --- rpm/rpmdb/Makefile.am 11 Jun 2015 02:22:55 -  1.134.2.24
  +++ rpm/rpmdb/Makefile.am 27 Feb 2016 20:13:54 -  1.134.2.25
  @@ -126,6 +126,9 @@
   librpmdb.la: $(librpmdb_la_OBJECTS) $(librpmdb_la_DEPENDENCIES) 
$(librpmdb_la_LINK) -rpath $(usrlibdir) $(librpmdb_la_OBJECTS) 
$(librpmdb_la_LIBADD)
   
  +# pkglib libraries needs to have usrlib libraries already installed!
  +install-pkglibLTLIBRARIES: install-usrlibLTLIBRARIES
  +
   install-data-hook:
   if !ENABLE_BUILD_LAFILES
-for l in $(usrlib_LTLIBRARIES); do \
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/rpmdb/ Makefile.am grammar.y scanner.l tqf.l t...

2015-06-10 Thread Jeff Johnson 
  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:   11-Jun-2015 04:22:56
  Branch: rpm-5_4  Handle: 2015061102225500

  Modified files:   (Branch: rpm-5_4)
rpm/rpmdb   Makefile.am grammar.y scanner.l tqf.l tqf.y

  Log:
- tqf: sanity WIP.

  Summary:
RevisionChanges Path
1.134.2.24  +1  -1  rpm/rpmdb/Makefile.am
1.1.2.2 +31 -20 rpm/rpmdb/grammar.y
1.1.2.3 +23 -10 rpm/rpmdb/scanner.l
1.1.2.11+19 -9  rpm/rpmdb/tqf.l
1.1.2.9 +111 -93rpm/rpmdb/tqf.y
  

  patch -p0 '@@ .'
  Index: rpm/rpmdb/Makefile.am
  
  $ cvs diff -u -r1.134.2.23 -r1.134.2.24 Makefile.am
  --- rpm/rpmdb/Makefile.am 2 Jun 2015 15:09:14 -   1.134.2.23
  +++ rpm/rpmdb/Makefile.am 11 Jun 2015 02:22:55 -  1.134.2.24
  @@ -365,7 +365,7 @@
./tqf \
--dbpath=$(testdir) \
-r $(testdir)/fodder/*.rpm \
  -$(testdir)/fodder/fmt.qf
  +$(testdir)/fodder/fmtmod.qf
   
   #tbdb_SOURCES = tbdb.c bdb.c
   #tbdb_LDADD = $(mylibs)
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmdb/grammar.y
  
  $ cvs diff -u -r1.1.2.1 -r1.1.2.2 grammar.y
  --- rpm/rpmdb/grammar.y   22 May 2015 14:26:16 -  1.1.2.1
  +++ rpm/rpmdb/grammar.y   11 Jun 2015 02:22:55 -  1.1.2.2
  @@ -1,28 +1,39 @@
  -%define api.pure
   %lex-param{void *scanner} 
   %parse-param{struct pass_to_bison *x}
  +
   %{
  -#include stdio.h
  -#include json.h
  -#define yylex Jyylex
   
  -/* 
  -http://www.lemoda.net/c/reentrant-parser/index.html
  +#include stdio.h
  +#include rpmutil.h
  +#include json.h
  +#define yylex Jyylex
  +
  +/* 
  +http://www.lemoda.net/c/reentrant-parser/index.html
  +
  +Note, for a valid JSON parser, 
  +%start object
  +For use in seismic, we need
  +%start members
  +*/
  +#define scanner  (x-flex_scanner)
  +
  +static Jpair_t   * Jpair_new(char *id, void *val);
  +static Jvalue_t  * Jvalue_new(void *any, Jtype_t type);
  +static Jarray_t  * Jarray_new(Jvalue_t *value);
  +static Jarray_t  * Jarray_add(Jvalue_t *value, Jarray_t *array);
  +static Jobject_t * Jobject_new(Jpair_t *pair);
  +static Jobject_t * Jobject_add(Jpair_t *pair, Jobject_t *obj);
  +
  +//%start members
  +
  +extern int Jyylex ();
  +
  +RPM_GNUC_PURE int Jyyget_column();
  +RPM_GNUC_PURE int Jyyget_in();
  +RPM_GNUC_PURE int Jyyget_out();
   
  -Note, for a valid JSON parser, 
  -%start object
  -For use in seismic, we need
  -%start members
  -*/
  -#define scanner  (x-flex_scanner)
  -
  -static Jpair_t   * Jpair_new(char *id, void *val);
  -static Jvalue_t  * Jvalue_new(void *any, Jtype_t type);
  -static Jarray_t  * Jarray_new(Jvalue_t *value);
  -static Jarray_t  * Jarray_add(Jvalue_t *value, Jarray_t *array);
  -static Jobject_t * Jobject_new(Jpair_t *pair);
  -static Jobject_t * Jobject_add(Jpair_t *pair, Jobject_t *obj);
  -//%start members
  +void yyerror(void *x, char *s);
   
   %}
   
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmdb/scanner.l
  
  $ cvs diff -u -r1.1.2.2 -r1.1.2.3 scanner.l
  --- rpm/rpmdb/scanner.l   25 May 2015 21:31:47 -  1.1.2.2
  +++ rpm/rpmdb/scanner.l   11 Jun 2015 02:22:55 -  1.1.2.3
  @@ -13,18 +13,31 @@
   %option  noyyget_lval
   
   %{
  -#include json.h
  -#include Jgrammar.h
  -#define MAX(a, b)   ((ab)?(a):(b))
  -#define TEXT_BLOCK_SIZE  1024
  -struct Jcontext_t
  -{
  -char   *value;
  -size_t  used;
  -size_t  size;
  -};
  +#include rpmutil.h
  +
  +#include json.h
  +#include Jgrammar.h
  +
  +#define MAX(a, b)   ((ab)?(a):(b))
  +#define TEXT_BLOCK_SIZE  1024
  +struct Jcontext_t {
  + char   *value;
  + size_t  used;
  + size_t  size;
  +};
  +
  +RPM_GNUC_PURE   int Jyyget_column();
  +RPM_GNUC_PURE   int Jyyget_debug();
  +RPM_GNUC_PURE   FILE * Jyyget_in();
  +RPM_GNUC_PURE   yy_size_t Jyyget_leng();
  +RPM_GNUC_PURE   int Jyyget_lineno();
  +RPM_GNUC_PURE   YYSTYPE * Jyyget_lval();
  +RPM_GNUC_PURE   FILE * Jyyget_out();
  +RPM_GNUC_PURE   char * Jyyget_text();
  +
   static char * Jdonate(struct Jcontext_t *tok);
   static void   Jappend(struct Jcontext_t *tok, char *text);
  +
   %}
   
   true  [Tt][Rr][Uu][Ee]
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmdb/tqf.l

[CVS] RPM: rpm-5_4: rpm/rpmdb/ Makefile.am hdrfmt.c tqf.l tqf.y

2015-06-02 Thread Jeff Johnson 
  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:   02-Jun-2015 17:09:14
  Branch: rpm-5_4  Handle: 2015060215091400

  Modified files:   (Branch: rpm-5_4)
rpm/rpmdb   Makefile.am hdrfmt.c tqf.l tqf.y

  Log:
- tqf: WIP.

  Summary:
RevisionChanges Path
1.134.2.23  +1  -1  rpm/rpmdb/Makefile.am
1.151.2.31  +19 -3  rpm/rpmdb/hdrfmt.c
1.1.2.10+5  -5  rpm/rpmdb/tqf.l
1.1.2.8 +318 -45rpm/rpmdb/tqf.y
  

  patch -p0 '@@ .'
  Index: rpm/rpmdb/Makefile.am
  
  $ cvs diff -u -r1.134.2.22 -r1.134.2.23 Makefile.am
  --- rpm/rpmdb/Makefile.am 31 May 2015 15:30:00 -  1.134.2.22
  +++ rpm/rpmdb/Makefile.am 2 Jun 2015 15:09:14 -   1.134.2.23
  @@ -365,7 +365,7 @@
./tqf \
--dbpath=$(testdir) \
-r $(testdir)/fodder/*.rpm \
  -$(testdir)/fodder/NVRA.qf
  +$(testdir)/fodder/fmt.qf
   
   #tbdb_SOURCES = tbdb.c bdb.c
   #tbdb_LDADD = $(mylibs)
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmdb/hdrfmt.c
  
  $ cvs diff -u -r1.151.2.30 -r1.151.2.31 hdrfmt.c
  --- rpm/rpmdb/hdrfmt.c1 May 2015 19:15:09 -   1.151.2.30
  +++ rpm/rpmdb/hdrfmt.c2 Jun 2015 15:09:14 -   1.151.2.31
  @@ -787,13 +787,17 @@
   /*@=moduncon@*/
atype = (rpmuint8_t)PGPARMOR_PUBKEY;/* XXX check pkt for pubkey */
break;
  +case RPM_UINT64_TYPE:/* XXX W2DO? */
  + s = (unsigned char *) he-p.ui64p;
  + ns = sizeof(*he-p.ui64p);
  + atype = (rpmuint8_t)PGPARMOR_SIGNATURE; /* XXX check pkt for signature 
*/
  + break;
   #if defined(SUPPORT_I18NSTRING_TYPE)
   case RPM_I18NSTRING_TYPE:
   #endif
   case RPM_UINT8_TYPE:
   case RPM_UINT16_TYPE:
   case RPM_UINT32_TYPE:
  -case RPM_UINT64_TYPE:
   default:
return xstrdup(_((invalid type)));
/*@notreached@*/ break;
  @@ -1587,7 +1591,13 @@
   int ix = (he-ix  0 ? he-ix : 0);
   char * val;
   
  -if (!(he-t == RPM_UINT8_TYPE || he-t == 1)) { /* RPM_CHAR_TYPE */
  +if (
  +#ifdef   DYING
  + !(he-t == RPM_UINT8_TYPE || he-t == 1) /* RPM_CHAR_TYPE */
  +#else
  + !(he-t == RPM_UINT64_TYPE)
  +#endif
  +) {
val = xstrdup(_((not a number)));
   } else {
const char * s;
  @@ -1637,7 +1647,13 @@
   int ix = (he-ix  0 ? he-ix : 0);
   char * val = NULL;
   
  -if (he-t != RPM_UINT32_TYPE) {
  +if (
  +#ifdef   DYING
  + !(he-t == RPM_UINT32_TYPE)
  +#else
  + !(he-t == RPM_UINT64_TYPE)
  +#endif
  +) {
val = xstrdup(_((not a number)));
   } else {
uint64_t vflags = he-p.ui32p[ix];
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmdb/tqf.l
  
  $ cvs diff -u -r1.1.2.9 -r1.1.2.10 tqf.l
  --- rpm/rpmdb/tqf.l   1 Jun 2015 14:55:47 -   1.1.2.9
  +++ rpm/rpmdb/tqf.l   2 Jun 2015 15:09:14 -   1.1.2.10
  @@ -213,9 +213,9 @@
  yy_pop_state(yyscanner);
  return TF_END;
}
  -L_QF:(?x: {A}+ ( ( {A}+ ) )? ) {
  +L_QF:(?x: {A}+ ( ( [^()\n]* ) )? ) {
  yylval-S = strdup(yytext);   return TF_MOD; }
  -L_QF{A}+   { if (yyget_debug(yyscanner)) fprintf(stderr, -- 
%s(%u)\n, yytext, tagValue(yytext));
  +L_QF[^:}]+ { if (yyget_debug(yyscanner)) fprintf(stderr, -- tag 
{%s}\n, yytext);
  yylval-S = strdup(yytext);
  return TF_TAGN;
}
  @@ -231,9 +231,9 @@
   L_QC(?s:(\\.|[^|}?:%])+) {
  yylval-S = yytext;   return TEXT; }
   
  -\\\n   { /* eat escaped NL */ }
  -EOF  { return EOF; }
  -.{ fprintf(stderr, --eating '%c': (%s)\n, *yytext, yytext ); }
  +EOF  { return EOF; }
  +*\\\n{ /* eat escaped NL */ }
  +*. { fprintf(stderr, --eating '%c': (%s)\n, *yytext, yytext ); }
   
   %%
   
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmdb/tqf.y
  
  $ cvs diff -u -r1.1.2.7 -r1.1.2.8 tqf.y
  --- rpm/rpmdb/tqf.y   1 Jun 2015 14:55:47 -   1.1.2.7
  +++ rpm/rpmdb/tqf.y   2 Jun 2015 15:09:14 -   1.1.2.8
  @@ -26,7 +26,7 @@
   #define scanner  (x-flex_scanner)
   
   #define yyHDR((Header)x-flex_extra)
  -static HE_t heGet(Header

[CVS] RPM: rpm-5_4: rpm/rpmdb/ Makefile.am tgraph.c tqf.h tqf.l tqf.y

2015-05-31 Thread Jeff Johnson 
  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:   31-May-2015 17:30:00
  Branch: rpm-5_4  Handle: 201505311530

  Modified files:   (Branch: rpm-5_4)
rpm/rpmdb   Makefile.am tgraph.c tqf.h tqf.l tqf.y

  Log:
- tqf: WIP.

  Summary:
RevisionChanges Path
1.134.2.22  +6  -2  rpm/rpmdb/Makefile.am
1.1.2.5 +3  -0  rpm/rpmdb/tgraph.c
1.1.2.5 +2  -0  rpm/rpmdb/tqf.h
1.1.2.8 +29 -13 rpm/rpmdb/tqf.l
1.1.2.6 +49 -18 rpm/rpmdb/tqf.y
  

  patch -p0 '@@ .'
  Index: rpm/rpmdb/Makefile.am
  
  $ cvs diff -u -r1.134.2.21 -r1.134.2.22 Makefile.am
  --- rpm/rpmdb/Makefile.am 31 May 2015 11:06:18 -  1.134.2.21
  +++ rpm/rpmdb/Makefile.am 31 May 2015 15:30:00 -  1.134.2.22
  @@ -359,9 +359,13 @@
./librpmdb.la \
../popt/libpopt.la
   
  +testdir =$(abs_top_builddir)/tests
   foo: tqf
  - rm -rf tmp
  - ../libtool --mode=execute ./tqf -r $(abs_top_srcdir)/rpmdb/fodder/*.rpm 
$(abs_top_srcdir)/rpmdb/fodder/NVRA.qf
  + -../libtool --mode=execute \
  + ./tqf \
  + --dbpath=$(testdir) \
  + -r $(testdir)/fodder/*.rpm \
  +$(testdir)/fodder/NVRA.qf
   
   #tbdb_SOURCES = tbdb.c bdb.c
   #tbdb_LDADD = $(mylibs)
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmdb/tgraph.c
  
  $ cvs diff -u -r1.1.2.4 -r1.1.2.5 tgraph.c
  --- rpm/rpmdb/tgraph.c31 May 2015 02:39:05 -  1.1.2.4
  +++ rpm/rpmdb/tgraph.c31 May 2015 15:30:00 -  1.1.2.5
  @@ -80,6 +80,9 @@
case IF:
s = if;
break;
  + case TRANSLATE:
  + s = translate;
  + break;
case PRINT:
s = print;
break;
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmdb/tqf.h
  
  $ cvs diff -u -r1.1.2.4 -r1.1.2.5 tqf.h
  --- rpm/rpmdb/tqf.h   31 May 2015 11:06:18 -  1.1.2.4
  +++ rpm/rpmdb/tqf.h   31 May 2015 15:30:00 -  1.1.2.5
  @@ -6,9 +6,11 @@
   typedef struct pass_to_bison Tparse_t;
   
   struct pass_to_bison {
  +char * flex_db;
   char * flex_ifn;
   char * flex_ofn;
   char * flex_rpm;
  +char * flex_lang;
   void * flex_extra;
   int flex_debug;
   void * flex_scanner;
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmdb/tqf.l
  
  $ cvs diff -u -r1.1.2.7 -r1.1.2.8 tqf.l
  --- rpm/rpmdb/tqf.l   31 May 2015 11:06:18 -  1.1.2.7
  +++ rpm/rpmdb/tqf.l   31 May 2015 15:30:00 -  1.1.2.8
  @@ -64,10 +64,10 @@
   
/* -- Single quoted strings */
/**/
  -\'   { yy_push_state(L_SQUOTE, yyscanner); }
  +\'   { yy_push_state(L_SQUOTE, yyscanner);   return TSQ_BGN; }
   L_SQUOTE\'\'   { /* -- eat paired quotes */ }
  -L_SQUOTE\' { yy_pop_state(yyscanner); }
  -L_SQUOTEEOF { llerror(unterminated single quote);return EOF; }
  +L_SQUOTE\' { yy_pop_state(yyscanner);  return TSQ_END; }
  +L_SQUOTEEOF { llerror(unterminated single quote); return EOF; }
/**/
   
/* -- Parsing blocks */
  @@ -111,7 +111,7 @@
*/
   
   \%{L}+{WS}*.*{WS}*
  -%}
  +^
   
/* -- Preamble keywords */
/*
  @@ -191,11 +191,12 @@
   
   (?i:{L}+){D}*\:{LINE}{ }

  -\   { yy_push_state(L_DQUOTE, yyscanner); }
  +\$\ { yy_push_state(L_DQUOTE, yyscanner);   return TDQ; }
  +\   { yy_push_state(L_DQUOTE, yyscanner);   return TDQ_BGN; 
}
   L_DQUOTE\\   { }
  -L_DQUOTE\ { yy_pop_state(yyscanner); }
  +L_DQUOTE\ { yy_pop_state(yyscanner);  return TDQ_END; 
}
   L_DQUOTEEOF{ llerror(unterminated double quote); return EOF; }
  -L_DQUOTE%%   { yylval-S = yytext;   return TEXT; }
  +L_DQUOTE%%   { yylval-S = yytext;   return 
TEXT; }
   L_DQUOTE[{ return TL_BGN; }
   L_DQUOTE]{ return TL_END; }
   L_DQUOTE%(((-)?{D}*(\.)?{D}*)|(=))?{ {
  @@ -230,6 +231,7 @@
   L_QC(?s:(\\.|[^|}?:%])+) {
  yylval-S = yytext;   return TEXT; }
   
  +\\\n   { /* eat escaped NL */ }
   EOF  { return EOF; }
   .{ fprintf(stderr, --eating '%c': (%s)\n, *yytext, yytext ); }
   
  @@ -240,8 +242,11 @@

[CVS] RPM: rpm-5_4: rpm/rpmdb/ Makefile.am tgraph.c tqf.h tqf.l tqf.y

2015-05-30 Thread Jeff Johnson 
  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:   31-May-2015 04:39:05
  Branch: rpm-5_4  Handle: 2015053102390500

  Modified files:   (Branch: rpm-5_4)
rpm/rpmdb   Makefile.am tgraph.c tqf.h tqf.l tqf.y

  Log:
- tqf: WIP.

  Summary:
RevisionChanges Path
1.134.2.20  +6  -3  rpm/rpmdb/Makefile.am
1.1.2.4 +5  -2  rpm/rpmdb/tgraph.c
1.1.2.3 +5  -5  rpm/rpmdb/tqf.h
1.1.2.6 +82 -20 rpm/rpmdb/tqf.l
1.1.2.4 +115 -31rpm/rpmdb/tqf.y
  

  patch -p0 '@@ .'
  Index: rpm/rpmdb/Makefile.am
  
  $ cvs diff -u -r1.134.2.19 -r1.134.2.20 Makefile.am
  --- rpm/rpmdb/Makefile.am 28 May 2015 19:59:27 -  1.134.2.19
  +++ rpm/rpmdb/Makefile.am 31 May 2015 02:39:05 -  1.134.2.20
  @@ -354,11 +354,14 @@
   Tscanner.c Tscanner.h: tqf.l
$(LEX) --prefix=Tyy $(LFLAGS) -o $@ $
   tqf_SOURCES =Tgrammar.c Tscanner.c tgraph.c
  -tqf_CFLAGS = # -DTSCANNER_MAIN
  -tqf_LDADD =  -L$(top_builddir) -lpopt
  +tqf_CFLAGS = $(CFLAGS) -fsanitize=address # -DTSCANNER_MAIN
  +tqf_LDADD =  ../lib/librpm.la \
  + ./librpmdb.la \
  + ../popt/libpopt.la
   
   foo: tqf
  - ./tqf fodder/*.qf
  + rm -rf tmp
  + ../libtool --mode=execute ./tqf -d -r 
$(abs_top_srcdir)/rpmdb/fodder/*.rpm $(abs_top_srcdir)/rpmdb/fodder/NVRA.qf
   
   #tbdb_SOURCES = tbdb.c bdb.c
   #tbdb_LDADD = $(mylibs)
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmdb/tgraph.c
  
  $ cvs diff -u -r1.1.2.3 -r1.1.2.4 tgraph.c
  --- rpm/rpmdb/tgraph.c28 May 2015 19:59:27 -  1.1.2.3
  +++ rpm/rpmdb/tgraph.c31 May 2015 02:39:05 -  1.1.2.4
  @@ -158,6 +158,9 @@
case ',':
s = [,];
break;
  + case '.':
  + s = [.];
  + break;
}
break;
   case typeText:
  @@ -276,8 +279,8 @@
   }
   
   /* interface for drawing */
  -#define lmax 400
  -#define cmax 400
  +#define lmax 500
  +#define cmax 500
   char graph[lmax][cmax];  /* array for ASCII-Graphic */
   int graphNumber = 0;
   void graphTest(int l, int c)
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmdb/tqf.h
  
  $ cvs diff -u -r1.1.2.2 -r1.1.2.3 tqf.h
  --- rpm/rpmdb/tqf.h   28 May 2015 19:59:27 -  1.1.2.2
  +++ rpm/rpmdb/tqf.h   31 May 2015 02:39:05 -  1.1.2.3
  @@ -1,8 +1,5 @@
  -#include stdio.h
  -#include assert.h
  -#include stdlib.h
  -#include stdint.h
  -#include string.h
  +#ifndef  H_TQF
  +#define  H_TQF
   
   #define PARM_BLOCK_SIZE   10
   
  @@ -11,6 +8,7 @@
   struct pass_to_bison {
   char * flex_ifn;
   char * flex_ofn;
  +char * flex_rpm;
   void * flex_extra;
   int flex_debug;
   void * flex_scanner;
  @@ -115,3 +113,5 @@
   } nodeType;
   
   extern long long sym[26];
  +
  +#endif   /* H_TQF */
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmdb/tqf.l
  
  $ cvs diff -u -r1.1.2.5 -r1.1.2.6 tqf.l
  --- rpm/rpmdb/tqf.l   28 May 2015 19:59:27 -  1.1.2.5
  +++ rpm/rpmdb/tqf.l   31 May 2015 02:39:05 -  1.1.2.6
  @@ -5,8 +5,14 @@
   %{
   #include system.h
   
  -#include popt.h
  -#include rpmutil.h
  +#include rpmio.h   /* for *Pool methods */
  +#include rpmlog.h
  +#include poptIO.h
  +
  +#include rpmtypes.h
  +#include rpmtag.h
  +#include pkgio.h
  +#include rpmts.h
   
   #include tqf.h
   #include Tgrammar.h
  @@ -193,14 +199,25 @@
   L_DQUOTE[{ return TL_BGN; }
   L_DQUOTE]{ return TL_END; }
   L_DQUOTE%(((-)?{D}*(\.)?{D}*)|(=))?{ {
  -   yy_push_state(L_QF, yyscanner); return TF_BGN; }
  +   yylval-S = strdup(yytext);
  +   yy_push_state(L_QF, yyscanner);
  +   return TF_BGN;
  + }
   L_DQUOTE%|   { yy_push_state(L_QB, yyscanner); return 
TC_BGN; }
   L_DQUOTE(?s:(\\.|[^%\[\]])+) {
  -   yylval-S = yytext;   return TEXT; }
  +   yylval-S = strdup(yytext);   return TEXT; }
   
  -L_QF}{ yy_pop_state(yyscanner);  return TF_END; }
  -L_QF:{A}+{ yylval-S = yytext;   return TF_MOD; }
  -L_QF{A}+   { yylval-S = yytext;

[CVS] RPM: rpm-5_4: rpm/rpmdb/ Makefile.am tgraph.c tqf.h tqf.l tqf.y

2015-05-28 Thread Jeff Johnson 
  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:   28-May-2015 21:59:27
  Branch: rpm-5_4  Handle: 2015052819592700

  Modified files:   (Branch: rpm-5_4)
rpm/rpmdb   Makefile.am tgraph.c tqf.h tqf.l tqf.y

  Log:
- tqf: WIP.

  Summary:
RevisionChanges Path
1.134.2.19  +5  -4  rpm/rpmdb/Makefile.am
1.1.2.3 +36 -3  rpm/rpmdb/tgraph.c
1.1.2.2 +3  -0  rpm/rpmdb/tqf.h
1.1.2.5 +40 -42 rpm/rpmdb/tqf.l
1.1.2.3 +61 -19 rpm/rpmdb/tqf.y
  

  patch -p0 '@@ .'
  Index: rpm/rpmdb/Makefile.am
  
  $ cvs diff -u -r1.134.2.18 -r1.134.2.19 Makefile.am
  --- rpm/rpmdb/Makefile.am 28 May 2015 16:54:32 -  1.134.2.18
  +++ rpm/rpmdb/Makefile.am 28 May 2015 19:59:27 -  1.134.2.19
  @@ -321,9 +321,10 @@
   tjfn_SOURCES = tjfn.c
   tjfn_LDADD = $(mylibs)
   
  -LEX =flex -d -b -p -T -v
  +LEX =flex
  +LFLAGS=  -d -T -v -8 -b --yylineno --reentrant --bison-bridge 
--perf-report
   YACC =   bison
  -YFLAGS=  -d --report=state
  +YFLAGS=  -Dapi.pure -t -d -v --report=all
   
   BUILT_SOURCES += Jgrammar.c Jgrammar.h Jscanner.c
   Jgrammar.c: grammar.y
  @@ -351,13 +352,13 @@
   Tgrammar.c Tgrammar.h: tqf.y
$(YACC) $(YFLAGS) -o $@ $
   Tscanner.c Tscanner.h: tqf.l
  - $(LEX) -R -o $@ $
  + $(LEX) --prefix=Tyy $(LFLAGS) -o $@ $
   tqf_SOURCES =Tgrammar.c Tscanner.c tgraph.c
   tqf_CFLAGS = # -DTSCANNER_MAIN
   tqf_LDADD =  -L$(top_builddir) -lpopt
   
   foo: tqf
  - ./tqf  fodder/loop.qf
  + ./tqf fodder/*.qf
   
   #tbdb_SOURCES = tbdb.c bdb.c
   #tbdb_LDADD = $(mylibs)
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmdb/tgraph.c
  
  $ cvs diff -u -r1.1.2.2 -r1.1.2.3 tgraph.c
  --- rpm/rpmdb/tgraph.c28 May 2015 16:54:32 -  1.1.2.2
  +++ rpm/rpmdb/tgraph.c28 May 2015 19:59:27 -  1.1.2.3
  @@ -180,9 +180,40 @@
}
break;
   case typeTag:
  - if (p-tag.M  *p-tag.M)
  - snprintf(word, sizeof(word), {%s%s}, p-tag.S, p-tag.M);
  - else {
  + if (p-tag.M  *p-tag.M) {
  + char *t = word;
  + char *te= word + sizeof(word) - sizeof({:});
  + char *s = p-text.S;
  + int c;
  + *t++ = '{';
  + while ((c = *s++) != '\0'  (t  te)) {
  + if (c == '\\'  !isprint(*s)) {
  + s++;
  + continue;
  + }
  + if (!isprint(c))
  + break;
  + if (strchr(\\:, c))
  + break;
  + *t++ = c;
  + }
  + s = p-tag.M;
  + *t++ = ':';
  + if (*s == ':') s++;
  + while ((c = *s++) != '\0'  (t  te)) {
  + if (c == '\\'  !isprint(*s)) {
  + s++;
  + continue;
  + }
  + if (!isprint(c))
  + break;
  + if (strchr(\\:}, c))
  + break;
  + *t++ = c;
  + }
  + *t++ = '}';
  + *t = '\0';
  + } else {
char *t = word;
char *te= word + sizeof(word) - sizeof({});
char *s = p-text.S;
  @@ -195,6 +226,8 @@
}
if (!isprint(c))
break;
  + if (strchr(\\:}, c))
  + break;
*t++ = c;
}
*t++ = '}';
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmdb/tqf.h
  
  $ cvs diff -u -r1.1.2.1 -r1.1.2.2 tqf.h
  --- rpm/rpmdb/tqf.h   25 May 2015 21:31:47 -  1.1.2.1
  +++ rpm/rpmdb/tqf.h   28 May 2015 19:59:27 -  1.1.2.2
  @@ -9,7 +9,10 @@
   typedef struct pass_to_bison Tparse_t;
   
   struct pass_to_bison {
  +char * flex_ifn;
  +char * flex_ofn;
   void * flex_extra;
  +int flex_debug;
   void * flex_scanner;
   char * text;
   void * tree;
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmdb/tqf.l
  
  $ cvs diff -u -r1.1.2.4 -r1.1.2.5 tqf.l
  --- rpm/rpmdb/tqf.l   28 May 2015 16:54:32 -  1.1.2.4
  +++ rpm/rpmdb/tqf.l   28 May 2015 19:59:27 -  1.1.2.5
  @@ -1,35 +1,26 @@
  -%option  8bit yylineno
   %option  stack
   
  -%option  noyyget_lineno
  -%option  noyyget_text
  -%option  noyyget_debug
  -%option

[CVS] RPM: rpm-5_4: rpm/rpmdb/ Makefile.am tgraph.c tqf.inp tqf.l tqf....

2015-05-28 Thread Jeff Johnson 
  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:   28-May-2015 18:54:32
  Branch: rpm-5_4  Handle: 2015052816543200

  Modified files:   (Branch: rpm-5_4)
rpm/rpmdb   Makefile.am tgraph.c tqf.inp tqf.l tqf.y

  Log:
- tqf: WIP.

  Summary:
RevisionChanges Path
1.134.2.18  +6  -5  rpm/rpmdb/Makefile.am
1.1.2.2 +25 -7  rpm/rpmdb/tgraph.c
1.1.2.2 +157 -8 rpm/rpmdb/tqf.inp
1.1.2.4 +313 -51rpm/rpmdb/tqf.l
1.1.2.2 +32 -5  rpm/rpmdb/tqf.y
  

  patch -p0 '@@ .'
  Index: rpm/rpmdb/Makefile.am
  
  $ cvs diff -u -r1.134.2.17 -r1.134.2.18 Makefile.am
  --- rpm/rpmdb/Makefile.am 25 May 2015 21:31:47 -  1.134.2.17
  +++ rpm/rpmdb/Makefile.am 28 May 2015 16:54:32 -  1.134.2.18
  @@ -348,15 +348,16 @@
./qfgraph  qf.inp
   
   BUILT_SOURCES += Tgrammar.c Tgrammar.h Tscanner.c
  -Tgrammar.c: tqf.y
  +Tgrammar.c Tgrammar.h: tqf.y
$(YACC) $(YFLAGS) -o $@ $
  -Tscanner.c: tqf.l
  +Tscanner.c Tscanner.h: tqf.l
$(LEX) -R -o $@ $
  -tqf_SOURCES = Tscanner.c Tgrammar.c tgraph.c
  -tqf_CFLAGS = -DTSCANNER_MAIN
  +tqf_SOURCES =Tgrammar.c Tscanner.c tgraph.c
  +tqf_CFLAGS = # -DTSCANNER_MAIN
  +tqf_LDADD =  -L$(top_builddir) -lpopt
   
   foo: tqf
  - ./tqf  tqf.inp
  + ./tqf  fodder/loop.qf
   
   #tbdb_SOURCES = tbdb.c bdb.c
   #tbdb_LDADD = $(mylibs)
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmdb/tgraph.c
  
  $ cvs diff -u -r1.1.2.1 -r1.1.2.2 tgraph.c
  --- rpm/rpmdb/tgraph.c25 May 2015 21:31:47 -  1.1.2.1
  +++ rpm/rpmdb/tgraph.c28 May 2015 16:54:32 -  1.1.2.2
  @@ -162,7 +162,7 @@
break;
   case typeText:
{   char *t = word;
  - char *te= word + sizeof(word)/2 - sizeof();
  + char *te= word + sizeof(word) - sizeof(\\);
char *s = p-text.S;
int c;
*t++ = '';
  @@ -171,6 +171,8 @@
s++;
continue;
}
  + if (!isprint(c))
  + break;
*t++ = c;
}
*t++ = '';
  @@ -178,10 +180,26 @@
}
break;
   case typeTag:
  - if (p-tag.M)
  - snprintf(word, sizeof(word), tag(%s%s), p-tag.S, p-tag.M);
  - else
  - snprintf(word, sizeof(word), tag(%s), p-tag.S);
  + if (p-tag.M  *p-tag.M)
  + snprintf(word, sizeof(word), {%s%s}, p-tag.S, p-tag.M);
  + else {
  + char *t = word;
  + char *te= word + sizeof(word) - sizeof({});
  + char *s = p-text.S;
  + int c;
  + *t++ = '{';
  + while ((c = *s++) != '\0'  (t  te)) {
  + if (c == '\\'  !isprint(*s)) {
  + s++;
  + continue;
  + }
  + if (!isprint(c))
  + break;
  + *t++ = c;
  + }
  + *t++ = '}';
  + *t = '\0';
  + }
word[sizeof(word)-1] = '\0';
break;
   }
  @@ -225,8 +243,8 @@
   }
   
   /* interface for drawing */
  -#define lmax 200
  -#define cmax 200
  +#define lmax 400
  +#define cmax 400
   char graph[lmax][cmax];  /* array for ASCII-Graphic */
   int graphNumber = 0;
   void graphTest(int l, int c)
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmdb/tqf.inp
  
  $ cvs diff -u -r1.1.2.1 -r1.1.2.2 tqf.inp
  --- rpm/rpmdb/tqf.inp 25 May 2015 21:31:47 -  1.1.2.1
  +++ rpm/rpmdb/tqf.inp 28 May 2015 16:54:32 -  1.1.2.2
  @@ -1,8 +1,157 @@
  -\
  -\n[\
  -\nBEFORE%{A:a}AFTER\
  -\n]\
  -\n[\
  -\nBEFORE%|B?{%{B}}:{%{C}}|AFTER\
  -\n]\
  -\n
  +# -- Test fodder for RPM yacc/lex parser
  +#%define namerpm
  +#%define version 5.4.17
  +
  +# -- Preamble
  +Summary: RPM test fodder package
  +Name:'%{name}'
  +Version: '%version'
  +Release: '%{release}'%{?dist}
  +License: LGPLv2+
  +Group:   System Environment/Libraries
  +URL: http://rpm5.org
  +Source0: http://rpm5.org/files/rpm/rpm-5.4/%{name}-%{version}.tar.gz
  +Source1: http://rpm5.org/files/popt/%{name}-%{version}.tar.gz
  +Patch0:  rpm-5.4.16-jbj.patch
  +Patch1:  popt-1.16-jbj.patch
  +
  +#XX Requires(post):  /sbin/install-info
  +#XX Requires(preun): /sbin/install-info
  +
  +BuildRequires:

[CVS] RPM: rpm-5_4: rpm/rpmdb/ Makefile.am

2014-08-17 Thread Jeff Johnson 
  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:   17-Aug-2014 16:29:43
  Branch: rpm-5_4  Handle: 2014081714294300

  Modified files:   (Branch: rpm-5_4)
rpm/rpmdb   Makefile.am

  Log:
- include additional files mentioned in POTFILES.in.

  Summary:
RevisionChanges Path
1.134.2.9   +3  -3  rpm/rpmdb/Makefile.am
  

  patch -p0 '@@ .'
  Index: rpm/rpmdb/Makefile.am
  
  $ cvs diff -u -r1.134.2.8 -r1.134.2.9 Makefile.am
  --- rpm/rpmdb/Makefile.am 8 Jul 2013 04:43:02 -   1.134.2.8
  +++ rpm/rpmdb/Makefile.am 17 Aug 2014 14:29:43 -  1.134.2.9
  @@ -29,9 +29,9 @@
   AM_CFLAGS = $(OPENMP_CFLAGS)
   
   EXTRA_DIST = \
  - db3.c sqlite.c db_emu.h librpmdb.vers bdb.sql \
  - logio.awk logio.src logio_recover_template logio_template logio.c 
logio_rec.c \
  - logio_auto.c logio_autop.c logio_auto.h
  + db3.c sqlite.c db_emu.h librpmdb.vers bdb.sql libsqldb.c \
  + logio.awk logio.src logio_recover_template logio_template logio.c \
  + logio_rec.c logio_auto.c logio_autop.c logio_auto.h
   
   EXTRA_PROGRAMS = logio tjfn # tbdb
   
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/rpmdb/ Makefile.am

2011-06-02 Thread Jeff Johnson 
  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:   02-Jun-2011 21:28:09
  Branch: rpm-5_4  Handle: 2011060219280900

  Modified files:   (Branch: rpm-5_4)
rpm/rpmdb   Makefile.am

  Log:
- sqlite: fix: don't bother building libsqldb.la loadable module.

  Summary:
RevisionChanges Path
1.134.2.1   +4  -4  rpm/rpmdb/Makefile.am
  

  patch -p0 '@@ .'
  Index: rpm/rpmdb/Makefile.am
  
  $ cvs diff -u -r1.134 -r1.134.2.1 Makefile.am
  --- rpm/rpmdb/Makefile.am 2 Nov 2010 16:56:43 -   1.134
  +++ rpm/rpmdb/Makefile.am 2 Jun 2011 19:28:09 -   1.134.2.1
  @@ -53,8 +53,8 @@
fprint.h header_internal.h legacy.h rpmdpkg.h rpmlio.h rpmmdb.h \
rpmrepo.h rpmtd.h rpmtxn.h rpmwf.h signature.h
   
  -pkglibdir =  @USRLIBRPM@
  -pkglib_LTLIBRARIES = libsqldb.la
  +#pkglibdir = @USRLIBRPM@
  +#pkglib_LTLIBRARIES =libsqldb.la
   
   mylibs = \
$(top_builddir)/rpmdb/librpmdb.la \
  @@ -211,8 +211,8 @@
   logio_SOURCES = logio.c logio.h
   logio_LDADD = $(mylibs)
   
  -libsqldb_la_SOURCES  = libsqldb.c # sqlite.c
  -libsqldb_la_LIBADD   = $(RPMIO_LDADD_COMMON)
  +#libsqldb_la_SOURCES = libsqldb.c # sqlite.c
  +#libsqldb_la_LIBADD  = $(RPMIO_LDADD_COMMON)
   
   BUILT_SOURCES = tagtbl.c $(logio_BUILT)
   if WITH_DBSQL_CODEGEN
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org