From: John Hodge (sonata) <tpg@mutabah.net>
Date: Tue, 11 Mar 2014 00:02:08 +0000 (+0800)
Subject: Usermode/libposix - Fix types in select, minor in crypt
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;ds=sidebyside;h=a4c5446b23df108289ea71df2b63a7e26ab19375;p=tpg%2Facess2.git

Usermode/libposix - Fix types in select, minor in crypt
---

diff --git a/Usermode/Libraries/libposix.so_src/unistd.c b/Usermode/Libraries/libposix.so_src/unistd.c
index f5b330da..a2f4eb7f 100644
--- a/Usermode/Libraries/libposix.so_src/unistd.c
+++ b/Usermode/Libraries/libposix.so_src/unistd.c
@@ -191,7 +191,7 @@ int kill(pid_t pid, int signal)
 
 int select(int nfd, fd_set *rfd, fd_set *wfd, fd_set *efd, struct timeval *timeout)
 {
-	long long int	ltimeout = 0, *ltimeoutp = NULL;
+	int64_t	ltimeout = 0, *ltimeoutp = NULL;
 	if( timeout )
 	{
 		ltimeout = timeout->tv_sec*1000 + timeout->tv_usec / 1000;
diff --git a/Usermode/Libraries/libposix.so_src/unistd_crypt.c b/Usermode/Libraries/libposix.so_src/unistd_crypt.c
index a5eebfa2..ba58a520 100644
--- a/Usermode/Libraries/libposix.so_src/unistd_crypt.c
+++ b/Usermode/Libraries/libposix.so_src/unistd_crypt.c
@@ -10,5 +10,12 @@
 // === CODE ===
 char *crypt(const char *key, const char *salt)
 {
+	if( *salt == '$' )
+	{
+		// $x$salt$
+		// x=1 : MD5
+		// x=5 : SHA-256
+		// x=6 : SHA-512
+	}
 	return "YIH14pBTDJvJ6";	// 'password' with the salt YI
 }