From 0850a1d4bcbf2b311229d9fc807d9717a577e4df Mon Sep 17 00:00:00 2001 From: Pekka Riikonen Date: Sun, 13 May 2007 15:31:59 +0000 Subject: [PATCH] Added Symbian support. --- lib/silccrypt/silcrng.c | 6 ++++++ lib/silcsftp/sftp_fs_memory.c | 10 +++++++--- lib/silcutil/silctime.h | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/lib/silccrypt/silcrng.c b/lib/silccrypt/silcrng.c index 224e33a2..668a64ea 100644 --- a/lib/silccrypt/silcrng.c +++ b/lib/silccrypt/silcrng.c @@ -243,14 +243,17 @@ static void silc_rng_get_soft_noise(SilcRng rng) silc_rng_xor(rng, getpgid(getpid()) << 8, 2); silc_rng_xor(rng, getpgid(getpid()) << 8, 3); #endif +#ifdef HAVE_GETGID silc_rng_xor(rng, getgid(), 4); #endif +#endif #ifdef HAVE_GETPGRP silc_rng_xor(rng, getpgrp(), 5); #endif #ifdef HAVE_GETSID silc_rng_xor(rng, getsid(getpid()) << 16, 6); #endif +#ifndef SILC_SYMBIAN silc_rng_xor(rng, times(&ptime), 7); silc_rng_xor(rng, ptime.tms_utime, 8); silc_rng_xor(rng, (ptime.tms_utime + ptime.tms_stime), pos++); @@ -262,6 +265,7 @@ static void silc_rng_get_soft_noise(SilcRng rng) silc_rng_xor(rng, (ptime.tms_stime ^ ptime.tms_cutime), pos++); silc_rng_xor(rng, (ptime.tms_cutime + ptime.tms_stime), pos++); silc_rng_xor(rng, (ptime.tms_stime << 8), pos++); +#endif /* SILC_SYMBIAN */ #endif silc_rng_xor(rng, clock() << 4, pos++); #ifndef SILC_WIN32 @@ -274,8 +278,10 @@ static void silc_rng_get_soft_noise(SilcRng rng) #ifdef HAVE_SETSID silc_rng_xor(rng, getsid(getpid()) << 16, pos++); #endif +#ifndef SILC_SYMBIAN silc_rng_xor(rng, times(&ptime), pos++); silc_rng_xor(rng, ptime.tms_utime, pos++); +#endif /* SILC_SYMBIAN */ #ifdef HAVE_GETPGRP silc_rng_xor(rng, getpgrp(), pos++); #endif diff --git a/lib/silcsftp/sftp_fs_memory.c b/lib/silcsftp/sftp_fs_memory.c index 18cce4d0..3c2ededf 100644 --- a/lib/silcsftp/sftp_fs_memory.c +++ b/lib/silcsftp/sftp_fs_memory.c @@ -948,11 +948,15 @@ void mem_lstat(void *context, SilcSFTP sftp, } /* Get real stat */ -#ifndef SILC_WIN32 +#ifdef SILC_WIN32 + ret = stat(entry->data + 7, &stats); +#endif /* SILC_WIN32 */ +#ifdef SILC_UNIX ret = lstat(entry->data + 7, &stats); -#else +#endif /* SILC_UNIX */ +#ifdef SILC_SYMBIAN ret = stat(entry->data + 7, &stats); -#endif +#endif /* SILC_SYMBIAN */ if (ret == -1) { (*callback)(sftp, silc_sftp_map_errno(errno), NULL, callback_context); return; diff --git a/lib/silcutil/silctime.h b/lib/silcutil/silctime.h index 03cdb556..64eb3719 100644 --- a/lib/silcutil/silctime.h +++ b/lib/silcutil/silctime.h @@ -311,7 +311,7 @@ void silc_usleep(long microseconds) Sleep(microseconds / 1000); #endif /* SILC_WIN32 */ #ifdef SILC_SYMBIAN - User::After(microseconds / 1000); + silc_symbian_usleep(microseconds); #endif /* SILC_SYMBIAN */ } -- 2.24.0