*** empty log message ***

[user/henk/code/inspircd.git] / src / inspircd.cpp

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index e5d46300862266bf974c8fe229853f502c48df44..4e6e0f86c9631b2519aef412e9c3556d5c345933 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -2440,17 +2440,25 @@ bool UnloadModule(const char* filename)
 bool LoadModule(const char* filename)
 {
        char modfile[MAXBUF];
+#ifdef STATIC_LINK
+       snprintf(modfile,MAXBUF,"%s",filename);
+#else
        snprintf(modfile,MAXBUF,"%s/%s",ModPath,filename);
+#endif
        std::string filename_str = filename;
+#ifndef STATIC_LINK
        if (!DirValid(modfile))
        {
                log(DEFAULT,"Module %s is not within the modules directory.",modfile);
                snprintf(MODERR,MAXBUF,"Module %s is not within the modules directory.",modfile);
                return false;
        }
+#endif
        log(DEBUG,"Loading module: %s",modfile);
+#ifndef STATIC_LINK
         if (FileExists(modfile))
         {
+#endif
                for (int j = 0; j < module_names.size(); j++)
                {
                        if (module_names[j] == filename_str)
@@ -2483,6 +2491,7 @@ bool LoadModule(const char* filename)
                        snprintf(MODERR,MAXBUF,"Factory function failed!");
                        return false;
                 }
+#ifndef STATIC_LINK
         }
         else
         {
@@ -2490,6 +2499,7 @@ bool LoadModule(const char* filename)
                snprintf(MODERR,MAXBUF,"Module file could not be found");
                return false;
         }
+#endif
        MODCOUNT++;
        return true;
 }
@@ -2836,11 +2846,7 @@ int InspIRCd(char** argv, int argc)
                }
                tvs.tv_usec = 30000L;
                tvs.tv_sec = 0;
-#ifdef IS_SOLARIS
-               int servresult = select(1024, &serverfds, NULL, NULL, &tvs);
-#else
-               int servresult = select(32767, &serverfds, NULL, NULL, &tvs);
-#endif
+               int servresult = select(FD_SETSIZE, &serverfds, NULL, NULL, &tvs);
                if (servresult > 0)
                {
                        for (int x = 0; x != SERVERportCount; x++)
@@ -3100,12 +3106,7 @@ int InspIRCd(char** argv, int argc)
 #ifdef USE_SELECT
                        tval.tv_sec = 0;
                        tval.tv_usec = 1000L;
-#ifdef IS_SOLARIS
-                       selectResult2 = select(1024, &sfd, NULL, NULL, &tval);
-#else
-                       selectResult2 = select(65535, &sfd, NULL, NULL, &tval);
-#endif
-                       
+                       selectResult2 = select(FD_SETSIZE, &sfd, NULL, NULL, &tval);
                        // now loop through all of the items in this pool if any are waiting
                        if ((selectResult2 > 0) && (xcount != clientlist.end()))
                        for (user_hash::iterator count2a = xcount; count2a != endingiter; count2a++)