Merge from BRANCH_1_0

6 files changed, 65 insertions, 34 deletions

diff --git a/core/obex/obex.cc b/core/obex/obex.cc
index 595fed9..2a306de 100644
--- a/core/obex/obex.cc
+++ b/core/obex/obex.cc
@@ -11,6 +11,8 @@
 
 using namespace  OpieObex;
 
+/* TRANSLATOR OpieObex::Obex */
+
 Obex::Obex( QObject *parent, const char* name )
   : QObject(parent, name )
 {
@@ -109,11 +111,7 @@ void Obex::slotExited(OProcess* proc ){
 }
 void Obex::slotStdOut(OProcess* proc, char* buf, int len){
     if ( proc == m_rec ) { // only receive
-        for (int i = 0; i < len; i++ ) {
-            printf("%c", buf[i] );
-        }
-        printf("\n");
-        QByteArray ar( len );
+        QByteArray ar( len  );
         memcpy( ar.data(), buf, len );
         qWarning("parsed: %s", ar.data() );
         m_outp.append( ar );
@@ -125,13 +123,6 @@ void Obex::received() {
       if ( m_rec->exitStatus() == 0 ) { // we got one
           QString filename = parseOut();
           qWarning("ACHTUNG %s", filename.latin1() );
-          if (filename.contains( 'ö' ) || filename.contains( 'ä' ) || filename.contains('ü' ) ) {
-              qWarning("renaming!!!!");
-              QFileInfo inf( filename );
-              QString newName = "/tmp/opie-obex." + inf.extension();
-              ::rename( QFile::encodeName( filename ).data(), newName );
-              qWarning("name is %s", QFile::encodeName( filename ).data() );
-          }
           emit receivedFile( filename );
       }
   }else{
diff --git a/core/obex/obexhandler.cpp b/core/obex/obexhandler.cpp
index 6509d12..5aaf63c 100644
--- a/core/obex/obexhandler.cpp
+++ b/core/obex/obexhandler.cpp
@@ -8,6 +8,8 @@
 
 using namespace OpieObex;
 
+/* TRANSLATOR OpieObex::ObexHandler */
+
 ObexHandler::ObexHandler() {
     m_wasRec = false;
     m_sender = 0l;
diff --git a/core/obex/obeximpl.cpp b/core/obex/obeximpl.cpp
index 12a078f..5bfc779 100644
--- a/core/obex/obeximpl.cpp
+++ b/core/obex/obeximpl.cpp
@@ -3,6 +3,8 @@
 
 using namespace OpieObex;
 
+/* TRANSLATOR OpieObex::ObexImpl */
+
 ObexImpl::ObexImpl() {
     m_handler = new ObexHandler;
 }
diff --git a/core/obex/obexsend.cpp b/core/obex/obexsend.cpp
index 2931cf7..cf5d958 100644
--- a/core/obex/obexsend.cpp
+++ b/core/obex/obexsend.cpp
@@ -15,6 +15,8 @@
 
 using namespace OpieObex;
 
+/* TRANSLATOR OpieObex::SendWidget */
+
 
 SendWidget::SendWidget( QWidget* parent, const char* name )
     : QWidget( parent, name ) {
diff --git a/core/obex/receiver.cpp b/core/obex/receiver.cpp
index 31c6afe..bf9e30c 100644
--- a/core/obex/receiver.cpp
+++ b/core/obex/receiver.cpp
@@ -1,6 +1,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
+#include <stdlib.h> // int system
 #include <unistd.h>
 
 #include <fcntl.h>
@@ -9,18 +10,22 @@
 #include <qfileinfo.h>
 #include <qlabel.h>
 #include <qhbox.h>
+#include <qregexp.h>
 #include <qtextview.h>
 #include <qpushbutton.h>
 
 #include <qpe/applnk.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/qcopenvelope_qws.h>
+#include <qpe/global.h>
 
 #include "obex.h"
 #include "receiver.h"
 
 using namespace OpieObex;
 
+/* TRANSLATOR OpieObex::Receiver */
+
 Receiver::Receiver() {
     m_obex = new Obex(this, "Receiver");
     connect(m_obex, SIGNAL(receivedFile(const QString& ) ),
@@ -31,7 +36,8 @@ Receiver::~Receiver() {
     m_obex->setReceiveEnabled( false );
     delete m_obex;
 }
-void Receiver::slotReceived( const QString& file ) {
+void Receiver::slotReceived( const QString& _file ) {
+    QString file = _file;
     int check = checkFile(file);
     if ( check == AddressBook )
         handleAddr( file );
@@ -59,21 +65,58 @@ void Receiver::handleOther( const QString& other ) {
     OtherHandler* hand =  new OtherHandler();
     hand->handle( other );
 }
-int Receiver::checkFile( const QString& file ) {
+void Receiver::tidyUp( QString& _file, const QString& ending) {
+    /* libversit fails on BASE64 encoding we try to sed it away */
+    QString file = _file;
+    char foo[24]; // big enough
+    (void)::strcpy(foo, "/tmp/opie-XXXXXX");
+
+    int fd = ::mkstemp(foo);
+
+    if ( fd == -1 )
+        return;
+
+    (void)::strncat( foo, ending.latin1(), 4 );
+    _file = QString::fromLatin1( foo );
+    QString cmd = QString("sed -e \"s/^\\(X-MICROSOFT-BODYINK\\)\\;/\\1:/;\" < %2 > %2 ").arg( Global::shellQuote(file)).arg( Global::shellQuote(_file) );
+    qWarning("Executing: %s", cmd.latin1() );
+    (void)::system( cmd.latin1() );
+
+    cmd = QString("rm %1").arg( Global::shellQuote(file) );
+    (void)::system( cmd.latin1() );
+}
+int Receiver::checkFile( QString& file ) {
     qWarning("check file!! %s", file.latin1() );
     int ret;
+    QString ending;
+
     if (file.right(4) == ".vcs" ) {
         ret = Datebook;
+        ending = QString::fromLatin1(".vcs");
     }else if ( file.right(4) == ".vcf") {
         ret = AddressBook;
+        ending = QString::fromLatin1(".vcf");
     }else
         ret = Other;
 
 
+    if (ending.isEmpty() )
+        return ret;
+
+    /**
+     * currently the parser is broken in regard of BASE64 encoding
+     * and M$ likes to send that. So we will executed a small
+     * tidy up system sed script
+     * At this point we can also remove umlaute from the filename
+     */
+    tidyUp( file, ending );
+
     qWarning("check it now %d", ret );
     return ret;
 }
 
+/* TRANSLATOR OpieObex::OtherHandler */
+
 OtherHandler::OtherHandler()
     : QVBox()
 {
@@ -133,6 +176,10 @@ void OtherHandler::deny() {
 }
 QString OtherHandler::targetName( const QString& file ) {
     QFileInfo info( file );
+
+    /* $HOME needs to be set!!!! */
+    Global::createDocDir();
+
     QString newFile = QPEApplication::documentDir()+ "/"+ info.baseName();
     QString newFileBase = newFile;
 
@@ -149,24 +196,8 @@ QString OtherHandler::targetName( const QString& file ) {
 /* fast cpy */
 void OtherHandler::copy(const QString& src, const QString& file) {
     qWarning("src %s, dest %s", src.latin1(),file.latin1() );
-    int src_fd = ::open( QFile::encodeName( src ), O_RDONLY );
-    int to_fd  = ::open( QFile::encodeName( file), O_RDWR| O_CREAT| O_TRUNC,
-                         S_IRUSR, S_IWUSR, S_IRGRP, S_IRGRP );
-
-    struct stat stater;
-    ::fstat(src_fd, &stater );
-    ::lseek(to_fd, stater.st_size-1, SEEK_SET );
-    ::write(to_fd, "", 1 );
-
-    void *src_addr, *dest_addr;
-    src_addr = ::mmap(0, stater.st_size, PROT_READ,
-                      MAP_FILE | MAP_SHARED, src_fd, 0 );
-    dest_addr= ::mmap(0, stater.st_size, PROT_READ | PROT_WRITE,
-                      MAP_FILE | MAP_PRIVATE, to_fd, 0 );
-
-    ::memcpy(dest_addr , src_addr, stater.st_size );
-    ::munmap(src_addr , stater.st_size );
-    ::munmap(dest_addr, stater.st_size );
-
+    QString cmd = QString("mv %1 %2").arg( Global::shellQuote( src )).
+                  arg( Global::shellQuote( file ) );
+    ::system( cmd.latin1() );
     // done
 }
diff --git a/core/obex/receiver.h b/core/obex/receiver.h
index 5b20146..e1d54df 100644
--- a/core/obex/receiver.h
+++ b/core/obex/receiver.h
@@ -21,9 +21,12 @@ namespace OpieObex {
         void handleAddr(const QString& );
         void handleDateTodo(const QString& );
         void handleOther(const QString& );
-        int checkFile( const QString& file );
+        /* will alter the file name */
+        int checkFile( QString& file );
         bool testDateTodo(const QString& file);
         bool testAddressbook(const QString& file);
+        /* called by checkFile */
+        void tidyUp( QString& file, const QString& ending );
 
     private slots:
         void slotReceived( const QString& );