-rw-r--r-- | library/global.cpp | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/library/global.cpp b/library/global.cpp index 2162e02..d6ba84f 100644 --- a/library/global.cpp +++ b/library/global.cpp | |||
@@ -600,36 +600,22 @@ void Global::invoke(const QString &c) | |||
600 | qDebug("libfile = %s", libexe.latin1() ); | 600 | qDebug("libfile = %s", libexe.latin1() ); |
601 | if ( QFile::exists( libexe ) ) { | 601 | if ( QFile::exists( libexe ) ) { |
602 | qDebug("calling quickexec %s", libexe.latin1() ); | 602 | qDebug("calling quickexec %s", libexe.latin1() ); |
603 | quickexecv( libexe.utf8().data(), (const char **)args ); | 603 | quickexecv( libexe.utf8().data(), (const char **)args ); |
604 | } else | 604 | } else |
605 | #endif | 605 | #endif |
606 | { | 606 | { |
607 | char *oldpre = ::getenv ( "LD_PRELOAD" ); | ||
608 | |||
609 | QString newpre = QPEApplication::qpeDir ( ) + "/lib/libpreload.so"; | ||
610 | if ( QFile::exists ( newpre )) { | ||
611 | if ( oldpre && oldpre [0] ) | ||
612 | newpre = newpre + ":" + oldpre; | ||
613 | ::setenv ( "LD_PRELOAD", newpre. latin1( ), 1 ); | ||
614 | qDebug ( "\nPRELOADING\n" ); | ||
615 | } | ||
616 | |||
617 | if ( !::vfork() ) { | 607 | if ( !::vfork() ) { |
618 | for ( int fd = 3; fd < 100; fd++ ) | 608 | for ( int fd = 3; fd < 100; fd++ ) |
619 | ::close( fd ); | 609 | ::close( fd ); |
620 | ::setpgid( ::getpid(), ::getppid() ); | 610 | ::setpgid( ::getpid(), ::getppid() ); |
621 | // Try bindir first, so that foo/bar works too | 611 | // Try bindir first, so that foo/bar works too |
622 | ::execv( qpeDir()+"/bin/"+args[0], (char * const *)args ); | 612 | ::execv( qpeDir()+"/bin/"+args[0], (char * const *)args ); |
623 | ::execvp( args[0], (char * const *)args ); | 613 | ::execvp( args[0], (char * const *)args ); |
624 | _exit( -1 ); | 614 | _exit( -1 ); |
625 | } | 615 | } |
626 | if ( oldpre ) | ||
627 | ::setenv ( "LD_PRELOAD", oldpre, 1 ); | ||
628 | else | ||
629 | ::unsetenv ( "LD_PRELOAD" ); | ||
630 | } | 616 | } |
631 | StartingAppList::add( list[0] ); | 617 | StartingAppList::add( list[0] ); |
632 | #endif //QT_NO_QWS_MULTIPROCESS | 618 | #endif //QT_NO_QWS_MULTIPROCESS |
633 | } | 619 | } |
634 | 620 | ||
635 | 621 | ||