|
|
|
/**********************************************************************
|
|
|
|
** Copyright (C) 1998-2008 Trolltech ASA. All rights reserved.
|
|
|
|
**
|
|
|
|
** This is a utility program for merging findtr msgfiles
|
|
|
|
**
|
|
|
|
** This file may be used under the terms of the GNU General
|
|
|
|
** Public License versions 2.0 or 3.0 as published by the Free
|
|
|
|
** Software Foundation and appearing in the files LICENSE.GPL2
|
|
|
|
** and LICENSE.GPL3 included in the packaging of this file.
|
|
|
|
** Alternatively you may (at your option) use any later version
|
|
|
|
** of the GNU General Public License if such license has been
|
|
|
|
** publicly approved by Trolltech ASA (or its successors, if any)
|
|
|
|
** and the KDE Free TQt Foundation.
|
|
|
|
**
|
|
|
|
** Please review the following information to ensure GNU General
|
|
|
|
** Public Licensing requirements will be met:
|
|
|
|
** http://trolltech.com/products/qt/licenses/licensing/opensource/.
|
|
|
|
** If you are unsure which license is appropriate for your use, please
|
|
|
|
** review the following information:
|
|
|
|
** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
|
|
|
|
** or contact the sales department at sales@trolltech.com.
|
|
|
|
**
|
|
|
|
** Licensees holding valid TQt Commercial licenses may use this file in
|
|
|
|
** accordance with the TQt Commercial License Agreement provided with
|
|
|
|
** the Software.
|
|
|
|
**
|
|
|
|
** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
|
|
|
|
** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
|
|
|
|
** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
|
|
|
|
** herein.
|
|
|
|
**
|
|
|
|
**********************************************************************/
|
|
|
|
|
|
|
|
#include <tqfile.h>
|
|
|
|
#include <tqbuffer.h>
|
|
|
|
#include <tqtextstream.h>
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
|
|
|
bool isEmpty( const TQString& line )
|
|
|
|
{
|
|
|
|
int i = 0;
|
|
|
|
while ( i < int(line.length()) ) {
|
|
|
|
if ( !line[i].isSpace() )
|
|
|
|
return FALSE;
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
bool hasHandle( const TQString& line, const TQString& handle)
|
|
|
|
{
|
|
|
|
return line.left(handle.length()) == handle;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool isUserComment( const TQString& line )
|
|
|
|
{
|
|
|
|
return line.length() > 2 && line[0] == '#' && line[1].isSpace();
|
|
|
|
}
|
|
|
|
|
|
|
|
bool isSystemComment( const TQString& line )
|
|
|
|
{
|
|
|
|
return line.length() > 1 && line[0] == '#' && !line[1].isSpace();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
TQString extractContents( const TQString& line )
|
|
|
|
{
|
|
|
|
TQString contents;
|
|
|
|
int pos = 0;
|
|
|
|
bool inStr = FALSE;
|
|
|
|
while ( pos < int(line.length()) ) {
|
|
|
|
if ( line[pos] == '"' ) {
|
|
|
|
inStr = !inStr;
|
|
|
|
pos++;
|
|
|
|
} else {
|
|
|
|
if ( inStr ) {
|
|
|
|
if ( line[pos] == '\\') {
|
|
|
|
pos++;
|
|
|
|
switch (char(line[pos]) ) {
|
|
|
|
case 'n':
|
|
|
|
contents += '\n';
|
|
|
|
break;
|
|
|
|
case 't':
|
|
|
|
contents += '\t';
|
|
|
|
break;
|
|
|
|
case 'r':
|
|
|
|
contents += '\r';
|
|
|
|
break;
|
|
|
|
case 'a':
|
|
|
|
contents += '\a';
|
|
|
|
break;
|
|
|
|
case 'f':
|
|
|
|
contents += '\f';
|
|
|
|
break;
|
|
|
|
case 'v':
|
|
|
|
contents += '\v';
|
|
|
|
break;
|
|
|
|
case 'b':
|
|
|
|
contents += '\b';
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
contents += char(line[pos]);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
contents += line[pos];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
pos++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return contents;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct Item
|
|
|
|
{
|
|
|
|
Item() {}
|
|
|
|
Item( const Item &i ) :usercomments(i.usercomments),
|
|
|
|
systemcomments(i.systemcomments), msgid(i.msgid), msgstr(i.msgstr){}
|
|
|
|
Item &operator=( const Item &i ) {
|
|
|
|
usercomments = i.usercomments; systemcomments = i.systemcomments;
|
|
|
|
msgid = i.msgid; msgstr = i.msgstr;
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
bool isNull() const { return usercomments.isNull()&&systemcomments.isNull()
|
|
|
|
&&msgstr.isNull() &&msgid.isNull(); }
|
|
|
|
|
|
|
|
TQString usercomments;
|
|
|
|
TQString systemcomments;
|
|
|
|
TQString msgid;
|
|
|
|
TQString msgstr;
|
|
|
|
};
|
|
|
|
|
|
|
|
enum tqStatus { Equal, First, Second, FirstJunk, SecondJunk };
|
|
|
|
|
|
|
|
Item getItem( TQTextStream &str, TQString &s )
|
|
|
|
{
|
|
|
|
Item i;
|
|
|
|
while ( !str.atEnd() && s.isEmpty() ) {
|
|
|
|
s = str.readLine().stripWhiteSpace();
|
|
|
|
}
|
|
|
|
while ( !str.atEnd() && !s.isEmpty() ) {
|
|
|
|
if ( isSystemComment(s) ) {
|
|
|
|
i.systemcomments += s + "\n";
|
|
|
|
s = str.readLine().stripWhiteSpace();
|
|
|
|
} else if ( isUserComment(s) ) {
|
|
|
|
i.usercomments += s + "\n";
|
|
|
|
s = str.readLine().stripWhiteSpace();
|
|
|
|
} else if ( hasHandle( s, "msgid" ) ) {
|
|
|
|
TQString r = s + "\n";
|
|
|
|
s = str.readLine().stripWhiteSpace();
|
|
|
|
while ( !str.atEnd() && hasHandle(s, "\"") ) {
|
|
|
|
r += s;
|
|
|
|
s = str.readLine().stripWhiteSpace();
|
|
|
|
r += "\n";
|
|
|
|
}
|
|
|
|
i.msgid = r;
|
|
|
|
} else if ( hasHandle( s, "msgstr" ) ) {
|
|
|
|
TQString r = s + "\n";
|
|
|
|
s = str.readLine().stripWhiteSpace();
|
|
|
|
while ( hasHandle(s, "\"") ) {
|
|
|
|
r += s;
|
|
|
|
s = str.readLine().stripWhiteSpace();
|
|
|
|
r += "\n";
|
|
|
|
}
|
|
|
|
i.msgstr = r;
|
|
|
|
} else {
|
|
|
|
s = str.readLine().stripWhiteSpace();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return i;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int nMerge, nNew, nOld, nJunk;
|
|
|
|
|
|
|
|
|
|
|
|
void writecomment( TQTextStream &str, const TQString &s )
|
|
|
|
{
|
|
|
|
if ( s.isEmpty() )
|
|
|
|
return;
|
|
|
|
int idx = 0;
|
|
|
|
int len = s.length();
|
|
|
|
while ( idx < len ) {
|
|
|
|
int nl = s.find( '\n', idx );
|
|
|
|
if ( nl < 0 ) {
|
|
|
|
qWarning( "writecomment: string lacks newline" );
|
|
|
|
str << "# " << s.mid( idx ) << '\n';
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
str << "# " << s.mid( idx, nl-idx+1 );
|
|
|
|
idx = nl+1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void writemerge( TQTextStream &str, const Item &i1, const Item &i2 )
|
|
|
|
{
|
|
|
|
nMerge++;
|
|
|
|
if ( !i2.usercomments.isEmpty() )
|
|
|
|
str << i2.usercomments;
|
|
|
|
if ( !i1.systemcomments.isEmpty() )
|
|
|
|
str << i1.systemcomments;
|
|
|
|
str << i1.msgid;
|
|
|
|
str << i2.msgstr;
|
|
|
|
str << "\n";
|
|
|
|
}
|
|
|
|
void writenew( TQTextStream &str, const Item &i1 )
|
|
|
|
{
|
|
|
|
nNew++;
|
|
|
|
if ( !i1.usercomments.isEmpty() )
|
|
|
|
str << i1.usercomments;
|
|
|
|
if ( !i1.systemcomments.isEmpty() )
|
|
|
|
str << i1.systemcomments;
|
|
|
|
str << i1.msgid;
|
|
|
|
str << i1.msgstr;
|
|
|
|
str << "\n";
|
|
|
|
}
|
|
|
|
|
|
|
|
void writeold( TQTextStream &str, const Item &i2 )
|
|
|
|
{
|
|
|
|
nOld++;
|
|
|
|
writecomment( str, i2.usercomments );
|
|
|
|
writecomment( str, i2.systemcomments );
|
|
|
|
writecomment( str, i2.msgid );
|
|
|
|
writecomment( str, i2.msgstr );
|
|
|
|
str << "\n";
|
|
|
|
}
|
|
|
|
|
|
|
|
void writejunk( TQTextStream &str, const Item &it )
|
|
|
|
{
|
|
|
|
nJunk++;
|
|
|
|
if ( !it.usercomments.isEmpty() )
|
|
|
|
str << it.usercomments;
|
|
|
|
writecomment( str, it.systemcomments );
|
|
|
|
writecomment( str, it.msgid );
|
|
|
|
writecomment( str, it.msgstr );
|
|
|
|
str << "\n";
|
|
|
|
}
|
|
|
|
|
|
|
|
tqStatus compare( const Item &i1, const Item &i2 )
|
|
|
|
{
|
|
|
|
if ( i1.isNull() && i2.isNull() )
|
|
|
|
return Equal;
|
|
|
|
if ( i1.isNull() )
|
|
|
|
return Second;
|
|
|
|
if ( i2.isNull() )
|
|
|
|
return First;
|
|
|
|
if ( i1.msgid.isEmpty() )
|
|
|
|
return FirstJunk;
|
|
|
|
if ( i2.msgid.isEmpty() )
|
|
|
|
return SecondJunk;
|
|
|
|
TQString s1 = extractContents( i1.msgid );
|
|
|
|
TQString s2 = extractContents( i2.msgid );
|
|
|
|
if ( !s1 && !s2 )
|
|
|
|
return Equal;
|
|
|
|
if ( !s1 )
|
|
|
|
return First;
|
|
|
|
if ( !s2 )
|
|
|
|
return Second;
|
|
|
|
int i = strcmp( s1.ascii(), s2.ascii() );
|
|
|
|
if ( i < 0 )
|
|
|
|
return First;
|
|
|
|
if ( i == 0 )
|
|
|
|
return Equal;
|
|
|
|
// i > 0
|
|
|
|
return Second;
|
|
|
|
}
|
|
|
|
|
|
|
|
void merge( const TQString& newname, const TQString& oldname,
|
|
|
|
const TQString& resname )
|
|
|
|
{
|
|
|
|
TQFile f1(newname);
|
|
|
|
if ( !f1.open( IO_ReadOnly) )
|
|
|
|
return;
|
|
|
|
|
|
|
|
TQFile f2(oldname);
|
|
|
|
if ( !f2.open( IO_ReadOnly) )
|
|
|
|
return;
|
|
|
|
|
|
|
|
TQBuffer fout;
|
|
|
|
fout.open(IO_WriteOnly);
|
|
|
|
|
|
|
|
TQTextStream in1( &f1 );
|
|
|
|
TQTextStream in2( &f2 );
|
|
|
|
TQTextStream out( &fout );
|
|
|
|
|
|
|
|
TQString buf1 = in1.readLine().stripWhiteSpace();
|
|
|
|
TQString buf2 = in2.readLine().stripWhiteSpace();
|
|
|
|
|
|
|
|
Item i1 = getItem( in1, buf1 );
|
|
|
|
Item i2 = getItem( in2, buf2 );
|
|
|
|
while ( !i1.isNull() || !i2.isNull() ) {
|
|
|
|
tqStatus s = compare( i1, i2 );
|
|
|
|
if ( s == Equal ) {
|
|
|
|
writemerge(out,i1,i2);
|
|
|
|
i1 = getItem( in1, buf1 );
|
|
|
|
i2 = getItem( in2, buf2 );
|
|
|
|
} else if ( s == First ) {
|
|
|
|
writenew( out, i1 );
|
|
|
|
i1 = getItem( in1, buf1 );
|
|
|
|
} else if ( s == FirstJunk ) {
|
|
|
|
//solitary comment
|
|
|
|
writejunk( out, i1 );
|
|
|
|
i1 = getItem( in1, buf1 );
|
|
|
|
} else if ( s == Second ) {
|
|
|
|
writeold( out, i2 );
|
|
|
|
i2 = getItem( in2, buf2 );
|
|
|
|
} else if ( s == SecondJunk ) {
|
|
|
|
//solitary comment
|
|
|
|
writejunk( out, i2 );
|
|
|
|
i2 = getItem( in2, buf2 );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
f1.close();
|
|
|
|
f2.close();
|
|
|
|
fout.close();
|
|
|
|
TQFile fileout(resname);
|
|
|
|
if ( !fileout.open( IO_WriteOnly | IO_Translate ) )
|
|
|
|
return;
|
|
|
|
fileout.writeBlock(fout.buffer());
|
|
|
|
fileout.close();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int main( int argc, char* argv[] )
|
|
|
|
{
|
|
|
|
|
|
|
|
int orgfile = 1;
|
|
|
|
int newfile = 2;
|
|
|
|
|
|
|
|
if ( argc <= newfile || argc > 1 && argv[1][0] == '-') {
|
|
|
|
printf("usage: %s orgfile newfile [outfile]\n", argv[0]);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
merge( argv[newfile], argv[orgfile],
|
|
|
|
argc > newfile+1 ? argv[newfile+1] : argv[orgfile] );
|
|
|
|
|
|
|
|
printf( "Merged %d entries, added %d new entries and removed %d entries\n",
|
|
|
|
nMerge, nNew, nOld );
|
|
|
|
if ( nJunk > 0 )
|
|
|
|
printf( "Found %d junk entries\n", nJunk );
|
|
|
|
return 0;
|
|
|
|
}
|