Fix the problems GreenReaper found with the windows select engine, this has never...

[user/henk/code/inspircd.git] / win / configure.cpp

diff --git a/win/configure.cpp b/win/configure.cpp
index 1df1eba673506c6b2de91203c515b8cab7883126..94d1b898c8b91c3bab6cf228c70fc0b3f707fbf7 100644 (file)
--- a/win/configure.cpp
+++ b/win/configure.cpp
@@ -125,23 +125,20 @@ int get_svn_revision(char * buffer, size_t len)
        7033
        */
        char buf[1000];
+       int rev = 0;
+       
        FILE * f = fopen("..\\.svn\\entries", "r");
-       if(!f) goto bad_rev;
+       if (f)
+       {
+               for (int q = 0; q < 4; ++q)
+                       fgets(buf, 1000, f);
+
+               rev = atoi(buf);
+               sprintf(buffer, "%u", rev);
+               fclose(f);
+       }
        
-       if(!fgets(buf, 1000, f)) goto bad_rev;
-       if(!fgets(buf, 1000, f)) goto bad_rev;
-       if(!fgets(buf, 1000, f)) goto bad_rev;
-       if(!fgets(buf, 1000, f)) goto bad_rev;
-       int rev = atoi(buf);
-       if(rev == 0) goto bad_rev;
-       sprintf(buffer, "%u", rev);
-       fclose(f);
        return rev;
-       
-bad_rev:
-       strcpy(buffer, "non-svn");
-       if(f) fclose(f);
-       return 0;
 }
 
 int __stdcall WinMain(IN HINSTANCE hInstance, IN HINSTANCE hPrevInstance, IN LPSTR lpCmdLine, IN int nShowCmd )
@@ -325,20 +322,20 @@ void Run()
        printf_c("\n\033[1;32mPre-build configuration is complete!\n\n");       sc(TNORMAL);
 
        // dump all the options back out
-       printf_c("\033[0mBase install path:\033[1;32m           %s\n", base_path);
-       printf_c("\033[0mConfig path:\033[1;32m                   %s\n", config_file);
-       printf_c("\033[0mModule path:\033[1;32m                   %s\n", mod_path);
-       printf_c("\033[0mLibrary path:\033[1;32m                         %s\n", library_dir);
-       printf_c("\033[0mSocket Engine:\033[1;32m                       %s\n", use_iocp ? "iocp" : "select");
-       printf_c("\033[0mMax nickname length:\033[1;32m   %u\n", nicklen);
-       printf_c("\033[0mMax channel length:\033[1;32m     %u\n", chanlen);
-       printf_c("\033[0mMax mode length:\033[1;32m               %u\n", modechanges);
-       printf_c("\033[0mMax ident length:\033[1;32m             %u\n", identlen);
-       printf_c("\033[0mMax quit length:\033[1;32m               %u\n", quitlen);
-       printf_c("\033[0mMax topic length:\033[1;32m             %u\n", topiclen);
-       printf_c("\033[0mMax kick length:\033[1;32m               %u\n", kicklen);
-       printf_c("\033[0mMax name length:\033[1;32m               %u\n", rllen);
-       printf_c("\033[0mMax away length:\033[1;32m               %u\n", awaylen);
+       printf_c("\033[0mBase install path:\033[1;32m        %s\n", base_path);
+       printf_c("\033[0mConfig path:\033[1;32m              %s\n", config_file);
+       printf_c("\033[0mModule path:\033[1;32m              %s\n", mod_path);
+       printf_c("\033[0mLibrary path:\033[1;32m             %s\n", library_dir);
+       printf_c("\033[0mSocket Engine:\033[1;32m            %s\n", use_iocp ? "iocp" : "select");
+       printf_c("\033[0mMax nickname length:\033[1;32m      %u\n", nicklen);
+       printf_c("\033[0mMax channel length:\033[1;32m       %u\n", chanlen);
+       printf_c("\033[0mMax mode length:\033[1;32m          %u\n", modechanges);
+       printf_c("\033[0mMax ident length:\033[1;32m         %u\n", identlen);
+       printf_c("\033[0mMax quit length:\033[1;32m          %u\n", quitlen);
+       printf_c("\033[0mMax topic length:\033[1;32m         %u\n", topiclen);
+       printf_c("\033[0mMax kick length:\033[1;32m          %u\n", kicklen);
+       printf_c("\033[0mMax name length:\033[1;32m          %u\n", rllen);
+       printf_c("\033[0mMax away length:\033[1;32m          %u\n", awaylen);
        printf("\n"); sc(TNORMAL);
        if(get_bool_option("Are these settings correct?", true) == false)
        {