From: Pekka Riikonen Date: Mon, 19 Nov 2001 10:26:54 +0000 (+0000) Subject: updates X-Git-Tag: silc.toolkit.0.7~23 X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=commitdiff_plain;h=26957468d15f29ee827642e38719903a24e39a92 updates --- diff --git a/lib/silccrypt/silcrng.c b/lib/silccrypt/silcrng.c index f68c1b80..051e222c 100644 --- a/lib/silccrypt/silcrng.c +++ b/lib/silccrypt/silcrng.c @@ -28,6 +28,7 @@ #include "silcincludes.h" +#ifndef WIN32 #ifdef HAVE_GETSID extern pid_t getsid (pid_t __pid); #endif @@ -35,6 +36,7 @@ extern pid_t getsid (pid_t __pid); #ifdef HAVE_GETPGID extern pid_t getpgid (pid_t __pid); #endif +#endif #undef SILC_RNG_DEBUG /*#define SILC_RNG_DEBUG*/ diff --git a/lib/silcsftp/sftp_util.c b/lib/silcsftp/sftp_util.c index eb4652ac..86cca1f9 100644 --- a/lib/silcsftp/sftp_util.c +++ b/lib/silcsftp/sftp_util.c @@ -435,7 +435,6 @@ SilcSFTPStatus silc_sftp_map_errno(int err) case ENOENT: case ENOTDIR: case EBADF: - case ELOOP: ret = SILC_SFTP_STATUS_NO_SUCH_FILE; break; case EPERM: diff --git a/lib/silcutil/win32/silcwin32net.c b/lib/silcutil/win32/silcwin32net.c index ed7818c5..fd8228ea 100644 --- a/lib/silcutil/win32/silcwin32net.c +++ b/lib/silcutil/win32/silcwin32net.c @@ -222,7 +222,7 @@ void silc_net_close_connection(int sock) /* Converts the IP number string from numbers-and-dots notation to binary form. */ -bool silc_net_addr2bin(const char *addr, void *bin, uint32 bin_len); +bool silc_net_addr2bin(const char *addr, void *bin, uint32 bin_len) { unsigned long ret; @@ -231,7 +231,7 @@ bool silc_net_addr2bin(const char *addr, void *bin, uint32 bin_len); if (bin_len < 4) return FALSE; - memcpy(bin, (unsigned char *)&tmp.s_addr, 4); + memcpy(bin, (unsigned char *)&ret, 4); return ret != INADDR_NONE; } diff --git a/win32/libsilc/libsilc.def b/win32/libsilc/libsilc.def index 44b20fb6..93d2ee41 100644 --- a/win32/libsilc/libsilc.def +++ b/win32/libsilc/libsilc.def @@ -605,7 +605,6 @@ EXPORTS silc_sftp_fs_memory_del_dir @ 820 ; silc_sftp_fs_memory_add_file @ 821 ; silc_sftp_fs_memory_del_file @ 822 ; - silc_net_addr2bin_ne @ 823 ; silc_file_open @ 824 ; silc_file_close @ 825 ; silc_file_read @ 826 ;