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 e443127244c10bd6b81d2d3fae1a89ce0175dec9..94d1b898c8b91c3bab6cf228c70fc0b3f707fbf7 100644 (file)
--- a/win/configure.cpp
+++ b/win/configure.cpp
@@ -1,12 +1,12 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*        +------------------------------------+
+ *        | Inspire Internet Relay Chat Daemon |
+ *        +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *                     the file COPYING for details.
  *
  * ---------------------------------------------------
  */
@@ -84,7 +84,7 @@ bool escape_string(char * str, size_t size)
 {
        size_t len = strlen(str);
        char * d_str = (char*)malloc(len * 2);
-    
+       
        size_t i = 0;
        size_t j = 0;
 
@@ -103,7 +103,7 @@ bool escape_string(char * str, size_t size)
 
        d_str[j++] = 0;
 
-    if(j > size)
+       if(j > size)
        {
                free(d_str);
                return false;
@@ -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(!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;
+       if (f)
+       {
+               for (int q = 0; q < 4; ++q)
+                       fgets(buf, 1000, f);
+
+               rev = atoi(buf);
+               sprintf(buffer, "%u", rev);
+               fclose(f);
+       }
        
-bad_rev:
-       strcpy(buffer, "non-svn");
-       if(f) fclose(f);
-       return 0;
+       return rev;
 }
 
 int __stdcall WinMain(IN HINSTANCE hInstance, IN HINSTANCE hPrevInstance, IN LPSTR lpCmdLine, IN int nShowCmd )
@@ -173,8 +170,8 @@ void Banner()
 {
        printf_c("\nWelcome to the \033[1mInspIRCd\033[0m Configuration program! (\033[1minteractive mode\033[0m)\n"
                         "\033[1mPackage maintainers: Type ./configure --help for non-interactive help\033[0m\n\n");
-       printf_c("*** If you are unsure of any of these values, leave it blank for    ***\n"
-                        "*** standard settings that will work, and your server will run      ***\n"
+       printf_c("*** If you are unsure of any of these values, leave it blank for      ***\n"
+                        "*** standard settings that will work, and your server will run          ***\n"
                         "*** using them. Please consult your IRC network admin if in doubt.  ***\n\n"
                         "Press \033[1m<RETURN>\033[0m to accept the default for any option, or enter\n"
                         "a new value. Please note: You will \033[1mHAVE\033[0m to read the docs\n"
@@ -239,7 +236,7 @@ void Run()
        if(iswinxp())
        {
                printf_c("You are running Windows 2000 or above, and IOCP support is most likely available.\n"
-                            "Thisis much more efficent but is currently EXPERIMENTAL and UNSUPPORTED.\n"
+                                "Thisis much more efficent but is currently EXPERIMENTAL and UNSUPPORTED.\n"
                                 "If you are unsure, answer no.\n\n");
 
                use_iocp = get_bool_option("Do you want to use the IOCP implementation?", false);
@@ -431,12 +428,12 @@ void WriteCompileCommands()
                {
                        strcpy(commands[command_count], fd.cFileName);
                        commands[command_count][strlen(fd.cFileName) - 4] = 0;
-                       printf("    %s\n", commands[command_count]);
+                       printf("        %s\n", commands[command_count]);
                        ++command_count;
                } while(FindNextFile(fh, &fd));
                sc(TNORMAL);
        }
-    
+       
        // Write our spiffy new makefile :D
        // I am such a lazy fucker :P
        FILE * f = fopen("..\\src\\commands\\commands.mak", "w");