Fix line endings

[flightgear.git] / src / Main / fg_io.cxx

diff --git a/src/Main/fg_io.cxx b/src/Main/fg_io.cxx
index ab6f34b2ccb68ad98b4c4edbba4fff4dd1cfb946..6ac044ff9380e33f4f101b07b8e3da7e24885650 100644 (file)
--- a/src/Main/fg_io.cxx
+++ b/src/Main/fg_io.cxx
@@ -2,7 +2,7 @@
 //
 // Written by Curtis Olson, started November 1999.
 //
-// Copyright (C) 1999  Curtis L. Olson - curt@flightgear.org
+// Copyright (C) 1999  Curtis L. Olson - http://www.flightgear.org/~curt
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -20,6 +20,9 @@
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
 #include <simgear/compiler.h>
 
@@ -38,7 +41,7 @@
 #include <simgear/misc/strutils.hxx>
 
 #include <Network/protocol.hxx>
-#include <Network/atc610x.hxx>
+#include <Network/ATC-Main.hxx>
 #include <Network/atlas.hxx>
 #include <Network/garmin.hxx>
 #include <Network/httpd.hxx>
@@ -58,10 +61,7 @@
 #include <Network/ray.hxx>
 #include <Network/rul.hxx>
 #include <Network/generic.hxx>
-
-#ifdef FG_MPLAYER_AS
 #include <Network/multiplay.hxx>
-#endif
 
 #include "globals.hxx"
 #include "fg_io.hxx"
@@ -107,12 +107,13 @@ FGIO::parse_port_config( const string& config )
     try
     {
        if ( protocol == "atcsim" ) {
-            FGATC610x *atcsim = new FGATC610x;
+            FGATCMain *atcsim = new FGATCMain;
            atcsim->set_hz( 30 );
             if ( tokens.size() != 6 ) {
                 SG_LOG( SG_IO, SG_ALERT, "Usage: --atcsim=[no-]pedals,"
                         << "input0_config,input1_config,"
-                        << "output0_config,output1_config" );
+                        << "output0_config,output1_config,file.nas" );
+                return NULL;
             }
             if ( tokens[1] == "no-pedals" ) {
                 fgSetBool( "/input/atcsim/ignore-pedal-controls", true );
@@ -181,8 +182,6 @@ FGIO::parse_port_config( const string& config )
             else if (tokens[1] == "file") n--;
             FGGeneric *generic = new FGGeneric( tokens[n] );
             io = generic;
-
-#ifdef FG_MPLAYER_AS
        } else if ( protocol == "multiplay" ) {\
            //Determine dir, rate, host & port
            string dir = tokens[1];
@@ -190,8 +189,6 @@ FGIO::parse_port_config( const string& config )
            string host = tokens[3];
            string port = tokens[4];
            return new FGMultiplay(dir, atoi(rate.c_str()), host, atoi(port.c_str()));
-#endif
-
        } else {
            return NULL;
        }
@@ -202,7 +199,11 @@ FGIO::parse_port_config( const string& config )
        delete io;
        return 0;
     }
-
+    
+    if (tokens.size() < 3) {
+      SG_LOG( SG_IO, SG_ALERT, "Incompatible number of network arguments.");
+      return NULL;
+    }
     string medium = tokens[1];
     SG_LOG( SG_IO, SG_INFO, "  medium = " << medium );
 
@@ -216,6 +217,10 @@ FGIO::parse_port_config( const string& config )
     SG_LOG( SG_IO, SG_INFO, "  hertz = " << hertz );
 
     if ( medium == "serial" ) {
+        if ( tokens.size() < 5) {
+          SG_LOG( SG_IO, SG_ALERT, "Incompatible number of arguments for serial communications.");
+         return NULL;
+        }
        // device name
        string device = tokens[4];
        SG_LOG( SG_IO, SG_INFO, "  device = " << device );
@@ -228,13 +233,22 @@ FGIO::parse_port_config( const string& config )
        io->set_io_channel( ch );
     } else if ( medium == "file" ) {
        // file name
+        if ( tokens.size() < 4) {
+          SG_LOG( SG_IO, SG_ALERT, "Incompatible number of arguments for file I/O.");
+         return NULL;
+        }
+         
        string file = tokens[4];
        SG_LOG( SG_IO, SG_INFO, "  file name = " << file );
 
        SGFile *ch = new SGFile( file );
        io->set_io_channel( ch );
     } else if ( medium == "socket" ) {
-       string hostname = tokens[4];
+        if ( tokens.size() < 6) {
+          SG_LOG( SG_IO, SG_ALERT, "Incompatible number of arguments for socket communications.");
+         return NULL;
+        }
+       string hostname = tokens[4];
        string port = tokens[5];
        string style = tokens[6];
 
@@ -319,7 +333,7 @@ void
 FGIO::shutdown_all() {
     FGProtocol *p;
 
-    // cout << "processing I/O channels" << endl;
+    // cout << "shutting down all I/O channels" << endl;
 
     typedef vector< FGProtocol* > container;
     container::iterator i = io_channels.begin();