1. Fix compilation error on line 308: missing type name.

2. Fix popen bug -- thanks to John Iverson.
3. Remove bogus ^M characters inserted by the Windows editor Daniel was using.

diff --git a/backend.c b/backend.c
index 8ea75c8..a23803c 100644 (file)
--- a/backend.c
+++ b/backend.c
@@ -212,10 +212,10 @@ void ParseFeatures P((char* args, ChessProgramState *cps));
 void InitBackEnd3 P((void));
 void FeatureDone P((ChessProgramState* cps, int val));
 void InitChessProgram P((ChessProgramState *cps));
-\r
-#ifdef WIN32\r
-       extern void ConsoleCreate();\r
-#endif\r
+
+#ifdef WIN32
+       extern void ConsoleCreate();
+#endif
 extern int tinyLayout, smallLayout;
 static ChessProgramStats programStats;
 
@@ -305,7 +305,7 @@ Boolean alarmSounded;
 /* end premove variables */
 
 char *ics_prefix = "$";
-ics_type = ICS_GENERIC;\r
+int ics_type = ICS_GENERIC;
 
 int currentMove = 0, forwardMostMove = 0, backwardMostMove = 0;
 int pauseExamForwardMostMove = 0;
@@ -692,12 +692,12 @@ InitBackEnd3 P((void))
     char buf[MSG_SIZ];
     int err;
 
-    InitChessProgram(&first);\r
-\r
-    #ifdef WIN32\r
-               /* Make a console window if needed */\r
-               if (appData.icsActive) ConsoleCreate();\r
-       #endif\r
+    InitChessProgram(&first);
+
+    #ifdef WIN32
+               /* Make a console window if needed */
+               if (appData.icsActive) ConsoleCreate();
+       #endif
 
     if (appData.icsActive) {
        err = establish();
@@ -1466,11 +1466,11 @@ read_from_ics(isr, closure, data, count, error)
     int i, oldi;
     int buf_len;
     int next_out;
-    int tkind;\r
-#ifdef WIN32\r
-       /* For zippy color lines of winboard\r
-        * cleanup for gcc compiler */\r
-       int backup;\r
+    int tkind;
+#ifdef WIN32
+       /* For zippy color lines of winboard
+        * cleanup for gcc compiler */
+       int backup;
 #endif
     char *p;
 
@@ -1728,20 +1728,20 @@ read_from_ics(isr, closure, data, count, error)
 
            oldi = i;
            if (appData.zippyTalk || appData.zippyPlay) {
-#if ZIPPY\r
-       #ifdef WIN32\r
-               /* Backup address for color zippy lines */\r
-               backup = i;\r
-               if (loggedOn == TRUE)\r
-                       if (ZippyControl(buf, &backup) || ZippyConverse(buf, &backup) ||\r
-                               (appData.zippyPlay && ZippyMatch(buf, &backup)));\r
+#if ZIPPY
+       #ifdef WIN32
+               /* Backup address for color zippy lines */
+               backup = i;
+               if (loggedOn == TRUE)
+                       if (ZippyControl(buf, &backup) || ZippyConverse(buf, &backup) ||
+                               (appData.zippyPlay && ZippyMatch(buf, &backup)));
                #else
                if (ZippyControl(buf, &i) ||
                    ZippyConverse(buf, &i) ||
                    (appData.zippyPlay && ZippyMatch(buf, &i))) {
                    loggedOn = TRUE;
                    continue;
-               }\r
+               }
        #endif
 #endif
            }
@@ -6975,7 +6975,7 @@ MailMoveEvent()
        || (nCmailMovesRegistered + nCmailResults == nCmailGames)) {
        sprintf(string, partCommandString,
                appData.debugMode ? " -v" : "", appData.cmailGameName);
-       commandOutput = popen(string, "rb");
+       commandOutput = popen(string, "r");
 
        if (commandOutput == NULL) {
            DisplayError(_("Failed to invoke cmail"), 0);