Porting Opie to MacOS-X.

The base system and all platform independent applications and platforms
should work.
Please see $OPIEDIR/development/macosx for details

10 files changed, 240 insertions, 6 deletions

diff --git a/library/filemanager.cpp b/library/filemanager.cpp
index cc657fa..91986a0 100644
--- a/library/filemanager.cpp
+++ b/library/filemanager.cpp
@@ -28,13 +28,22 @@
 
 #include <errno.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <dirent.h>
+#ifdef Q_OS_MACX
+// MacOS X does not have sendfile.. :(
+// But maybe in the future.. !?
+#  ifdef SENDFILE
+#    include <sys/types.h>
+#    include <sys/socket.h>
+#  endif
+#else
 #include <sys/sendfile.h>
+#endif /* Q_OS_MACX */
 #include <fcntl.h>
 
 /*!
   \class FileManager
   \brief The FileManager class assists with AppLnk input/output.
 */
@@ -213,12 +222,14 @@ bool FileManager::copyFile( const AppLnk &src, const AppLnk &dest )
   QFile::remove( fn.latin1() );
     }
 
     return ok;
 }
 
+
+
 bool FileManager::copyFile( const QString & src, const QString & dest ) {
    bool success = true;
    struct stat status;
    int read_fd=0;
    int write_fd=0;
    struct stat stat_buf;
@@ -235,22 +246,54 @@ bool FileManager::copyFile( const QString & src, const QString & dest ) {
       if( !destFile.open( IO_WriteOnly|IO_Raw ) )
             return success = false;
       write_fd = destFile.handle(); 
       if(write_fd != -1) {
          int err=0;
          QString msg;
+#ifdef Q_OS_MACX
+#ifdef SENDMAIL
+	 /* FreeBSD does support a different kind of 
+	  * sendfile. (eilers)
+	  * I took this from Very Secure FTPd
+	  * Licence: GPL
+	  * Author: Chris Evans
+	  * sysdeputil.c
+	  */
+          /* XXX - start_pos will truncate on 32-bit machines - can we
+           * say "start from current pos"?
+           */
+          off_t written = 0;
+	  int retval = 0;
+          retval = sendfile(read_fd, write_fd, offset, stat_buf.st_size, NULL,
+                            &written, 0);
+          /* Translate to Linux-like retval */
+          if (written > 0)
+          {
+            err = (int) written;
+          }
+#else /* SENDMAIL */
+	  err == -1;
+	  msg = "FAILURE: Using unsupported function \"sendfile()\" Need Workaround !!";
+	  success = false;
+#         warning "Need workaround for sendfile!!(eilers)"
+#endif  /* SENDMAIL */
+
+#else
          err = sendfile(write_fd, read_fd, &offset, stat_buf.st_size);
          if( err == -1) {
             switch(err) {
             case EBADF : msg = "The input file was not opened for reading or the output file was not opened for writing. ";
             case EINVAL: msg = "Descriptor is not valid or locked. ";
             case ENOMEM: msg = "Insufficient memory to read from in_fd.";
             case EIO: msg = "Unspecified error while reading from in_fd.";
             };
             success = false;
          }
+#endif /* Q_OS_MACX */
+	  if( !success )
+		  qWarning( msg );
       } else {
          qWarning("open write failed %s, %s",src.latin1(), dest.latin1());
          success = false;
       }
    } else {
       qWarning("open read failed %s, %s",src.latin1(), dest.latin1());
diff --git a/library/fontdatabase.cpp b/library/fontdatabase.cpp
index c7a5211..2ad8e95 100644
--- a/library/fontdatabase.cpp
+++ b/library/fontdatabase.cpp
@@ -167,13 +167,17 @@ void FontDatabase::loadRenderers()
 	(*mit).library->unload();
 	delete (*mit).library;
     }
     factoryList->clear();
 
     QString path = QPEApplication::qpeDir() + "/plugins/fontfactories";
+#ifdef Q_OS_MACX
+    QDir dir( path, "lib*.dylib" );
+#else
     QDir dir( path, "lib*.so" );
+#endif
     
     if ( !dir.exists())
     	return;
     
     QStringList list = dir.entryList();
     QStringList::Iterator it;
diff --git a/library/global.cpp b/library/global.cpp
index 90954fe..05d23ac 100644
--- a/library/global.cpp
+++ b/library/global.cpp
@@ -601,13 +601,17 @@ void Global::invoke(const QString &c)
     // an attempt to show a wait...
     // more logic should be used, but this will be fine for the moment...
     QCopEnvelope ( "QPE/System", "busy()" );
 #endif
 
 #ifdef HAVE_QUICKEXEC
+#ifdef Q_OS_MACX
+    QString libexe = qpeDir()+"/binlib/lib"+args[0] + ".dylib";
+#else
     QString libexe = qpeDir()+"/binlib/lib"+args[0] + ".so";
+#endif
     qDebug("libfile = %s", libexe.latin1() );
     if ( QFile::exists( libexe ) ) {
 	qDebug("calling quickexec %s", libexe.latin1() );
 	quickexecv( libexe.utf8().data(), (const char **)args );
     } else
 #endif
diff --git a/library/library.pro b/library/library.pro
index ab1f451..5acfc0c 100644
--- a/library/library.pro
+++ b/library/library.pro
@@ -121,13 +121,13 @@ SOURCES	=   calendar.cpp \
 
 
 # Qt 3 compatibility
 HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h
 SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp
 INCLUDEPATH += $(OPIEDIR)/include backend
-LIBS		+= -ldl -lcrypt -lm
+# LIBS		+= -ldl -lcrypt -lm
 INTERFACES = passwordbase_p.ui categoryeditbase_p.ui findwidgetbase_p.ui lnkpropertiesbase_p.ui
 TARGET		= qpe
 DESTDIR		= $(OPIEDIR)/lib$(PROJMAK)
 VERSION		= 1.5.0.1
 
 TRANSLATIONS = ../i18n/de/libqpe.ts \
diff --git a/library/network.cpp b/library/network.cpp
index 3568809..991e11a 100644
--- a/library/network.cpp
+++ b/library/network.cpp
@@ -415,13 +415,17 @@ static QDict<NetworkInterface> *ifaces;
 NetworkInterface* Network::loadPlugin(const QString& type)
 {
 #ifndef QT_NO_COMPONENT
     if ( !ifaces ) ifaces = new QDict<NetworkInterface>;
     NetworkInterface *iface = ifaces->find(type);
     if ( !iface ) {
+#ifdef Q_OS_MACX
+	QString libfile = QPEApplication::qpeDir() + "/plugins/network/lib" + type + ".dylib";
+#else
 	QString libfile = QPEApplication::qpeDir() + "/plugins/network/lib" + type + ".so";
+#endif
 	QLibrary lib(libfile);
 	if ( !lib.queryInterface( IID_Network, (QUnknownInterface**)&iface ) == QS_OK )
 	    return 0;
 	ifaces->insert(type,iface);
 	QStringList langs = Global::languageList();
 	for (QStringList::ConstIterator it = langs.begin(); it!=langs.end(); ++it) {
diff --git a/library/qlibrary_unix.cpp b/library/qlibrary_unix.cpp
index 7740321..0229b7b 100644
--- a/library/qlibrary_unix.cpp
+++ b/library/qlibrary_unix.cpp
@@ -73,13 +73,124 @@ void* QLibraryPrivate::resolveSymbol( const char* symbol )
 #endif
 	return 0;
     }
     return address;
 }
 
-#else // Q_OS_HPUX
+#elif defined(_NULL_LIB_)
+
+bool QLibraryPrivate::loadLibrary()
+{
+	//qDebug("QLibraryPrivate::loadLibrary\n");
+	return FALSE;
+}
+bool QLibraryPrivate::freeLibrary()
+{
+	//qDebug("QLibraryPrivate::freeLibrary\n");
+	return FALSE;
+}
+void* QLibraryPrivate::resolveSymbol( const char* symbol )
+{
+	//qDebug("QLibraryPrivate::resolveSymbol\n");
+	return FALSE;
+}
+
+#elif defined(Q_OS_MACX)
+
+#define ENUM_DYLD_BOOL
+enum DYLD_BOOL {
+	DYLD_FALSE,
+	DYLD_TRUE
+};
+#include <mach-o/dyld.h>
+typedef struct {
+	NSObjectFileImage img;
+	NSModule mod;
+} DyldLibDesc;
+
+bool QLibraryPrivate::loadLibrary()
+{
+	// qDebug("QLibraryPrivate::loadLibrary\n");
+	// return FALSE;
+    if ( pHnd )
+	return TRUE;
+
+    QString filename = library->library();
+
+    NSObjectFileImage img = 0;
+    NSModule mod = 0;
+    NSObjectFileImageReturnCode ret = NSCreateObjectFileImageFromFile( filename.latin1() , &img );
+    if ( ret != NSObjectFileImageSuccess ) {
+		qWarning( "Error in NSCreateObjectFileImageFromFile(): %d; Filename: %s", ret, filename.latin1() );
+		if (ret == NSObjectFileImageAccess) {
+			qWarning ("(NSObjectFileImageAccess)" );
+		}
+	} else {
+		mod = NSLinkModule(img, filename.latin1(), NSLINKMODULE_OPTION_BINDNOW |
+				                                    NSLINKMODULE_OPTION_PRIVATE |
+													NSLINKMODULE_OPTION_RETURN_ON_ERROR);
+		if (mod == 0) {
+			qWarning( "Error in NSLinkModule()" );
+			NSDestroyObjectFileImage(img);
+		}
+	}
+	DyldLibDesc* desc = 0;
+	if (img != 0 && mod != 0) {
+		desc = new DyldLibDesc;
+		desc->img = img;
+		desc->mod = mod;
+	}
+	pHnd = desc;
+    return pHnd != 0;
+}
+
+bool QLibraryPrivate::freeLibrary()
+{
+	//qDebug("QLibraryPrivate::freeLibrary\n");
+	//return FALSE;
+    if ( !pHnd )
+	return TRUE;
+
+	DyldLibDesc* desc = (DyldLibDesc*) pHnd;
+	NSModule mod = desc->mod;
+	NSObjectFileImage img = desc->img;
+	DYLD_BOOL success = NSUnLinkModule(mod, NSUNLINKMODULE_OPTION_NONE);
+	if ( success ) {
+	NSDestroyObjectFileImage(img);
+	delete desc;
+	pHnd = 0;
+	}
+#if defined(QT_DEBUG) || defined(QT_DEBUG_COMPONENT)
+    else {
+	    qWarning( "Error in NSUnLinkModule(): %d", ret );
+    }
+#endif
+    return pHnd == 0;
+}
+
+void* QLibraryPrivate::resolveSymbol( const char* symbol )
+{
+	//qDebug("QLibraryPrivate::resolveSymbol\n");
+	//return FALSE;
+    if ( !pHnd )
+	return 0;
+
+	DyldLibDesc* desc = (DyldLibDesc*) pHnd;
+	NSSymbol sym = NSLookupSymbolInModule(desc->mod, symbol);
+	void* address = 0;
+	if (sym != 0) {
+		address = NSAddressOfSymbol(sym);
+	}
+#if defined(QT_DEBUG) || defined(QT_DEBUG_COMPONENT)
+    if ( address == 0 )
+	qWarning( "Cannot find symbol: %s", symbol );
+#endif
+    return address;
+}
+
+#else
 // Something else, assuming POSIX
 #include <dlfcn.h>
 
 bool QLibraryPrivate::loadLibrary()
 {
     if ( pHnd )
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index d4734ae..a97efc0 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -17,13 +17,15 @@
 ** not clear to you.
 **
 */
 #define QTOPIA_INTERNAL_LANGLIST
 #include <stdlib.h>
 #include <unistd.h>
+#ifndef Q_OS_MACX
 #include <linux/limits.h> // needed for some toolchains (PATH_MAX)
+#endif
 #include <qfile.h>
 #include <qqueue.h>
 #ifdef Q_WS_QWS
 #ifndef QT_NO_COP
 #if QT_VERSION <= 231
 #define private public
@@ -86,14 +88,15 @@
 #include "textcodecinterface.h"
 #include "imagecodecinterface.h"
 
 #include <unistd.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
+#ifndef QT_NO_SOUND
 #include <sys/soundcard.h>
-
+#endif
 #include "qt_override_p.h"
 
 
 class QPEApplicationData
 {
 public:
@@ -230,13 +233,17 @@ public:
 		}
 	}
 
 	void loadTextCodecs()
 	{
 		QString path = QPEApplication::qpeDir() + "/plugins/textcodecs";
+#ifdef Q_OS_MACX
+		QDir dir( path, "lib*.dylib" );
+#else
 		QDir dir( path, "lib*.so" );
+#endif
 		QStringList list;
 		if ( dir. exists ( ))
 		    list = dir.entryList();
 		QStringList::Iterator it;
 		for ( it = list.begin(); it != list.end(); ++it ) {
 			TextCodecInterface *iface = 0;
@@ -255,13 +262,17 @@ public:
 		}
 	}
 
 	void loadImageCodecs()
 	{
 		QString path = QPEApplication::qpeDir() + "/plugins/imagecodecs";
+#ifdef Q_OS_MACX
+		QDir dir( path, "lib*.dylib" );
+#else
 		QDir dir( path, "lib*.so" );
+#endif
 		QStringList list;
 		if ( dir. exists ( ))
 		    list = dir.entryList();
 		QStringList::Iterator it;
 		for ( it = list.begin(); it != list.end(); ++it ) {
 			ImageCodecInterface *iface = 0;
@@ -337,20 +348,22 @@ static void setVolume( int t = 0, int percent = -1 )
 	switch ( t ) {
 		case 0: {
 				Config cfg( "qpe" );
 				cfg.setGroup( "Volume" );
 				if ( percent < 0 )
 					percent = cfg.readNumEntry( "VolumePercent", 50 );
+#ifndef QT_NO_SOUND
 				int fd = 0;
 				if ( ( fd = open( "/dev/mixer", O_RDWR ) ) >= 0 ) {
 					int vol = muted ? 0 : percent;
 					// set both channels to same volume
 					vol |= vol << 8;
 					ioctl( fd, MIXER_WRITE( 0 ), &vol );
 					::close( fd );
 				}
+#endif
 			}
 			break;
 	}
 }
 
 static void setMic( int t = 0, int percent = -1 )
@@ -359,18 +372,20 @@ static void setMic( int t = 0, int percent = -1 )
 		case 0: {
 				Config cfg( "qpe" );
 				cfg.setGroup( "Volume" );
 				if ( percent < 0 )
 					percent = cfg.readNumEntry( "Mic", 50 );
 
+#ifndef QT_NO_SOUND
 				int fd = 0;
 				int mic = micMuted ? 0 : percent;
 				if ( ( fd = open( "/dev/mixer", O_RDWR ) ) >= 0 ) {
 					ioctl( fd, MIXER_WRITE( SOUND_MIXER_MIC ), &mic );
 					::close( fd );
 				}
+#endif
 			}
 			break;
 	}
 }
 
 
@@ -380,18 +395,20 @@ static void setBass( int t = 0, int percent = -1 )
 		case 0: {
 				Config cfg( "qpe" );
 				cfg.setGroup( "Volume" );
 				if ( percent < 0 )
 					percent = cfg.readNumEntry( "BassPercent", 50 );
 
+#ifndef QT_NO_SOUND
 				int fd = 0;
 				int bass = percent;
                                 if ( ( fd = open( "/dev/mixer", O_RDWR ) ) >= 0 ) {
 					ioctl( fd, MIXER_WRITE( SOUND_MIXER_BASS ), &bass );
 					::close( fd );
 				}
+#endif
 			}
 			break;
 	}
 }
 
 
@@ -401,18 +418,20 @@ static void setTreble( int t = 0, int percent = -1 )
 		case 0: {
 				Config cfg( "qpe" );
 				cfg.setGroup( "Volume" );
 				if ( percent < 0 )
 					percent = cfg.readNumEntry( "TreblePercent", 50 );
 
+#ifndef QT_NO_SOUND
 				int fd = 0;
 				int treble = percent;
 				if ( ( fd = open( "/dev/mixer", O_RDWR ) ) >= 0 ) {
 					ioctl( fd, MIXER_WRITE( SOUND_MIXER_TREBLE ), &treble );
 					::close( fd );
 				}
+#endif
 			}
 			break;
 	}
 }
 
 
@@ -1646,17 +1665,23 @@ void QPEApplication::internalSetStyle( const QString &style )
 #endif
 
 	else {
 		QStyle *sty = 0;
 		QString path = QPEApplication::qpeDir ( ) + "/plugins/styles/";
 
+#ifdef Q_OS_MACX
+		if ( style. find ( ".dylib" ) > 0 )
+			path += style;
+		else
+			path = path + "lib" + style. lower ( ) + ".dylib"; // compatibility
+#else
 		if ( style. find ( ".so" ) > 0 )
 			path += style;
 		else
 			path = path + "lib" + style. lower ( ) + ".so"; // compatibility
-
+#endif
 		static QLibrary *lastlib = 0;
 		static StyleInterface *lastiface = 0;
 
 		QLibrary *lib = new QLibrary ( path );
 		StyleInterface *iface = 0;
 
diff --git a/library/qpedecoration_qws.cpp b/library/qpedecoration_qws.cpp
index 933542d..bac1a75 100644
--- a/library/qpedecoration_qws.cpp
+++ b/library/qpedecoration_qws.cpp
@@ -509,17 +509,25 @@ void QPEDecoration::init ( const QString &plugin )
 	delete wdiface;
     }
 
     WindowDecorationInterface *iface = 0;
     QString path = QPEApplication::qpeDir() + "/plugins/decorations/";
 
+#ifdef Q_OS_MACX
+    if ( plugin.find( ".dylib" ) > 0 ) {
+#else
     if ( plugin.find( ".so" ) > 0 ) {
+#endif
         // full library name supplied
         path += plugin;
     } else {
+#ifdef Q_OS_MACX
+        path += "lib" + plugin.lower() + ".dylib"; // compatibility
+#else
         path += "lib" + plugin.lower() + ".so"; // compatibility
+#endif
     }
 
     QLibrary *lib = new QLibrary( path );
     if ( lib->queryInterface( IID_WindowDecoration, (QUnknownInterface**)&iface ) == QS_OK && iface ) {
 	wdiface = iface;
 	wdlib = lib;
diff --git a/library/sound.cpp b/library/sound.cpp
index c8704f9..5b67995 100644
--- a/library/sound.cpp
+++ b/library/sound.cpp
@@ -25,13 +25,16 @@
 #include <qsound.h>
 #include <qfile.h>
 
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
+
+#ifndef QT_NO_SOUND
 #include <sys/soundcard.h>
+#endif
 
 #include "config.h"
 #include <qmessagebox.h>
 #ifndef QT_NO_SOUND
 static int WAVsoundDuration(const QString& filename)
 {
diff --git a/library/storage.cpp b/library/storage.cpp
index dc5cc22..f8b75d0 100644
--- a/library/storage.cpp
+++ b/library/storage.cpp
@@ -31,20 +31,31 @@
 
 #if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
 #include <sys/vfs.h>
 #include <mntent.h>
 #endif
 
+#ifdef Q_OS_MACX
+#  include <sys/param.h>
+#  include <sys/ucred.h>
+#  include <sys/mount.h>
+#  include <stdio.h>  // For strerror()
+#  include <errno.h>
+#endif /* Q_OS_MACX */
+
 #include <qstringlist.h>
 
-#include <sys/vfs.h>
-#include <mntent.h>
+// Shouldn't be here ! (eilers)
+// #include <sys/vfs.h>
+// #include <mntent.h>
 
 
 static bool isCF(const QString& m)
 {
+
+#ifndef Q_OS_MACX
     FILE* f = fopen("/var/run/stab", "r");
     if (!f) f = fopen("/var/state/pcmcia/stab", "r");
     if (!f) f = fopen("/var/lib/pcmcia/stab", "r");
     if ( f ) {
         char line[1024];
         char devtype[80];
@@ -58,12 +69,13 @@ static bool isCF(const QString& m)
                       return TRUE;
                   }
               }
         }
         fclose(f);
     }
+#endif /* Q_OS_MACX */
     return FALSE;
 }
 
 /*! \class StorageInfo storage.h
   \brief The StorageInfo class describes the disks mounted on the file system.
 
@@ -203,24 +215,44 @@ void StorageInfo::update()
 #endif
 }
 
 bool deviceTab( const char *device) {
    QString name = device;
    bool hasDevice=false;
+
+#ifdef Q_OS_MACX
+	// Darwin (MacOS X)
+	struct statfs** mntbufp;
+	int count = 0;
+	if ( ( count = getmntinfo( mntbufp, MNT_WAIT ) ) == 0 ){
+		qWarning("deviceTab: Error in getmntinfo(): %s",strerror( errno ) );
+		hasDevice = false;
+	}
+	for( int i = 0; i < count; i++ ){
+		QString deviceName = mntbufp[i]->f_mntfromname;
+		qDebug(deviceName);
+		if( deviceName.left( name.length() ) == name )
+			hasDevice = true;
+	}
+#else
+   // Linux
    struct mntent *me;
     FILE *mntfp = setmntent( "/etc/mtab", "r" );
     if ( mntfp ) {
         while ( (me = getmntent( mntfp )) != 0 ) {
           QString deviceName = me->mnt_fsname;
 //          qDebug(deviceName);
             if( deviceName.left(name.length()) == name) {
                hasDevice = true;
             }
         }
     }
     endmntent( mntfp );
+#endif /* Q_OS_MACX */
+
+
     return hasDevice;
 }
 
 /*!
  * @fn static bool StorageInfo::hasCf()
  * @brief returns whether device has Cf mounted