--- a/genericopenlibs/openenvcore/backend/bwins/backendu.def Mon Mar 15 12:46:24 2010 +0200
+++ b/genericopenlibs/openenvcore/backend/bwins/backendu.def Thu Apr 01 00:15:09 2010 +0300
@@ -169,3 +169,5 @@
_sigenable_r @ 168 NONAME
_memcpy_r @ 169 NONAME
_memmove_r @ 170 NONAME
+ _lstat_r @ 171 NONAME
+
--- a/genericopenlibs/openenvcore/backend/bwins/backendwolibrtu.def Mon Mar 15 12:46:24 2010 +0200
+++ b/genericopenlibs/openenvcore/backend/bwins/backendwolibrtu.def Thu Apr 01 00:15:09 2010 +0300
@@ -169,3 +169,5 @@
_sigenable_r @ 168 NONAME
_memcpy_r @ 169 NONAME
_memmove_r @ 170 NONAME
+ _lstat_r @ 171 NONAME
+
--- a/genericopenlibs/openenvcore/backend/bwins/old_backendu.def Mon Mar 15 12:46:24 2010 +0200
+++ b/genericopenlibs/openenvcore/backend/bwins/old_backendu.def Thu Apr 01 00:15:09 2010 +0300
@@ -169,3 +169,5 @@
_sigenable_r @ 168 NONAME ABSENT
_memcpy_r @ 169 NONAME
_memmove_r @ 170 NONAME
+ _lstat_r @ 171 NONAME
+
--- a/genericopenlibs/openenvcore/backend/eabi/backendu.def Mon Mar 15 12:46:24 2010 +0200
+++ b/genericopenlibs/openenvcore/backend/eabi/backendu.def Thu Apr 01 00:15:09 2010 +0300
@@ -173,3 +173,5 @@
_sigenable_r @ 172 NONAME
_memcpy_r @ 173 NONAME
_memmove_r @ 174 NONAME
+ _lstat_r @ 175 NONAME
+
--- a/genericopenlibs/openenvcore/backend/eabi/backendwolibrtu.def Mon Mar 15 12:46:24 2010 +0200
+++ b/genericopenlibs/openenvcore/backend/eabi/backendwolibrtu.def Thu Apr 01 00:15:09 2010 +0300
@@ -173,4 +173,5 @@
_sigenable_r @ 172 NONAME
_memcpy_r @ 173 NONAME
_memmove_r @ 174 NONAME
+ _lstat_r @ 175 NONAME
--- a/genericopenlibs/openenvcore/backend/eabi/old_backendu.def Mon Mar 15 12:46:24 2010 +0200
+++ b/genericopenlibs/openenvcore/backend/eabi/old_backendu.def Thu Apr 01 00:15:09 2010 +0300
@@ -173,4 +173,5 @@
_sigenable_r @ 172 NONAME ABSENT
_memcpy_r @ 173 NONAME
_memmove_r @ 174 NONAME
+ _lstat_r @ 175 NONAME
--- a/genericopenlibs/openenvcore/backend/inc/sysif.h Mon Mar 15 12:46:24 2010 +0200
+++ b/genericopenlibs/openenvcore/backend/inc/sysif.h Thu Apr 01 00:15:09 2010 +0300
@@ -327,7 +327,7 @@
static int rmdir(RFs& aFs, const wchar_t* path, int& anErrno);
static int chmod(RFs& aFs, const wchar_t* path, int perms, int& anErrno);
static int reg_unlink(RFs& aFs, const wchar_t* path, int& anErrno);
- static int stat(RFs& aFs, const wchar_t* name, struct stat* st, int& anErrno);
+ static int statbackend(RFs& aFs, const wchar_t* name, struct stat* st, int& anErrno);
static int rename(RFs& aFs, const wchar_t* oldname, const wchar_t* newname, int& anErrno);
static TInt ResolvePath(TParse& aResult, const wchar_t* path, TDes* aFilename);
static TInt SetDefaultDir(RFs& aFs);
@@ -425,6 +425,7 @@
int rmdir (const wchar_t* path, int& anErrno);
int chmod (const wchar_t* path, int perms, int& anErrno);
int stat (const wchar_t* name, struct stat* st, int& anErrno);
+ int lstat (const wchar_t* name, struct stat *st, int& anErrno);
int rename (const wchar_t* oldname, const wchar_t* newname, int& anErrno);
IMPORT_C TInt ResolvePath (TParse& aResult, const wchar_t* path, TDes* aFilename);
--- a/genericopenlibs/openenvcore/backend/inc/sysreent.h Mon Mar 15 12:46:24 2010 +0200
+++ b/genericopenlibs/openenvcore/backend/inc/sysreent.h Thu Apr 01 00:15:09 2010 +0300
@@ -106,6 +106,7 @@
IMPORT_C int _rmdir_r (int *, const wchar_t *);
IMPORT_C int _wrmdir_r (int *, const wchar_t *);
IMPORT_C int _stat_r (int *, const wchar_t *, struct stat *);
+IMPORT_C int _lstat_r (int *, const wchar_t *, struct stat *);
IMPORT_C int _wstat_r (int *, const wchar_t *, struct stat *);
IMPORT_C int _unlink_r (int *, const wchar_t *);
IMPORT_C int _wunlink_r (int *, const wchar_t *);
--- a/genericopenlibs/openenvcore/backend/src/corebackend/fdesc.cpp Mon Mar 15 12:46:24 2010 +0200
+++ b/genericopenlibs/openenvcore/backend/src/corebackend/fdesc.cpp Thu Apr 01 00:15:09 2010 +0300
@@ -117,15 +117,21 @@
else //It's a special file, directory or normal file
{
RFs& rfs = Backend()->FileSession();
- TSpecialFileType fileType = _SystemSpecialFileBasedFilePath(name, err, rfs);
- if(fileType == EFileTypeMkFifo) //special file, FIFO
- {
- ret = CFileTable::FifoOpen(name, mode, perms, err);
- }
- else if(fileType == EFileTypeSymLink) //special file, symlink
- {
- ret = CFileTable::LinkOpen(name, mode, perms, err, rfs);
- }
+ TUint attribval;
+ TPtrC16 filename1 = (const TText16*)name;
+ int ret1 = rfs.Att(filename1, attribval);
+ if (ret1 == 0 && ((attribval & (KEntryAttHidden | KEntryAttSystem))== (KEntryAttHidden | KEntryAttSystem)))
+ {
+ TSpecialFileType fileType = _SystemSpecialFileBasedFilePath(name, err, rfs);
+ if(fileType == EFileTypeMkFifo) //special file, FIFO
+ {
+ ret = CFileTable::FifoOpen(name, mode, perms, err);
+ }
+ else if(fileType == EFileTypeSymLink) //special file, symlink
+ {
+ ret = CFileTable::LinkOpen(name, mode, perms, err, rfs);
+ }
+ }
else //normal file or directory
{
TFullName fullName;
@@ -634,14 +640,14 @@
int mapped=MapMode(mode, fMode);
// if the file is in \sys, use EFileShareReadersOnly not EFileShareReadersOrWriters
TParsePtrC pars(aName);
- if (pars.Path().FindC(_L("\\SYS\\")) == 0)
+ if (pars.Path().FindF(_L("\\SYS\\")) == 0)
{
fMode &= ~EFileShareReadersOrWriters;
fMode |= EFileShareReadersOnly;
}
// if the file is in \resource, dont use EFileShareReadersOrWriters
- if (pars.Path().FindC(_L("\\resource\\")) == 0)
+ if (pars.Path().FindF(_L("\\resource\\")) == 0)
{
fMode &= ~EFileShareReadersOrWriters;
fMode |= EFileShareReadersOnly;
--- a/genericopenlibs/openenvcore/backend/src/corebackend/localif.cpp Mon Mar 15 12:46:24 2010 +0200
+++ b/genericopenlibs/openenvcore/backend/src/corebackend/localif.cpp Thu Apr 01 00:15:09 2010 +0300
@@ -31,6 +31,8 @@
#include "fdesc.h"
#include "ltime.h"
#include "lposix.h"
+#include "systemspecialfilercg.h"
+#include "link.h"
#ifdef SYMBIAN_OE_POSIX_SIGNALS
#include <stdlib.h>
#include <signal.h>
@@ -296,9 +298,12 @@
void CLocalSystemInterface::Exit(int code)
{
#ifdef SYMBIAN_OE_POSIX_SIGNALS
+ TRequestStatus status = KRequestPending;
+ iSignalHandlerThread.Logon(status);
iSignalLoopRunning = EFalse;
+ iSignalHandlerThread.RequestSignal();
+ User::WaitForRequest(status);
#endif
-
iFids.Close();
User::SetCritical(User::EProcessPermanent);
User::Exit(code);
@@ -327,9 +332,39 @@
}
int CLocalSystemInterface::stat (const wchar_t* name, struct stat *st, int& anErrno)
- {
- return PosixFilesystem::stat(iFs, name, st, anErrno);
- }
+ {
+ const wchar_t* filename = name;
+ TSpecialFileType fileType;
+ struct SLinkInfo enBuf;
+ TInt err = 0;
+ // Check the type of file
+ fileType = _SystemSpecialFileBasedFilePath(name, err, iFs);
+ // If it is a symbolic link, follow the link
+ // If _SystemSpecialFileBasedFilePath fails, treat it as normal file
+ // and try to proceed
+ if( fileType == EFileTypeSymLink && err == KErrNone )
+ {
+ err = _ReadSysSplFile(name, (char*)&enBuf, sizeof(struct SLinkInfo), anErrno, iFs);
+ if (err == KErrNone)
+ {
+ filename = (wchar_t*)enBuf.iParentPath;
+ }
+ else
+ {
+ return -1;
+ }
+ }
+ else if ( fileType != EFileGeneralError && err != KErrNone )
+ {
+ return MapError(err,anErrno);
+ }
+ return PosixFilesystem::statbackend(iFs, filename, st, anErrno);
+ }
+
+int CLocalSystemInterface::lstat (const wchar_t* name, struct stat *st, int& anErrno)
+ {
+ return PosixFilesystem::statbackend(iFs, name, st, anErrno);
+ }
int CLocalSystemInterface::utime (const wchar_t* name, const struct utimbuf *filetimes, int& anErrno)
{
@@ -540,7 +575,10 @@
iSignalInitSemaphore.Signal();
return lRetVal;
}
-
+
+ /* Closing the end of the pipe that's been sent to the server */
+ iSignalWritePipe.Close();
+
iSignalsInitialized = ETrue;
iSignalInitSemaphore.Signal();
iSignalLoopRunning = ETrue;
@@ -549,6 +587,9 @@
while(iSignalLoopRunning)
{
User::WaitForAnyRequest();
+ if(iSignalLoopRunning == false) {
+ break;
+ }
// Check if it is a pipe read
if(iPipeReadStatus != KRequestPending)
{
@@ -707,6 +748,8 @@
{
iSignalReadPipe.CancelDataAvailable();
}
+ iSignalReadPipe.Close();
+
if(iAlarmStatus == KRequestPending)
{
iAlarmTimer.Cancel();
@@ -720,10 +763,11 @@
if(lProcess.Open(TProcessId(iChildWaiterArray[lCounterIdx].iWaiterPid)) == KErrNone)
{
lProcess.LogonCancel(iChildWaiterArray[lCounterIdx].iWaiterStatus);
+ lProcess.Close();
}
}
- }
-
+ }
+ iSignalSession.Close();
return KErrNone;
}
--- a/genericopenlibs/openenvcore/backend/src/corebackend/posixfs.cpp Mon Mar 15 12:46:24 2010 +0200
+++ b/genericopenlibs/openenvcore/backend/src/corebackend/posixfs.cpp Thu Apr 01 00:15:09 2010 +0300
@@ -268,7 +268,7 @@
return MapError(err,anErrno);
}
-int PosixFilesystem::stat (RFs& aFs, const wchar_t* name, struct stat *st, int& anErrno)
+int PosixFilesystem::statbackend (RFs& aFs, const wchar_t* name, struct stat *st, int& anErrno)
{
TFullName fullName;
TInt err=0;
@@ -323,8 +323,9 @@
#endif /* SYMBIAN_OE_LARGE_FILE_SUPPORT && !SYMBIAN_OE_NO_LFS */
st->st_dev = st->st_rdev = (dev_t)TDriveUnit(fullName);
- if( !(entry.iAtt & (KEntryAttHidden | KEntryAttSystem)) || (entry.iAtt & KEntryAttDir))
- {
+ if( ( (entry.iAtt & (KEntryAttHidden | KEntryAttSystem)) != (KEntryAttHidden | KEntryAttSystem) )
+ || (entry.iAtt & KEntryAttDir))
+ {
CFileDesc::MapStat(*st, entry.iModified, entry.iAtt);
}
else
--- a/genericopenlibs/openenvcore/backend/src/signalserver/server/signalserver.cpp Mon Mar 15 12:46:24 2010 +0200
+++ b/genericopenlibs/openenvcore/backend/src/signalserver/server/signalserver.cpp Thu Apr 01 00:15:09 2010 +0300
@@ -158,6 +158,7 @@
RProcess lProcHdl;
if(lProcHdl.Open(lPid) != KErrNone)
{
+ iProcessHdlList[lIdx].mPipe.Close();
iProcessHdlList.Remove(lIdx);
}
else
@@ -261,6 +262,9 @@
aMessage.Complete(KErrGeneral);
}
aMessage.Complete(KErrNone);
+
+ lProcess.Close();
+ lClientThread.Close();
break;
default:
aMessage.Complete(KErrNotSupported);
--- a/genericopenlibs/openenvcore/backend/src/syscall/handlefms.cpp Mon Mar 15 12:46:24 2010 +0200
+++ b/genericopenlibs/openenvcore/backend/src/syscall/handlefms.cpp Thu Apr 01 00:15:09 2010 +0300
@@ -167,6 +167,13 @@
return Backend()->stat(name, st, *aErrno);
}
+/* A reentrant version of lstat().
+*/
+EXPORT_C int _lstat_r (int *aErrno, const wchar_t *name, struct stat *st)
+ {
+ return Backend()->lstat(name, st, *aErrno);
+ }
+
EXPORT_C int _utime_r (int *aErrno, const wchar_t *name,const struct utimbuf *filetimes)
{
return Backend()->utime(name, filetimes, *aErrno);
--- a/genericopenlibs/openenvcore/include/sys/cdefs.h Mon Mar 15 12:46:24 2010 +0200
+++ b/genericopenlibs/openenvcore/include/sys/cdefs.h Thu Apr 01 00:15:09 2010 +0300
@@ -338,9 +338,7 @@
(__offsetof__ (type,field))
#endif
#else
-#define __offsetof(type, field) (reinterpret_cast <size_t> \
- (&reinterpret_cast <const volatile char &> \
- (static_cast<type *> (0)->field)))
+#define __offsetof(type, field) ((size_t)(&((type *)0)->field))
#endif
#endif
--- a/genericopenlibs/openenvcore/libc/src/link.cpp Mon Mar 15 12:46:24 2010 +0200
+++ b/genericopenlibs/openenvcore/libc/src/link.cpp Thu Apr 01 00:15:09 2010 +0300
@@ -179,9 +179,20 @@
EXPORT_C int lstat(const char *file_name, struct stat *buf)
{
- return stat(file_name, buf);
+ if(!buf)
+ {
+ errno = EFAULT ;
+ return -1 ;
+ }
+
+ wchar_t tmpbuf[MAXPATHLEN+1];
+ if ((size_t)-1 != mbstowcs(tmpbuf, file_name, MAXPATHLEN))
+ {
+ return _lstat_r(&errno, tmpbuf, buf);
+ }
+ errno = EILSEQ;
+ return -1;
}
-
EXPORT_C int __xstat(int /*vers*/, const char *file, struct stat *buf)
{
return stat(file, buf);
@@ -189,7 +200,7 @@
EXPORT_C int __lxstat (int /*version*/, const char *file, struct stat *buf)
{
- return stat(file, buf);
+ return lstat(file, buf);
}
--- a/genericservices/s60compatibilityheaders/sensors/proximity/bld.inf Mon Mar 15 12:46:24 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-//#include <domain/osextensions/platform_paths.hrh>
-
-#include "../../group/common.inf"
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-./sensrvproximitysensor.h OSEXT_LAYER_SDK_EXPORT_PATH(sensrvproximitysensor.h)
-
-./prxssy.iby S60_CORE_OSEXT_LAYER_IBY_EXPORT_PATH(prxssy.iby)
--- a/genericservices/s60compatibilityheaders/sensors/proximity/prxssy.iby Mon Mar 15 12:46:24 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// sensorserver.iby
-//
-//
-
-#include <prxssy.iby>
--- a/genericservices/s60compatibilityheaders/sensors/proximity/sensrvproximitysensor.h Mon Mar 15 12:46:24 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// sensrvchannel.h
-//
-//
-
-// stub header file - use Symbian supplied version instead
-#include <sensors/channels/sensrvproximitysensor.h>
-
-// End of File
\ No newline at end of file
--- a/genericservices/s60compatibilityheaders/sensors/sensorframework/bld.inf Mon Mar 15 12:46:24 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-#include "../../group/common.inf"
-
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-./sensrvconditionevaluator.h S60_DOMAIN_OSEXT_ROOT(sensrvconditionevaluator.h)
-./sensrvconditionevaluator.inl S60_DOMAIN_OSEXT_ROOT(sensrvconditionevaluator.inl)
-./sensrvresource.hrh S60_DOMAIN_OSEXT_ROOT(sensrvresource.hrh)
-./ssychanneldataprovider.h S60_DOMAIN_OSEXT_ROOT(ssychanneldataprovider.h)
-./ssypropertyprovider.h S60_DOMAIN_OSEXT_ROOT(ssypropertyprovider.h)
-./ssycallback.h S60_DOMAIN_OSEXT_ROOT(ssycallback.h)
-./ssycontrol.h S60_DOMAIN_OSEXT_ROOT(ssycontrol.h)
-./ssycontrol.inl S60_DOMAIN_OSEXT_ROOT(ssycontrol.inl)
-
-./sensrvchannel.h S60_OSEXT_ROOT(sensrvchannel.h)
-./sensrvchannelcondition.h S60_OSEXT_ROOT(sensrvchannelcondition.h)
-./sensrvchannelconditionlistener.h S60_OSEXT_ROOT(sensrvchannelconditionlistener.h)
-./sensrvchannelconditionset.h S60_OSEXT_ROOT(sensrvchannelconditionset.h)
-./sensrvchannelfinder.h S60_OSEXT_ROOT(sensrvchannelfinder.h)
-./sensrvchannelinfo.h S60_OSEXT_ROOT(sensrvchannelinfo.h)
-./sensrvchannellistener.h S60_OSEXT_ROOT(sensrvchannellistener.h)
-./sensrvdatalistener.h S60_OSEXT_ROOT(sensrvdatalistener.h)
-./sensrvgeneralproperties.h S60_OSEXT_ROOT(sensrvgeneralproperties.h)
-./sensrvproperty.h S60_OSEXT_ROOT(sensrvproperty.h)
-./sensrvpropertylistener.h S60_OSEXT_ROOT(sensrvpropertylistener.h)
-./sensrvtypes.h S60_OSEXT_ROOT(sensrvtypes.h)
-
-./sensorserver.iby S60_CORE_OSEXT_LAYER_IBY_EXPORT_PATH(sensorserver.iby)
-
-
--- a/genericservices/s60compatibilityheaders/sensors/sensorframework/sensorserver.iby Mon Mar 15 12:46:24 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-#include <sensorframework.iby>
--- a/genericservices/s60compatibilityheaders/sensors/sensorframework/sensrvchannel.h Mon Mar 15 12:46:24 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-// stub header file - use Symbian supplied version instead
-#include <sensors/sensrvchannel.h>
-
-// End of File
\ No newline at end of file
--- a/genericservices/s60compatibilityheaders/sensors/sensorframework/sensrvchannelcondition.h Mon Mar 15 12:46:24 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-// stub header file - use Symbian supplied version instead
-#include <sensors/sensrvchannelcondition.h>
-
-// End of File
\ No newline at end of file
--- a/genericservices/s60compatibilityheaders/sensors/sensorframework/sensrvchannelconditionlistener.h Mon Mar 15 12:46:24 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-// stub header file - use Symbian supplied version instead
-#include <sensors/sensrvchannelconditionlistener.h>
-
-// End of File
\ No newline at end of file
--- a/genericservices/s60compatibilityheaders/sensors/sensorframework/sensrvchannelconditionset.h Mon Mar 15 12:46:24 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-// stub header file - use Symbian supplied version instead
-#include <sensors/sensrvchannelconditionset.h>
-
-// End of File
\ No newline at end of file
--- a/genericservices/s60compatibilityheaders/sensors/sensorframework/sensrvchannelfinder.h Mon Mar 15 12:46:24 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-// stub header file - use Symbian supplied version instead
-#include <sensors/sensrvchannelfinder.h>
-
-// End of File
\ No newline at end of file
--- a/genericservices/s60compatibilityheaders/sensors/sensorframework/sensrvchannelinfo.h Mon Mar 15 12:46:24 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-// stub header file - use Symbian supplied version instead
-#include <sensors/sensrvchannelinfo.h>
-
-// End of File
\ No newline at end of file
--- a/genericservices/s60compatibilityheaders/sensors/sensorframework/sensrvchannellistener.h Mon Mar 15 12:46:24 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-// stub header file - use Symbian supplied version instead
-#include <sensors/sensrvchannellistener.h>
-
-// End of File
--- a/genericservices/s60compatibilityheaders/sensors/sensorframework/sensrvconditionevaluator.h Mon Mar 15 12:46:24 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-// stub header file - use Symbian supplied version instead
-#include <sensors/spi/sensrvconditionevaluator.h>
-
-// End of File
--- a/genericservices/s60compatibilityheaders/sensors/sensorframework/sensrvconditionevaluator.inl Mon Mar 15 12:46:24 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-// stub header file - use Symbian supplied version instead
-#include <sensors/spi/sensrvconditionevaluator.inl>
-
-// End of File
--- a/genericservices/s60compatibilityheaders/sensors/sensorframework/sensrvdatalistener.h Mon Mar 15 12:46:24 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-// stub header file - use Symbian supplied version instead
-#include <sensors/sensrvdatalistener.h>
-
-// End of File
\ No newline at end of file
--- a/genericservices/s60compatibilityheaders/sensors/sensorframework/sensrvgeneralproperties.h Mon Mar 15 12:46:24 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-// stub header file - use Symbian supplied version instead
-#include <sensors/sensrvgeneralproperties.h>
-
-// End of File
\ No newline at end of file
--- a/genericservices/s60compatibilityheaders/sensors/sensorframework/sensrvproperty.h Mon Mar 15 12:46:24 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-// stub header file - use Symbian supplied version instead
-#include <sensors/sensrvproperty.h>
-
-// End of File
\ No newline at end of file
--- a/genericservices/s60compatibilityheaders/sensors/sensorframework/sensrvpropertylistener.h Mon Mar 15 12:46:24 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-// stub header file - use Symbian supplied version instead
-#include <sensors/sensrvpropertylistener.h>
-
-// End of File
\ No newline at end of file
--- a/genericservices/s60compatibilityheaders/sensors/sensorframework/sensrvresource.hrh Mon Mar 15 12:46:24 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-// stub header file - use Symbian supplied version instead
-#include <sensors/spi/sensrvresource.hrh>
-
-// End of File
--- a/genericservices/s60compatibilityheaders/sensors/sensorframework/sensrvtypes.h Mon Mar 15 12:46:24 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-// stub header file - use Symbian supplied version instead
-#include <sensors/sensrvtypes.h>
-
-// End of File
\ No newline at end of file
--- a/genericservices/s60compatibilityheaders/sensors/sensorframework/ssycallback.h Mon Mar 15 12:46:24 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-// stub header file - use Symbian supplied version instead
-#include <sensors/spi/ssycallback.h>
-
-// End of File
--- a/genericservices/s60compatibilityheaders/sensors/sensorframework/ssychanneldataprovider.h Mon Mar 15 12:46:24 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-// stub header file - use Symbian supplied version instead
-#include <sensors/spi/ssychanneldataprovider.h>
-
-// End of File
--- a/genericservices/s60compatibilityheaders/sensors/sensorframework/ssycontrol.h Mon Mar 15 12:46:24 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-// stub header file - use Symbian supplied version instead
-#include <sensors/spi/ssycontrol.h>
-
-// End of File
--- a/genericservices/s60compatibilityheaders/sensors/sensorframework/ssycontrol.inl Mon Mar 15 12:46:24 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-// stub header file - use Symbian supplied version instead
-#include <sensors/spi/ssycontrol.inl>
-
-// End of File
--- a/genericservices/s60compatibilityheaders/sensors/sensorframework/ssypropertyprovider.h Mon Mar 15 12:46:24 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-// stub header file - use Symbian supplied version instead
-#include <sensors/spi/ssypropertyprovider.h>
-
-// End of File
--- a/group/bld.inf Mon Mar 15 12:46:24 2010 +0200
+++ b/group/bld.inf Thu Apr 01 00:15:09 2010 +0300
@@ -63,5 +63,10 @@
// exporting openc_liblogger stub sis
../stdlibs/install/openc_liblogger_stub.sis /epoc32/data/z/system/install/openc_liblogger_stub.sis
+// exporting openc_signalserver_stub sis
+../stdlibs/install/openc_signalserver_stub.sis /epoc32/data/z/system/install/openc_signalserver_stub.sis
+
+
// End of File
+
--- a/stdlibs/install/openc_liblogger_stub.pkg Mon Mar 15 12:46:24 2010 +0200
+++ b/stdlibs/install/openc_liblogger_stub.pkg Thu Apr 01 00:15:09 2010 +0300
@@ -17,7 +17,7 @@
&EN
;Header
-#{"Open C LIBLOGGER"},(0x200110CD),1,7,0, TYPE=SA
+#{"Open C LIBLOGGER"},(0x200110CD),1,7,4
;Localised Vendor name
%{"Nokia"}
Binary file stdlibs/install/openc_liblogger_stub.sis has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/stdlibs/install/openc_signalserver_stub.pkg Thu Apr 01 00:15:09 2010 +0300
@@ -0,0 +1,25 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description: package file for standard libraries
+;
+;
+&EN
+
+#{"Signal Server"}, (0x2002372A), 1, 7, 4
+%{"Nokia"}
+:"Nokia"
+
+[0x1028315F],0, 0, 0 ,{"S60Product5thEdition "}
+
+""-"z:\sys\bin\signalserver.exe", FF
Binary file stdlibs/install/openc_signalserver_stub.sis has changed
Binary file stdlibs/install/openc_stdlibs_stub.pkg has changed
Binary file stdlibs/install/openc_stdlibs_stub.sis has changed