tGScanner under Win32 + GLib2 does appear to work properly with files now, so the dodgy workaround code is removed. - vaccinewars - be a doctor and try to vaccinate the world
 (HTM) git clone git://src.adamsgaard.dk/vaccinewars
 (DIR) Log
 (DIR) Files
 (DIR) Refs
 (DIR) README
 (DIR) LICENSE
       ---
 (DIR) commit 311dcdb73a679592df474f50244c595464999368
 (DIR) parent 5840ac9f9788cc197aa9ddc02411d03bc96906ab
 (HTM) Author: Ben Webb <ben@salilab.org>
       Date:   Mon, 26 Aug 2002 12:18:29 +0000
       
       GScanner under Win32 + GLib2 does appear to work properly with files now,
       so the dodgy workaround code is removed.
       
       
       Diffstat:
         M src/dopewars.c                      |      18 +-----------------
       
       1 file changed, 1 insertion(+), 17 deletions(-)
       ---
 (DIR) diff --git a/src/dopewars.c b/src/dopewars.c
       t@@ -1801,17 +1801,13 @@ void ScannerErrorHandler(GScanner *scanner, gchar *msg, gint error)
        }
        
        /* 
       - * Read a configuration file given by "FileName"; GScanner under Win32
       - * doesn't work properly with files, so we use a nasty workaround.
       + * Read a configuration file given by "FileName"
         */
        static gboolean ReadConfigFile(char *FileName, gchar **encoding)
        {
          FILE *fp;
          Converter *conv;
        
       -#ifdef CYGWIN
       -  char *buf;
       -#endif
          GScanner *scanner;
        
          fp = fopen(FileName, "r");
       t@@ -1823,16 +1819,7 @@ static gboolean ReadConfigFile(char *FileName, gchar **encoding)
            scanner = g_scanner_new(&ScannerConfig);
            scanner->input_name = FileName;
            scanner->msg_handler = ScannerErrorHandler;
       -#ifdef CYGWIN
       -    read_string(fp, &buf);
       -    if (!buf) {
       -      fclose(fp);
       -      return TRUE;
       -    }
       -    g_scanner_input_text(scanner, buf, strlen(buf));
       -#else
            g_scanner_input_file(scanner, fileno(fp));
       -#endif
            while (!g_scanner_eof(scanner)) {
              if (!ParseNextConfig(scanner, conv, encoding, FALSE)) {
                ConfigErrors++;
       t@@ -1844,9 +1831,6 @@ static gboolean ReadConfigFile(char *FileName, gchar **encoding)
            g_scanner_destroy(scanner);
            Conv_Free(conv);
            fclose(fp);
       -#ifdef CYGWIN
       -    g_free(buf);
       -#endif
            return TRUE;
          } else {
            return FALSE;