[sword-devel] Unusual behavior from diatheke on Linux with musl libc

Discussion:

[sword-devel] Unusual behavior from diatheke on Linux with musl libc

Isaac Dunham

2014-07-07 17:11:03 UTC

Hello,
I've been trying to package Sword for Alpine Linux (alpinelinux.org),
which uses an alternate libc.
Relevant packages and versions are as follows:
libc: musl 1.1.3
gcc: 4.8.2
clucene: 2.3.3.4
icu: 53.1
sword: 1.7.3

So far, Sword builds fine, and installmgr works with a minor bug
that I think I have a solution for.
(The last line of the prompt, "enable? [no]", does not get written until
the reply is entered. The solution is probably just an fflush(); I've
run into this issue before.)

But diatheke has a problem that seems more serious:
the last verse consistently gets repeated without the verse numbers.
An example:
$ diatheke -b KJV -k Ps117
Psalms 117:1: O praise the LORD, all ye nations: praise him, all ye people.
Psalms 117:2: For his merciful kindness is great toward us: and the truth of the LORD endureth for ever. Praise ye the LORD.
: For his merciful kindness is great toward us: and the truth of the LORD endureth for ever. Praise ye the LORD.
(KJV)

I don't know where this issue is likely to be coming from; I thought
I'd ask if someone who knows their way around the source had any ideas.

Thank you and God bless,
Isaac Dunham

David Haslam

2014-07-08 09:00:32 UTC

FWIW, this did not occur with diatheke.exe in Windows (Win7).

utils\diatheke -b KJV -k Ps117
Psalms 117:1: O praise the LORD, all ye nations: praise him, all ye people.
Psalms 117:2: For his merciful kindness is great toward us: and the truth of
the
LORD endureth for ever. Praise ye the LORD.
(KJV)

Diatheke command-line SWORD frontend Version 4.6

David

--
View this message in context: http://sword-dev.350566.n4.nabble.com/Unusual-behavior-from-diatheke-on-Linux-with-musl-libc-tp4654020p4654021.html
Sent from the SWORD Dev mailing list archive at Nabble.com.

Isaac Dunham

2014-07-08 14:10:28 UTC

Post by David Haslam
FWIW, this did not occur with diatheke.exe in Windows (Win7).
utils\diatheke -b KJV -k Ps117
Psalms 117:1: O praise the LORD, all ye nations: praise him, all ye people.
Psalms 117:2: For his merciful kindness is great toward us: and the truth of
the
LORD endureth for ever. Praise ye the LORD.
(KJV)
Diatheke command-line SWORD frontend Version 4.6
David

Thank you for that; it would seem to be something libc-specific.

However, even if it's a libc bug I'll have to figure out what is
triggering it.

God bless,
Isaac Dunham

Jaak Ristioja

2014-07-08 14:33:54 UTC

Looking at corediatheke.cpp this is probably a bug which could be
found using valgrind. Please try the following command with sword+musl:

valgrind --leak-check=full --track-origins=yes
- --keep-stacktraces=alloc-and-free utils\diatheke -b KJV -k Ps117

Blessings,
Jaak

Post by Isaac Dunham

Post by David Haslam
FWIW, this did not occur with diatheke.exe in Windows (Win7).
utils\diatheke -b KJV -k Ps117 Psalms 117:1: O praise the LORD,
all ye nations: praise him, all ye people. Psalms 117:2: For his
merciful kindness is great toward us: and the truth of the LORD
endureth for ever. Praise ye the LORD. (KJV)
Diatheke command-line SWORD frontend Version 4.6
David

Thank you for that; it would seem to be something libc-specific.
However, even if it's a libc bug I'll have to figure out what is
triggering it.
God bless, Isaac Dunham
_______________________________________________ sword-devel mailing
list: sword-devel at crosswire.org
http://www.crosswire.org/mailman/listinfo/sword-devel Instructions
to unsubscribe/change your settings at above page

Isaac Dunham

2014-07-10 04:36:35 UTC

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Looking at corediatheke.cpp this is probably a bug which could be
valgrind --leak-check=full --track-origins=yes
- --keep-stacktraces=alloc-and-free utils\diatheke -b KJV -k Ps117
Blessings,
Jaak

Thank you for the recommendation.

I found it necessary to adjust this to:

$ valgrind --leak-check=full --track-origins=yes \
--keep-stacktraces=alloc-and-free /lib/ld-musl-i386.so.1 \
utilities/diatheke/.libs/diatheke -b KJV -k Ps117 \

/tmp/ram/musl-diatheke.txt 2>&1

The resulting log is very large (>5k lines), and I don't see any obvious
problems. (Not that I'd be likely to!)
If desired, I can attach a zipped or bzipped version.
Following is the part (~80 lines) that's most likely to be interesting.

Thank you,
Isaac Dunham

==4701== by 0x4809CBA: DiathekeMgr::DiathekeMgr(sword::SWConfig*, sword::SWConfig*, bool, char, char, bool, bool) (diathekemgr.cpp:40)
==4701== by 0x48074CE: doquery(unsigned long, unsigned char, unsigned char, unsigned long, unsigned char, char const*, char const*, char const*, char const*, std::ostream*, char const*, signed char) (corediatheke.cpp:117)
==4701== by 0x480452F: main (diatheke.cpp:286)
==4701==
==4701== Conditional jump or move depends on uninitialised value(s)
==4701== at 0x1297FE: calloc (calloc.c:19)
==4701== by 0x485D864: sword::ListKey::add(sword::SWKey const&) (in /usr/lib/libsword-1.7.3.so)
==4701== by 0x4865BD6: sword::ListKey::operator<<(sword::SWKey const&) (in /usr/lib/libsword-1.7.3.so)
==4701== by 0x4864F4D: sword::VerseKey::parseVerseList(char const*, char const*, bool, bool) (in /usr/lib/libsword-1.7.3.so)
==4701== by 0x486366E: sword::VerseKey::parse(bool) (in /usr/lib/libsword-1.7.3.so)
==4701== by 0x4865CCD: sword::VerseKey::setText(char const*) (in /usr/lib/libsword-1.7.3.so)
==4701== by 0x4863D17: sword::VerseKey::parseVerseList(char const*, char const*, bool, bool) (in /usr/lib/libsword-1.7.3.so)
==4701== by 0x4807F21: doquery(unsigned long, unsigned char, unsigned char, unsigned long, unsigned char, char const*, char const*, char const*, char const*, std::ostream*, char const*, signed char) (corediatheke.cpp:386)
==4701== by 0x480452F: main (diatheke.cpp:286)
==4701== Uninitialised value was created
==4701== at 0x12385D: ??? (syscall.s:35)
==4701== by 0x12A488: malloc (malloc.c:379)
==4701== by 0x48094E5: sword::SWBuf::assureSize(unsigned int) (swbuf.h:62)
==4701== by 0x48691FE: sword::SWBuf::SWBuf(sword::SWBuf const&, unsigned long) (in /usr/lib/libsword-1.7.3.so)
==4701== by 0x486D5C6: ??? (in /usr/lib/libsword-1.7.3.so)
==4701== by 0x486E6D2: std::_Rb_tree<sword::SWBuf, std::pair<sword::SWBuf const, sword::SWBuf>, std::_Select1st<std::pair<sword::SWBuf const, sword::SWBuf> >, std::less<sword::SWBuf>, std::allocator<std::pair<sword::SWBuf const, sword::SWBuf> > >::_M_insert_equal(std::pair<sword::SWBuf const, sword::SWBuf> const&) (in /usr/lib/libsword-1.7.3.so)
==4701== by 0x486DE24: sword::SWConfig::Load() (in /usr/lib/libsword-1.7.3.so)
==4701== by 0x486E060: sword::SWConfig::SWConfig(char const*) (in /usr/lib/libsword-1.7.3.so)
==4701== by 0x487E967: sword::SWLocale::SWLocale(char const*) (in /usr/lib/libsword-1.7.3.so)
==4701== by 0x487FBC9: sword::LocaleMgr::loadConfigDir(char const*) (in /usr/lib/libsword-1.7.3.so)
==4701== by 0x4880245: sword::LocaleMgr::LocaleMgr(char const*) (in /usr/lib/libsword-1.7.3.so)
==4701== by 0x488045B: sword::LocaleMgr::getSystemLocaleMgr() (in /usr/lib/libsword-1.7.3.so)
==4701==
==4701== Conditional jump or move depends on uninitialised value(s)
==4701== at 0x1297FE: calloc (calloc.c:19)
==4701== by 0x4891599: sword::ZipCompress::Decode() (in /usr/lib/libsword-1.7.3.so)
==4701== by 0x4890801: sword::SWCompress::Buf(char const*, unsigned long*) (in /usr/lib/libsword-1.7.3.so)
==4701== by 0x489485F: sword::zVerse::zReadText(char, long, unsigned short, unsigned long, sword::SWBuf&) const (in /usr/lib/libsword-1.7.3.so)
==4701== by 0x48E3863: sword::zText::getRawEntryBuf() const (in /usr/lib/libsword-1.7.3.so)
==4701== by 0x4887B00: sword::SWModule::renderText(char const*, int, bool) (in /usr/lib/libsword-1.7.3.so)
==4701== by 0x4808734: doquery(unsigned long, unsigned char, unsigned char, unsigned long, unsigned char, char const*, char const*, char const*, char const*, std::ostream*, char const*, signed char) (corediatheke.cpp:424)
==4701== by 0x480452F: main (diatheke.cpp:286)
==4701== Uninitialised value was created
==4701== at 0x12385D: ??? (syscall.s:35)
==4701== by 0x12A488: malloc (malloc.c:379)
==4701== by 0x48094E5: sword::SWBuf::assureSize(unsigned int) (swbuf.h:62)
==4701== by 0x48691FE: sword::SWBuf::SWBuf(sword::SWBuf const&, unsigned long) (in /usr/lib/libsword-1.7.3.so)
==4701== by 0x486D5C6: ??? (in /usr/lib/libsword-1.7.3.so)
==4701== by 0x486E6D2: std::_Rb_tree<sword::SWBuf, std::pair<sword::SWBuf const, sword::SWBuf>, std::_Select1st<std::pair<sword::SWBuf const, sword::SWBuf> >, std::less<sword::SWBuf>, std::allocator<std::pair<sword::SWBuf const, sword::SWBuf> > >::_M_insert_equal(std::pair<sword::SWBuf const, sword::SWBuf> const&) (in /usr/lib/libsword-1.7.3.so)
==4701== by 0x486DE24: sword::SWConfig::Load() (in /usr/lib/libsword-1.7.3.so)
==4701== by 0x486E060: sword::SWConfig::SWConfig(char const*) (in /usr/lib/libsword-1.7.3.so)
==4701== by 0x487E967: sword::SWLocale::SWLocale(char const*) (in /usr/lib/libsword-1.7.3.so)
==4701== by 0x487FBC9: sword::LocaleMgr::loadConfigDir(char const*) (in /usr/lib/libsword-1.7.3.so)
==4701== by 0x4880245: sword::LocaleMgr::LocaleMgr(char const*) (in /usr/lib/libsword-1.7.3.so)
==4701== by 0x488045B: sword::LocaleMgr::getSystemLocaleMgr() (in /usr/lib/libsword-1.7.3.so)
==4701==
Psalms 117:1: O praise the LORD, all ye nations: praise him, all ye people.
==4701== Conditional jump or move depends on uninitialised value(s)
==4701== at 0x1214DF: __funcs_on_exit (atexit.c:23)
==4701== by 0x121625: exit (exit.c:22)
==4701== by 0x120E1A: (below main) (__libc_start_main.c:76)
==4701== Uninitialised value was created
==4701== at 0x12385D: ??? (syscall.s:35)
==4701== by 0x12A488: malloc (malloc.c:379)
==4701== by 0x48094E5: sword::SWBuf::assureSize(unsigned int) (swbuf.h:62)
==4701== by 0x48691FE: sword::SWBuf::SWBuf(sword::SWBuf const&, unsigned long) (in /usr/lib/libsword-1.7.3.so)
==4701== by 0x48777FB: std::_Rb_tree<sword::SWBuf, std::pair<sword::SWBuf const, sword::SWOptionFilter*>, std::_Select1st<std::pair<sword::SWBuf const, sword::SWOptionFilter*> >, std::less<sword::SWBuf>, std::allocator<std::pair<sword::SWBuf const, sword::SWOptionFilter*> > >::_M_insert_unique(std::pair<sword::SWBuf const, sword::SWOptionFilter*> const&) (in /usr/lib/libsword-1.7.3.so)
==4701== by 0x48702D3: sword::SWMgr::init() (in /usr/lib/libsword-1.7.3.so)
==4701== by 0x486F889: sword::SWMgr::commonInit(sword::SWConfig*, sword::SWConfig*, bool, sword::SWFilterMgr*, bool) (in /usr/lib/libsword-1.7.3.so)
==4701== by 0x48748B9: sword::SWMgr::SWMgr(sword::SWConfig*, sword::SWConfig*, bool, sword::SWFilterMgr*, bool) (in /usr/lib/libsword-1.7.3.so)
==4701== by 0x4809CBA: DiathekeMgr::DiathekeMgr(sword::SWConfig*, sword::SWConfig*, bool, char, char, bool, bool) (diathekemgr.cpp:40)
==4701== by 0x48074CE: doquery(unsigned long, unsigned char, unsigned char, unsigned long, unsigned char, char const*, char const*, char const*, char const*, std::ostream*, char const*, signed char) (corediatheke.cpp:117)
==4701== by 0x480452F: main (diatheke.cpp:286)
==4701==
Psalms 117:2: For his merciful kindness is great toward us: and the truth of the LORD endureth for ever. Praise ye the LORD.
: For his merciful kindness is great toward us: and the truth of the LORD endureth for ever. Praise ye the LORD.
(KJV)
==4701==
==4701== HEAP SUMMARY:
==4701== in use at exit: 0 bytes in 0 blocks
==4701== total heap usage: 0 allocs, 0 frees, 0 bytes allocated
==4701==
==4701== All heap blocks were freed -- no leaks are possible

Jaak Ristioja

2014-07-10 05:44:00 UTC

Yes, the full version might be helpful. Please send it.

God bless!
Jaak

Post by Isaac Dunham

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
Looking at corediatheke.cpp this is probably a bug which could
be found using valgrind. Please try the following command with
valgrind --leak-check=full --track-origins=yes -
--keep-stacktraces=alloc-and-free utils\diatheke -b KJV -k Ps117
Blessings, Jaak

Thank you for the recommendation.
$ valgrind --leak-check=full --track-origins=yes \
--keep-stacktraces=alloc-and-free /lib/ld-musl-i386.so.1 \
utilities/diatheke/.libs/diatheke -b KJV -k Ps117 \

/tmp/ram/musl-diatheke.txt 2>&1

The resulting log is very large (>5k lines), and I don't see any
obvious problems. (Not that I'd be likely to!) If desired, I can
attach a zipped or bzipped version. Following is the part (~80
lines) that's most likely to be interesting.
Thank you, Isaac Dunham
DiathekeMgr::DiathekeMgr(sword::SWConfig*, sword::SWConfig*, bool,
char, char, bool, bool) (diathekemgr.cpp:40) ==4701== by
0x48074CE: doquery(unsigned long, unsigned char, unsigned char,
unsigned long, unsigned char, char const*, char const*, char
const*, char const*, std::ostream*, char const*, signed char)
(corediatheke.cpp:117) ==4701== by 0x480452F: main
(diatheke.cpp:286) ==4701== ==4701== Conditional jump or move
depends on uninitialised value(s) ==4701== at 0x1297FE: calloc
sword::ListKey::add(sword::SWKey const&) (in
sword::ListKey::operator<<(sword::SWKey const&) (in
sword::VerseKey::parseVerseList(char const*, char const*, bool,
sword::VerseKey::parse(bool) (in /usr/lib/libsword-1.7.3.so)
==4701== by 0x4865CCD: sword::VerseKey::setText(char const*) (in
sword::VerseKey::parseVerseList(char const*, char const*, bool,
doquery(unsigned long, unsigned char, unsigned char, unsigned long,
unsigned char, char const*, char const*, char const*, char const*,
std::ostream*, char const*, signed char) (corediatheke.cpp:386)
==4701== by 0x480452F: main (diatheke.cpp:286) ==4701==
Uninitialised value was created ==4701== at 0x12385D: ???
(syscall.s:35) ==4701== by 0x12A488: malloc (malloc.c:379)
==4701== by 0x48094E5: sword::SWBuf::assureSize(unsigned int)
sword::SWBuf::SWBuf(sword::SWBuf const&, unsigned long) (in
/usr/lib/libsword-1.7.3.so) ==4701== by 0x486D5C6: ??? (in
std::_Rb_tree<sword::SWBuf, std::pair<sword::SWBuf const,
sword::SWBuf>, std::_Select1st<std::pair<sword::SWBuf const,
sword::SWBuf> >, std::less<sword::SWBuf>,
std::allocator<std::pair<sword::SWBuf const, sword::SWBuf> >

::_M_insert_equal(std::pair<sword::SWBuf const, sword::SWBuf>

sword::SWConfig::Load() (in /usr/lib/libsword-1.7.3.so) ==4701==
by 0x486E060: sword::SWConfig::SWConfig(char const*) (in
sword::SWLocale::SWLocale(char const*) (in
sword::LocaleMgr::loadConfigDir(char const*) (in
sword::LocaleMgr::LocaleMgr(char const*) (in
sword::LocaleMgr::getSystemLocaleMgr() (in
/usr/lib/libsword-1.7.3.so) ==4701== ==4701== Conditional jump or
sword::ZipCompress::Decode() (in /usr/lib/libsword-1.7.3.so)
==4701== by 0x4890801: sword::SWCompress::Buf(char const*,
unsigned long*) (in /usr/lib/libsword-1.7.3.so) ==4701== by
0x489485F: sword::zVerse::zReadText(char, long, unsigned short,
unsigned long, sword::SWBuf&) const (in
sword::zText::getRawEntryBuf() const (in
sword::SWModule::renderText(char const*, int, bool) (in
doquery(unsigned long, unsigned char, unsigned char, unsigned long,
unsigned char, char const*, char const*, char const*, char const*,
std::ostream*, char const*, signed char) (corediatheke.cpp:424)
==4701== by 0x480452F: main (diatheke.cpp:286) ==4701==
Uninitialised value was created ==4701== at 0x12385D: ???
(syscall.s:35) ==4701== by 0x12A488: malloc (malloc.c:379)
==4701== by 0x48094E5: sword::SWBuf::assureSize(unsigned int)
sword::SWBuf::SWBuf(sword::SWBuf const&, unsigned long) (in
/usr/lib/libsword-1.7.3.so) ==4701== by 0x486D5C6: ??? (in
std::_Rb_tree<sword::SWBuf, std::pair<sword::SWBuf const,
sword::SWBuf>, std::_Select1st<std::pair<sword::SWBuf const,
sword::SWBuf> >, std::less<sword::SWBuf>,
std::allocator<std::pair<sword::SWBuf const, sword::SWBuf> >

::_M_insert_equal(std::pair<sword::SWBuf const, sword::SWBuf>

sword::SWConfig::Load() (in /usr/lib/libsword-1.7.3.so) ==4701==
by 0x486E060: sword::SWConfig::SWConfig(char const*) (in
sword::SWLocale::SWLocale(char const*) (in
sword::LocaleMgr::loadConfigDir(char const*) (in
sword::LocaleMgr::LocaleMgr(char const*) (in
sword::LocaleMgr::getSystemLocaleMgr() (in
/usr/lib/libsword-1.7.3.so) ==4701== Psalms 117:1: O praise the
LORD, all ye nations: praise him, all ye people. ==4701==
Conditional jump or move depends on uninitialised value(s) ==4701==
exit (exit.c:22) ==4701== by 0x120E1A: (below main)
(__libc_start_main.c:76) ==4701== Uninitialised value was created
==4701== at 0x12385D: ??? (syscall.s:35) ==4701== by
sword::SWBuf::assureSize(unsigned int) (swbuf.h:62) ==4701== by
0x48691FE: sword::SWBuf::SWBuf(sword::SWBuf const&, unsigned long)
std::_Rb_tree<sword::SWBuf, std::pair<sword::SWBuf const,
sword::SWOptionFilter*>, std::_Select1st<std::pair<sword::SWBuf
const, sword::SWOptionFilter*> >, std::less<sword::SWBuf>,
std::allocator<std::pair<sword::SWBuf const,
sword::SWOptionFilter*> >

::_M_insert_unique(std::pair<sword::SWBuf const,

sword::SWOptionFilter*> const&) (in /usr/lib/libsword-1.7.3.so)
==4701== by 0x48702D3: sword::SWMgr::init() (in
sword::SWMgr::commonInit(sword::SWConfig*, sword::SWConfig*, bool,
sword::SWFilterMgr*, bool) (in /usr/lib/libsword-1.7.3.so) ==4701==
by 0x48748B9: sword::SWMgr::SWMgr(sword::SWConfig*,
sword::SWConfig*, bool, sword::SWFilterMgr*, bool) (in
DiathekeMgr::DiathekeMgr(sword::SWConfig*, sword::SWConfig*, bool,
char, char, bool, bool) (diathekemgr.cpp:40) ==4701== by
0x48074CE: doquery(unsigned long, unsigned char, unsigned char,
unsigned long, unsigned char, char const*, char const*, char
const*, char const*, std::ostream*, char const*, signed char)
(corediatheke.cpp:117) ==4701== by 0x480452F: main
(diatheke.cpp:286) ==4701== Psalms 117:2: For his merciful kindness
is great toward us: and the truth of the LORD endureth for ever.
and the truth of the LORD endureth for ever. Praise ye the LORD.
0 bytes in 0 blocks ==4701== total heap usage: 0 allocs, 0 frees,
0 bytes allocated ==4701== ==4701== All heap blocks were freed --
no leaks are possible
_______________________________________________ sword-devel mailing
list: sword-devel at crosswire.org
http://www.crosswire.org/mailman/listinfo/sword-devel Instructions
to unsubscribe/change your settings at above page

Isaac Dunham

2014-07-10 06:07:17 UTC

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Yes, the full version might be helpful. Please send it.
God bless!
Jaak

I'm attaching a zip of it.

God bless,
Isaac Dunham

Post by Isaac Dunham

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
Looking at corediatheke.cpp this is probably a bug which could
be found using valgrind. Please try the following command with
valgrind --leak-check=full --track-origins=yes -
--keep-stacktraces=alloc-and-free utils\diatheke -b KJV -k Ps117
Blessings, Jaak

Thank you for the recommendation.
$ valgrind --leak-check=full --track-origins=yes \
--keep-stacktraces=alloc-and-free /lib/ld-musl-i386.so.1 \
utilities/diatheke/.libs/diatheke -b KJV -k Ps117 \

/tmp/ram/musl-diatheke.txt 2>&1

The resulting log is very large (>5k lines), and I don't see any
obvious problems. (Not that I'd be likely to!) If desired, I can
attach a zipped or bzipped version. Following is the part (~80
lines) that's most likely to be interesting.
Thank you, Isaac Dunham
DiathekeMgr::DiathekeMgr(sword::SWConfig*, sword::SWConfig*, bool,
char, char, bool, bool) (diathekemgr.cpp:40) ==4701== by
0x48074CE: doquery(unsigned long, unsigned char, unsigned char,
unsigned long, unsigned char, char const*, char const*, char
const*, char const*, std::ostream*, char const*, signed char)
(corediatheke.cpp:117) ==4701== by 0x480452F: main
(diatheke.cpp:286) ==4701== ==4701== Conditional jump or move
depends on uninitialised value(s) ==4701== at 0x1297FE: calloc
sword::ListKey::add(sword::SWKey const&) (in
sword::ListKey::operator<<(sword::SWKey const&) (in
sword::VerseKey::parseVerseList(char const*, char const*, bool,
sword::VerseKey::parse(bool) (in /usr/lib/libsword-1.7.3.so)
==4701== by 0x4865CCD: sword::VerseKey::setText(char const*) (in
sword::VerseKey::parseVerseList(char const*, char const*, bool,
doquery(unsigned long, unsigned char, unsigned char, unsigned long,
unsigned char, char const*, char const*, char const*, char const*,
std::ostream*, char const*, signed char) (corediatheke.cpp:386)
==4701== by 0x480452F: main (diatheke.cpp:286) ==4701==
Uninitialised value was created ==4701== at 0x12385D: ???
(syscall.s:35) ==4701== by 0x12A488: malloc (malloc.c:379)
==4701== by 0x48094E5: sword::SWBuf::assureSize(unsigned int)
sword::SWBuf::SWBuf(sword::SWBuf const&, unsigned long) (in
/usr/lib/libsword-1.7.3.so) ==4701== by 0x486D5C6: ??? (in
std::_Rb_tree<sword::SWBuf, std::pair<sword::SWBuf const,
sword::SWBuf>, std::_Select1st<std::pair<sword::SWBuf const,
sword::SWBuf> >, std::less<sword::SWBuf>,
std::allocator<std::pair<sword::SWBuf const, sword::SWBuf> >

::_M_insert_equal(std::pair<sword::SWBuf const, sword::SWBuf>

sword::SWConfig::Load() (in /usr/lib/libsword-1.7.3.so) ==4701==
by 0x486E060: sword::SWConfig::SWConfig(char const*) (in
sword::SWLocale::SWLocale(char const*) (in
sword::LocaleMgr::loadConfigDir(char const*) (in
sword::LocaleMgr::LocaleMgr(char const*) (in
sword::LocaleMgr::getSystemLocaleMgr() (in
/usr/lib/libsword-1.7.3.so) ==4701== ==4701== Conditional jump or
sword::ZipCompress::Decode() (in /usr/lib/libsword-1.7.3.so)
==4701== by 0x4890801: sword::SWCompress::Buf(char const*,
unsigned long*) (in /usr/lib/libsword-1.7.3.so) ==4701== by
0x489485F: sword::zVerse::zReadText(char, long, unsigned short,
unsigned long, sword::SWBuf&) const (in
sword::zText::getRawEntryBuf() const (in
sword::SWModule::renderText(char const*, int, bool) (in
doquery(unsigned long, unsigned char, unsigned char, unsigned long,
unsigned char, char const*, char const*, char const*, char const*,
std::ostream*, char const*, signed char) (corediatheke.cpp:424)
==4701== by 0x480452F: main (diatheke.cpp:286) ==4701==
Uninitialised value was created ==4701== at 0x12385D: ???
(syscall.s:35) ==4701== by 0x12A488: malloc (malloc.c:379)
==4701== by 0x48094E5: sword::SWBuf::assureSize(unsigned int)
sword::SWBuf::SWBuf(sword::SWBuf const&, unsigned long) (in
/usr/lib/libsword-1.7.3.so) ==4701== by 0x486D5C6: ??? (in
std::_Rb_tree<sword::SWBuf, std::pair<sword::SWBuf const,
sword::SWBuf>, std::_Select1st<std::pair<sword::SWBuf const,
sword::SWBuf> >, std::less<sword::SWBuf>,
std::allocator<std::pair<sword::SWBuf const, sword::SWBuf> >

::_M_insert_equal(std::pair<sword::SWBuf const, sword::SWBuf>

sword::SWConfig::Load() (in /usr/lib/libsword-1.7.3.so) ==4701==
by 0x486E060: sword::SWConfig::SWConfig(char const*) (in
sword::SWLocale::SWLocale(char const*) (in
sword::LocaleMgr::loadConfigDir(char const*) (in
sword::LocaleMgr::LocaleMgr(char const*) (in
sword::LocaleMgr::getSystemLocaleMgr() (in
/usr/lib/libsword-1.7.3.so) ==4701== Psalms 117:1: O praise the
LORD, all ye nations: praise him, all ye people. ==4701==
Conditional jump or move depends on uninitialised value(s) ==4701==
exit (exit.c:22) ==4701== by 0x120E1A: (below main)
(__libc_start_main.c:76) ==4701== Uninitialised value was created
==4701== at 0x12385D: ??? (syscall.s:35) ==4701== by
sword::SWBuf::assureSize(unsigned int) (swbuf.h:62) ==4701== by
0x48691FE: sword::SWBuf::SWBuf(sword::SWBuf const&, unsigned long)
std::_Rb_tree<sword::SWBuf, std::pair<sword::SWBuf const,
sword::SWOptionFilter*>, std::_Select1st<std::pair<sword::SWBuf
const, sword::SWOptionFilter*> >, std::less<sword::SWBuf>,
std::allocator<std::pair<sword::SWBuf const,
sword::SWOptionFilter*> >

::_M_insert_unique(std::pair<sword::SWBuf const,

sword::SWOptionFilter*> const&) (in /usr/lib/libsword-1.7.3.so)
==4701== by 0x48702D3: sword::SWMgr::init() (in
sword::SWMgr::commonInit(sword::SWConfig*, sword::SWConfig*, bool,
sword::SWFilterMgr*, bool) (in /usr/lib/libsword-1.7.3.so) ==4701==
by 0x48748B9: sword::SWMgr::SWMgr(sword::SWConfig*,
sword::SWConfig*, bool, sword::SWFilterMgr*, bool) (in
DiathekeMgr::DiathekeMgr(sword::SWConfig*, sword::SWConfig*, bool,
char, char, bool, bool) (diathekemgr.cpp:40) ==4701== by
0x48074CE: doquery(unsigned long, unsigned char, unsigned char,
unsigned long, unsigned char, char const*, char const*, char
const*, char const*, std::ostream*, char const*, signed char)
(corediatheke.cpp:117) ==4701== by 0x480452F: main
(diatheke.cpp:286) ==4701== Psalms 117:2: For his merciful kindness
is great toward us: and the truth of the LORD endureth for ever.
and the truth of the LORD endureth for ever. Praise ye the LORD.
0 bytes in 0 blocks ==4701== total heap usage: 0 allocs, 0 frees,
0 bytes allocated ==4701== ==4701== All heap blocks were freed --
no leaks are possible
_______________________________________________ sword-devel mailing
list: sword-devel at crosswire.org
http://www.crosswire.org/mailman/listinfo/sword-devel Instructions
to unsubscribe/change your settings at above page

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQgcBAEBAgAGBQJTvigbAAoJELozJlbjIn79ZAtAAJZU9I8BPk+zrt0gzFHGJHsd
NDYF1P9J3VIwwqdtZWvU2KFiGKq3zjv08WTJmndHqmP187gL3N6udzKqikZJggCK
E4aICVlCeHVbZEAi/o+ABwSaQhSBHojM1OtE/TNVNcvK5wqXc2BzMBf25keOuLrG
Dr0yGx0QXK0pBRazTVpngEkwj03kJP3dKxJStYFW9MTMBO/29wCxIlg72h5VnS7+
is2w5WKz4cs55/5LEL0TlBSJjlpZVVGgsSz14y/wEGlyPz4nIcsSndIGRwd6KOGm
kQBFtis//zFuIXA3myMyFTb5xy17Mf3pFdEVHY5FCHbB3g5MB3I7vC/ijJs/TxIO
OMo4+WgDcNjrfyec+wIbuKbXoZpsOKvnVqbJ686Ro87h2LY9ZyMbW9b/TXCxsD86
i1Di797sEaEdgtMy6IHKeMSXjkI8669i1SWolNQC9mIXcU8k7wG7b6p+KmnVFH2t
A7A5WlkmsbR6QS7xztz4Sp633/VfYmeANTkcVmhHmoGLmcFrdzyG//iGye09Gt5s
lB9AZX/pVsFnjicK5swXmWwIqGeG1MWNQcUI7Pt3S4Bmoe+KndBc8vp+oerkjkDd
6v4a4diTYjkqd6Bha29zh+yRfKlM3S4yx9Bp6fsXoW6Gl9Jv1TIhjJySE0uvb9rW
tf/MrdfrHj5V7CKzD/8m6shsaQ4euppTH0cf9D46fOGs6TuVl/sEsZk315H9twjk
nKUkKpUwktnFClxj3jgtmCtddjWY1WdHDrab8KRHT2l06GxImVzDoPbUCPDCq97Q
lvaCL6LS6AuppDzpBRI/yM8ZfwTiwxn50J0Fva9wuIqJR2dDpuGfxwQlVHlKl4Rl
s6bYrI1V6aoAjrJPsdaIro5tOO6EP12TDXOddYNJbxOkJE3n60qFi46ta/SIekIN
PyXWd9Q/0icLEBGBTRX1I6tLx+qmqEspaT3v1ISSnY+qAHHe6VeSl+3pI9t+HmgP
j0OBwR1cEI8GxLwkH5Di7htFyz8eZ8Gx9plSFS3FeBVAMHuNIUgCjXuC3N++nfA5
PTMbZqETmhUSUt9eHMEPbIe5uMXmthYwmgLZFQpVSRhbVhec15QZ19mmMvIGdYIY
6k9FFMjD2W/2u35JoxWqm4XJs6XXG7JUzaTxQK9em0UfmeRtEMJtTCbw7vJuHMya
Nv66N8WDlMgxhDKNs+jFvJdZuNNDAk26pPCQYuGnqNr6a5SZx0hcZ8BQiXv27HLe
eZQoMNmI6+S86EBcrnpCKSS79GLd58b7YL/sGA2HHo9xOoN8DHgTN5EubIIXcMAE
PymShW2Iu/A4Xb/CIIFCT1H8TQhzEyErqTSY39tj8IYzb8V9jmQFZOt16RGVDmo1
PTCqYoIT+xbtf0J38s+zJDEX20/Uqf8JYK27xI3FMxDX7+aX/Lop3mnrbihfZeW8
QXeWRxBmhva0KMcoA1ve+oFkjGNiKVuI4NRrPIMPBzfE+zU7t4qOZp4uou5d9hLa
CcSqdcFcqEID/ce3gChc9yxwCx3qZ0F5R0dVNGjohB+fSDWRuVde4HNLZhBmRKzx
/D7wckYhw6dlc1K9v2pJdjSp8Sl1TlPHJHKL3S8+phFvL/jWykS4bH3AZzFr5bD9
YWJSJ49xtP6TGqLs/ye2wT8JZJBkiT6nULIUmcg1RVqBntfNAPa6fY6wZdZkc3u3
B+1Z4/I1jR/juqXNMf5o3K61nwTY6WYNMrKAF/cvTAPbBLp3LpmemBP8nHmYEZZE
hQcYNfas6zVqYNTllAcz5FLf9S/H1R8HVK2L6iJ1EuNLujslO+BAPyCKhEP1oHWg
dJ86uj0c7HI6Sl63QnmrPDUDBLs7qyo7NcKMfTBwtEimEPl+lyGIVWXIU4dYM3A6
jC12Y/o3R3koLTu+nUed9z0+kvRd7zjasZWbFQCBNfv20fZ/SH/R+wwxAxIB0t5f
/3YFrBgIQ26dsyyJePyK6DROmYhts+A5SNb253cRgoJp6aj+/W6DSJ/82YBxh0zc
Vr2qbOJGsTEtKW4sSlue/o32kWfYbziu3H4+uzqTWH+Oo3lfmRUYU3Vw1rywl+js
Hc4tbS/aANnAWpLEw8/8A+PYx+qqxD19pMP6vYeYl/+TQSnY2MGnZdcXqobqAhSB
m0ebUmqMgirupWDPr4fDXyQ6SVhwW67sY1j+ADYGp0m5GqDGntpx/AbegAAxptSn
YihlzrT4JtVSJySqPvCkimvjKhcSKf+lmutXdM6imHRspCosGuWE1oopdeztP+Xb
N+Ec3AiyTk1mdx7+48fHKsC1Dn/SVsrN74eRrN0stiLZEjbr7WMSrT7OgD9VbwP1
NwPu3Z9N1WZtzL13NvE022lxxLSu5HDuAMsKxaPdjxdexbCBEah90KTGkxi7KLf+
blykD31+WpP2kNhFjNh4yT6Q4QUhxM1QgBcSx+LCsK+8mSE69acLW3N40McVU2Qi
FcpqIKS/+cO4U+dSE7WmCa9FtO5w0clo6ERIkoGJc9IW7eg1khDWuqUMDbLaZMeM
vgNy3vKGdqlKj0DFIOdBoWjsTbAc2hbE4yrHSY/qlM/DfNnVE226a1v2pYG5WnBp
MZK2dNpfDPcdnxJ+1nfyLf6N0GWgorL9TQUqDbVldiuYz/YwJ1nNRwGsYRtF6toi
YMjivMSfvPbHDUzer3M/Psi9X8BHcO2o7vQYTTzBpzwgIE/pjPmqUqjvteowQ3O7
sRDFS5i+k1ELYY1IdHBY
=rQga
-----END PGP SIGNATURE-----
_______________________________________________
sword-devel mailing list: sword-devel at crosswire.org
http://www.crosswire.org/mailman/listinfo/sword-devel
Instructions to unsubscribe/change your settings at above page

-------------- next part --------------
A non-text attachment was scrubbed...
Name: diatheke-err.zip
Type: application/octet-stream
Size: 6723 bytes
Desc: not available
URL: <http://www.crosswire.org/pipermail/sword-devel/attachments/20140709/c6439b75/attachment-0001.obj>

Isaac Dunham

2014-07-10 06:53:56 UTC

Hello,
I took a look at what it was doing via strace(1), and found that diatheke
is reading the last verse twice.
I still wouldn't know where the problem could come from, though.

Thank you and God bless,
Isaac Dunham

Jaak Ristioja

2014-07-10 08:34:14 UTC

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

This seems to be a really silly indentation error in Sword 1.7.3. At
least the attached patch fixed the problem in my Alpine Linux VM for
"diatheke -b KJV -k Ps117". Might already be fixed in SVN.

Can any Sword developers confirm this bug and fix?

Blessings!
Jaak
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

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
lEHI9qOyzSTEHdTBvGTY
=6Tj7
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: corediatheke.patch
Type: text/x-patch
Size: 609 bytes
Desc: not available
URL: <http://www.crosswire.org/pipermail/sword-devel/attachments/20140710/44a0f818/attachment.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: corediatheke.patch.sig
Type: application/pgp-signature
Size: 2079 bytes
Desc: not available
URL: <http://www.crosswire.org/pipermail/sword-devel/attachments/20140710/44a0f818/attachment.sig>

Troy A. Griffitts

2014-07-12 17:59:19 UTC

Dear Jaak,

Thank you so much for looking into this. I went to review your patch
and it doesn't apply cleanly to trunk. Have you confirmed that this
problem still exists in trunk? If so, might you consider sending a
patch against trunk? Thank you!

Troy

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
This seems to be a really silly indentation error in Sword 1.7.3. At
least the attached patch fixed the problem in my Alpine Linux VM for
"diatheke -b KJV -k Ps117". Might already be fixed in SVN.
Can any Sword developers confirm this bug and fix?
Blessings!
Jaak
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
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
lEHI9qOyzSTEHdTBvGTY
=6Tj7
-----END PGP SIGNATURE-----
_______________________________________________
sword-devel mailing list: sword-devel at crosswire.org
http://www.crosswire.org/mailman/listinfo/sword-devel
Instructions to unsubscribe/change your settings at above page

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.crosswire.org/pipermail/sword-devel/attachments/20140712/c0205461/attachment.html>

Jaak Ristioja

2014-07-12 18:54:21 UTC

Yes, that code has changed a lot since 1.7.3. I have not confirmed
whether the issue still exists in trunk, but 1.7.3 is surely affected
by this. I suggest someone more familiar with the code to confirm that.

Blessings,
Jaak

Post by Troy A. Griffitts
Dear Jaak,
Thank you so much for looking into this. I went to review your
patch and it doesn't apply cleanly to trunk. Have you confirmed
that this problem still exists in trunk? If so, might you consider
sending a patch against trunk? Thank you!
Troy
On 07/10/2014 01:34 AM, Jaak Ristioja wrote: This seems to be a
really silly indentation error in Sword 1.7.3. At least the
attached patch fixed the problem in my Alpine Linux VM for
"diatheke -b KJV -k Ps117". Might already be fixed in SVN.
Can any Sword developers confirm this bug and fix?
Blessings! Jaak

Post by Isaac Dunham
_______________________________________________ sword-devel
mailing list: sword-devel at crosswire.org
http://www.crosswire.org/mailman/listinfo/sword-devel
Instructions to unsubscribe/change your settings at above page

_______________________________________________ sword-devel mailing
list: sword-devel at crosswire.org
http://www.crosswire.org/mailman/listinfo/sword-devel Instructions
to unsubscribe/change your settings at above page

Isaac Dunham

2014-07-12 18:57:09 UTC

For what it's worth, it didn't apply against 1.7.3 for me;
the offsets are off by a line or two.
(However, looking at the context was enough to fix it.)

Now I'll try building from VCS to check it (side note: any reason that
jsword is in git but there's still nothing at github.com/crosswire/sword?)

Thank you and God bless,
Isaac Dunham

Post by Troy A. Griffitts
Dear Jaak,
Thank you so much for looking into this. I went to review your patch and it
doesn't apply cleanly to trunk. Have you confirmed that this problem still
exists in trunk? If so, might you consider sending a patch against trunk?
Thank you!
Troy

Post by Jaak Ristioja
This seems to be a really silly indentation error in Sword 1.7.3. At
least the attached patch fixed the problem in my Alpine Linux VM for
"diatheke -b KJV -k Ps117". Might already be fixed in SVN.
Can any Sword developers confirm this bug and fix?
Blessings!
Jaak

Isaac Dunham

2014-07-12 21:21:30 UTC

Post by Troy A. Griffitts
Dear Jaak,
Thank you so much for looking into this. I went to review your patch and it
doesn't apply cleanly to trunk. Have you confirmed that this problem still
exists in trunk? If so, might you consider sending a patch against trunk?
Thank you!
Troy

Post by Jaak Ristioja
This seems to be a really silly indentation error in Sword 1.7.3. At
least the attached patch fixed the problem in my Alpine Linux VM for
"diatheke -b KJV -k Ps117". Might already be fixed in SVN.
Can any Sword developers confirm this bug and fix?
Blessings!
Jaak

Just built sword from the mirror at gitorious.org/sword/sword;
the bug is fixed there.
(For reference: I see that diatheke -f plain is now needed to get
plain output, since -f internal is now the default.)

God bless,
Isaac Dunham

Troy A. Griffitts

2014-07-13 02:09:43 UTC

Isaac, Thanks for checking and confirming that trunk has been fixed.

Greg, It seems quite reasonable to applying Jaak's patch to the 1.7
branch if we intend on releasing a 1.7.4. I mention this, as this is an
exception to the rule that all patches are first applied to trunk and
then merged to release.

Thanks again Jaak and Isaac (and Greg for maintaining the 1.7 branch).

Troy

Post by Isaac Dunham

Post by Troy A. Griffitts
Dear Jaak,
Thank you so much for looking into this. I went to review your patch and it
doesn't apply cleanly to trunk. Have you confirmed that this problem still
exists in trunk? If so, might you consider sending a patch against trunk?
Thank you!
Troy

Post by Jaak Ristioja
This seems to be a really silly indentation error in Sword 1.7.3. At
least the attached patch fixed the problem in my Alpine Linux VM for
"diatheke -b KJV -k Ps117". Might already be fixed in SVN.
Can any Sword developers confirm this bug and fix?
Blessings!
Jaak

Just built sword from the mirror at gitorious.org/sword/sword;
the bug is fixed there.
(For reference: I see that diatheke -f plain is now needed to get
plain output, since -f internal is now the default.)
God bless,
Isaac Dunham
_______________________________________________
sword-devel mailing list: sword-devel at crosswire.org
http://www.crosswire.org/mailman/listinfo/sword-devel
Instructions to unsubscribe/change your settings at above page

Jaak Ristioja

2014-07-13 07:19:47 UTC

So, I assume someone my patch has been reviewed. Personally I'm not
entirely sure whether I got the { and } right.

Blessings,
Jaak

Post by Troy A. Griffitts
Isaac, Thanks for checking and confirming that trunk has been
fixed.
Greg, It seems quite reasonable to applying Jaak's patch to the
1.7 branch if we intend on releasing a 1.7.4. I mention this, as
this is an exception to the rule that all patches are first applied
to trunk and then merged to release.
Thanks again Jaak and Isaac (and Greg for maintaining the 1.7
branch).
Troy

On Sat, Jul 12, 2014 at 10:59:19AM -0700, Troy A. Griffitts

Post by Troy A. Griffitts
Dear Jaak,
Thank you so much for looking into this. I went to review your
patch and it doesn't apply cleanly to trunk. Have you
confirmed that this problem still exists in trunk? If so,
might you consider sending a patch against trunk? Thank you!
Troy

Post by Jaak Ristioja
This seems to be a really silly indentation error in Sword
1.7.3. At least the attached patch fixed the problem in my
Alpine Linux VM for "diatheke -b KJV -k Ps117". Might already
be fixed in SVN.
Can any Sword developers confirm this bug and fix?
Blessings! Jaak

Just built sword from the mirror at gitorious.org/sword/sword;
the bug is fixed there. (For reference: I see that diatheke -f
plain is now needed to get plain output, since -f internal is now
the default.)
God bless, Isaac Dunham
_______________________________________________ sword-devel
mailing list: sword-devel at crosswire.org
http://www.crosswire.org/mailman/listinfo/sword-devel
Instructions to unsubscribe/change your settings at above page

_______________________________________________ sword-devel mailing
list: sword-devel at crosswire.org
http://www.crosswire.org/mailman/listinfo/sword-devel Instructions
to unsubscribe/change your settings at above page

Greg Hellings

2014-07-15 02:26:48 UTC

I intend on maintaining 1.7 up you're ready to release and branch 1.8.

As others have noted, I've tried to apply this patch to the 1.7 series
branch but the patch does not apply. One hunk applies with fuzz 2, the
other does not apply. Jaak - any chance of getting a patch that applies?

--Greg

On Sat, Jul 12, 2014 at 9:09 PM, Troy A. Griffitts <scribe at crosswire.org>

Post by Troy A. Griffitts
Isaac, Thanks for checking and confirming that trunk has been fixed.
Greg, It seems quite reasonable to applying Jaak's patch to the 1.7
branch if we intend on releasing a 1.7.4. I mention this, as this is an
exception to the rule that all patches are first applied to trunk and then
merged to release.
Thanks again Jaak and Isaac (and Greg for maintaining the 1.7 branch).
Troy

Post by Isaac Dunham

Post by Troy A. Griffitts
Dear Jaak,
Thank you so much for looking into this. I went to review your patch and it
doesn't apply cleanly to trunk. Have you confirmed that this problem still
exists in trunk? If so, might you consider sending a patch against trunk?
Thank you!
Troy

Post by Jaak Ristioja
This seems to be a really silly indentation error in Sword 1.7.3. At
least the attached patch fixed the problem in my Alpine Linux VM for
"diatheke -b KJV -k Ps117". Might already be fixed in SVN.
Can any Sword developers confirm this bug and fix?
Blessings!
Jaak

Just built sword from the mirror at gitorious.org/sword/sword;

the bug is fixed there.
(For reference: I see that diatheke -f plain is now needed to get
plain output, since -f internal is now the default.)
God bless,
Isaac Dunham
_______________________________________________
sword-devel mailing list: sword-devel at crosswire.org
http://www.crosswire.org/mailman/listinfo/sword-devel
Instructions to unsubscribe/change your settings at above page

_______________________________________________
sword-devel mailing list: sword-devel at crosswire.org
http://www.crosswire.org/mailman/listinfo/sword-devel
Instructions to unsubscribe/change your settings at above page

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.crosswire.org/pipermail/sword-devel/attachments/20140714/ef1a70a0/attachment.html>

Jaak Ristioja

2014-07-15 07:41:42 UTC

No. As I repeatedly have tried to say, I'm not qualified. Bug the
author of the code. My patch (which I'm still not convinced is
correct) only applied to 1.7.3.

Blessings,
Jaak

Post by Greg Hellings
I intend on maintaining 1.7 up you're ready to release and branch 1.8.
As others have noted, I've tried to apply this patch to the 1.7
series branch but the patch does not apply. One hunk applies with
fuzz 2, the other does not apply. Jaak - any chance of getting a
patch that applies?
--Greg
On Sat, Jul 12, 2014 at 9:09 PM, Troy A. Griffitts
Isaac, Thanks for checking and confirming that trunk has been
fixed.
Greg, It seems quite reasonable to applying Jaak's patch to the
1.7 branch if we intend on releasing a 1.7.4. I mention this, as
this is an exception to the rule that all patches are first applied
to trunk and then merged to release.
Thanks again Jaak and Isaac (and Greg for maintaining the 1.7
branch).
Troy
Dear Jaak,
Thank you so much for looking into this. I went to review your
patch and it doesn't apply cleanly to trunk. Have you confirmed
that this problem still exists in trunk? If so, might you consider
sending a patch against trunk? Thank you!
Troy
This seems to be a really silly indentation error in Sword 1.7.3.
At least the attached patch fixed the problem in my Alpine Linux VM
for "diatheke -b KJV -k Ps117". Might already be fixed in SVN.
Can any Sword developers confirm this bug and fix?
Blessings! Jaak
Just built sword from the mirror at gitorious.org/sword/sword
<http://gitorious.org/sword/sword>; the bug is fixed there. (For
reference: I see that diatheke -f plain is now needed to get plain
output, since -f internal is now the default.)
God bless, Isaac Dunham
_________________________________________________ sword-devel
mailing list: sword-devel at crosswire.org
<mailto:sword-devel at crosswire.org>
http://www.crosswire.org/__mailman/listinfo/sword-devel
<http://www.crosswire.org/mailman/listinfo/sword-devel>
Instructions to unsubscribe/change your settings at above page
_________________________________________________ sword-devel
mailing list: sword-devel at crosswire.org
<mailto:sword-devel at crosswire.org>
http://www.crosswire.org/__mailman/listinfo/sword-devel
<http://www.crosswire.org/mailman/listinfo/sword-devel>
Instructions to unsubscribe/change your settings at above page
_______________________________________________ sword-devel mailing
list: sword-devel at crosswire.org
http://www.crosswire.org/mailman/listinfo/sword-devel Instructions
to unsubscribe/change your settings at above page

Jaak Ristioja

2014-07-15 14:32:44 UTC

Greg Hellings

2014-07-19 21:03:46 UTC

Thanks, this is in now as r3245 in SVN.

--Greg

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Sry, the original patch had some tabs vs spaces issue, I think. Here's
the correct one for 1.7.3.

Post by Jaak Ristioja
No. As I repeatedly have tried to say, I'm not qualified. Bug the
author of the code. My patch (which I'm still not convinced is
correct) only applied to 1.7.3.
Blessings, Jaak

Post by Greg Hellings
I intend on maintaining 1.7 up you're ready to release and
branch 1.8.
As others have noted, I've tried to apply this patch to the 1.7
series branch but the patch does not apply. One hunk applies
with fuzz 2, the other does not apply. Jaak - any chance of
getting a patch that applies?
--Greg
On Sat, Jul 12, 2014 at 9:09 PM, Troy A. Griffitts
Isaac, Thanks for checking and confirming that trunk has been fixed.
Greg, It seems quite reasonable to applying Jaak's patch to the
1.7 branch if we intend on releasing a 1.7.4. I mention this,
as this is an exception to the rule that all patches are first
applied to trunk and then merged to release.
Thanks again Jaak and Isaac (and Greg for maintaining the 1.7 branch).
Troy
On Sat, Jul 12, 2014 at 10:59:19AM -0700, Troy A. Griffitts
Dear Jaak,
Thank you so much for looking into this. I went to review your
patch and it doesn't apply cleanly to trunk. Have you confirmed
that this problem still exists in trunk? If so, might you
consider sending a patch against trunk? Thank you!
Troy
This seems to be a really silly indentation error in Sword
1.7.3. At least the attached patch fixed the problem in my Alpine
Linux VM for "diatheke -b KJV -k Ps117". Might already be fixed
in SVN.
Can any Sword developers confirm this bug and fix?
Blessings! Jaak
Just built sword from the mirror at gitorious.org/sword/sword
<http://gitorious.org/sword/sword>; the bug is fixed there. (For
reference: I see that diatheke -f plain is now needed to get
plain output, since -f internal is now the default.)
God bless, Isaac Dunham
_________________________________________________ sword-devel
mailing list: sword-devel at crosswire.org
<mailto:sword-devel at crosswire.org>
http://www.crosswire.org/__mailman/listinfo/sword-devel
<http://www.crosswire.org/mailman/listinfo/sword-devel>
Instructions to unsubscribe/change your settings at above page
_________________________________________________ sword-devel
mailing list: sword-devel at crosswire.org
<mailto:sword-devel at crosswire.org>
http://www.crosswire.org/__mailman/listinfo/sword-devel
<http://www.crosswire.org/mailman/listinfo/sword-devel>
Instructions to unsubscribe/change your settings at above page
_______________________________________________ sword-devel
mailing list: sword-devel at crosswire.org
http://www.crosswire.org/mailman/listinfo/sword-devel
Instructions to unsubscribe/change your settings at above page

_______________________________________________ sword-devel mailing
list: sword-devel at crosswire.org
http://www.crosswire.org/mailman/listinfo/sword-devel Instructions
to unsubscribe/change your settings at above page

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
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
6ElslAXcS7gWcB/1VO8k
=tpiQ
-----END PGP SIGNATURE-----
_______________________________________________
sword-devel mailing list: sword-devel at crosswire.org
http://www.crosswire.org/mailman/listinfo/sword-devel
Instructions to unsubscribe/change your settings at above page

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.crosswire.org/pipermail/sword-devel/attachments/20140719/197cbefa/attachment.html>

Isaac Dunham

2014-07-15 20:23:09 UTC

Post by Greg Hellings
I intend on maintaining 1.7 up you're ready to release and branch 1.8.
As others have noted, I've tried to apply this patch to the 1.7 series
branch but the patch does not apply. One hunk applies with fuzz 2, the
other does not apply. Jaak - any chance of getting a patch that applies?
--Greg

Try this patch, which is Jaak's patch munged to apply to 1.7.3.
It applies to sword-1-7-x as well.

Thank you and God bless,
Isaac Dunham
-------------- next part --------------
diff --git a/utilities/diatheke/corediatheke.cpp b/utilities/diatheke/corediatheke.cpp
index 6e05e7c..c2b6efb 100644
--- a/utilities/diatheke/corediatheke.cpp
+++ b/utilities/diatheke/corediatheke.cpp
@@ -454,7 +454,6 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI
if (font) { *output << "style=\"font:\"" << font << ";\" " ;}
if (strcmp(modlocale,locale) !=0 ) { *output << "lang=\"" << modlocale << "\"";}
*output << ">";
- }
}

if (font && (outputformat == FMT_HTML || outputformat == FMT_HTMLHREF || outputformat == FMT_XHTML || outputformat == FMT_THML || outputformat == FMT_CGI)) {
@@ -498,4 +497,4 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI
}

}
-
+}

19 Replies
9 Views
Permalink to this page
Disable enhanced parsing

Thread Navigation

Isaac Dunham 2014-07-07 17:11:03 UTC

David Haslam 2014-07-08 09:00:32 UTC

Isaac Dunham 2014-07-08 14:10:28 UTC

Jaak Ristioja 2014-07-08 14:33:54 UTC

Isaac Dunham 2014-07-10 04:36:35 UTC

Jaak Ristioja 2014-07-10 05:44:00 UTC

Isaac Dunham 2014-07-10 06:07:17 UTC

Isaac Dunham 2014-07-10 06:53:56 UTC

Jaak Ristioja 2014-07-10 08:34:14 UTC

Troy A. Griffitts 2014-07-12 17:59:19 UTC

Jaak Ristioja 2014-07-12 18:54:21 UTC

Isaac Dunham 2014-07-12 18:57:09 UTC

Isaac Dunham 2014-07-12 21:21:30 UTC

Troy A. Griffitts 2014-07-13 02:09:43 UTC

Jaak Ristioja 2014-07-13 07:19:47 UTC

Greg Hellings 2014-07-15 02:26:48 UTC

Jaak Ristioja 2014-07-15 07:41:42 UTC

Jaak Ristioja 2014-07-15 14:32:44 UTC

Greg Hellings 2014-07-19 21:03:46 UTC

Isaac Dunham 2014-07-15 20:23:09 UTC

about - legalese

Loading...