From: Kevin M. Rosenberg Date: Tue, 9 Jan 2001 23:21:02 +0000 (+0000) Subject: r372: no message X-Git-Tag: debian-4.5.3-3~645 X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=commitdiff_plain;h=7cc12efbeb8ab0d09ccc03990c9ce73b2d40b4c8 r372: no message --- diff --git a/tools/ctsimtext.cpp b/tools/ctsimtext.cpp index 8989706..291cdc1 100644 --- a/tools/ctsimtext.cpp +++ b/tools/ctsimtext.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: ctsimtext.cpp,v 1.4 2001/01/09 22:31:47 kevin Exp $ +** $Id: ctsimtext.cpp,v 1.5 2001/01/09 23:21:02 kevin Exp $ ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License (version 2) as @@ -45,7 +45,7 @@ extern "C" { // If linked to ctsimtext, but executed as another name, eg pjrec, then program will use that // linked name as name of function. -static const char* const g_szIdStr = "$Id: ctsimtext.cpp,v 1.4 2001/01/09 22:31:47 kevin Exp $"; +static const char* const g_szIdStr = "$Id: ctsimtext.cpp,v 1.5 2001/01/09 23:21:02 kevin Exp $"; static const char* const s_szProgramName = "ctsimtext"; extern int if1_main (int argc, char* const argv[]); @@ -124,17 +124,28 @@ ctsimtext_main (int argc, char * argv[]) #else std::cout << szPrompt; std::string strInput; +#ifdef MSVC + std::getline (std::cin, strInput); +#else std::cin >> strInput; - std::cout << std::flush:; +#endif +#ifdef DEBUG + std::cout << "#" << strInput << "#\n"; +#endif + std::cout << std::flush; std::cout << "\n"; - char* pszInput = new char [strInput.length() + 1]; - strncpy (pszInput, strInput.c_str(), sizeof(pszInput)); + char* pszInput = new char [strlen(strInput.c_str()) + 1]; + strcpy (pszInput, strInput.c_str()); #endif if (strncasecmp (pszInput, "quit", 4) == 0) { delete pszInput; break; } convertStringToArgcv (pszInput, &argc, &argv); +#ifdef DEBUG + for (unsigned int i = 0; i < argc; i++) + std::cout << "Token " << i << ": " << argv[i] << "\n"; +#endif iReturn = processCommand (argc, argv); delete pszInput; }