fix path stuff

git-svn-id: file:///raid/svn-personal/tewi/trunk@364 8739d7e6-ffea-ec47-b151-bdff447c6205

diff --git a/Common/dir.c b/Common/dir.c
index 77fef96d77f391096c4987d45c6e4635e34ef88e..b50c757c786af42862736f20ed08dfde582d2413 100644 (file)
--- a/Common/dir.c
+++ b/Common/dir.c
@@ -69,7 +69,8 @@ char** cm_scandir(const char* path) {
 
        return r;
 #else
-       DIR* dir = opendir(path);
+       char* fxpath = cm_strcat(path, "/");
+       DIR* dir = opendir(fxpath);
        if(dir != NULL) {
                char** r = malloc(sizeof(*r));
                struct dirent* d;
@@ -108,9 +109,11 @@ char** cm_scandir(const char* path) {
                free(old);
 
                closedir(dir);
+               free(fxpath);
 
                return r;
        } else {
+               free(fxpath);
                return NULL;
        }
 #endif

diff --git a/Server/server.c b/Server/server.c
index 72930904b07568af6648abdc4ea3f40573a1db23..8194936ff7029265ab992e569eb8d82d51cbd953 100644 (file)
--- a/Server/server.c
+++ b/Server/server.c
@@ -973,6 +973,7 @@ cleanup:
        close_socket(sock);
 #if defined(__MINGW32__) || defined(_MSC_VER) || defined(__BORLANDC__) || defined(__WATCOMC__)
 #ifdef __NETWARE__
+       ExitThread(EXIT_THREAD, 0);
 #elif defined(__DOS__)
 #else
        _endthread();