X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FSettings.cc;h=584643023892b89c2dec9bf373dcb160f9b3b2a1;hp=5e19ed599ee511b0abef7306fa9fade271135fd2;hb=4107dd30ca1a4c7d1a5cd6c0999b9afb5adff779;hpb=987971a961454d97082c6448fdc0bbeb540281bb

diff --git a/src/Moof/Settings.cc b/src/Moof/Settings.cc
index 5e19ed5..5846430 100644
--- a/src/Moof/Settings.cc
+++ b/src/Moof/Settings.cc
@@ -1,30 +1,13 @@
 
-/*******************************************************************************
-
- Copyright (c) 2009, Charles McGarvey
- All rights reserved.
- 
- Redistribution   and   use  in  source  and  binary  forms,  with  or  without
- modification, are permitted provided that the following conditions are met:
- 
-   * Redistributions  of  source  code  must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-   * Redistributions  in binary form must reproduce the above copyright notice,
-     this  list of conditions and the following disclaimer in the documentation
-     and/or other materials provided with the distribution.
- 
- THIS  SOFTWARE  IS  PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND  ANY  EXPRESS  OR  IMPLIED  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED.  IN  NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR  ANY  DIRECT,  INDIRECT,  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES  (INCLUDING,  BUT  NOT  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES;  LOSS  OF  USE,  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED  AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
+/*]  Copyright (c) 2009-2010, Charles McGarvey  [**************************
+**]  All rights reserved.
+*
+* vi:ts=4 sw=4 tw=75
+*
+* Distributable under the terms and conditions of the 2-clause BSD license;
+* see the file COPYING for a complete text of the license.
+*
+**************************************************************************/
 
 #include <cstdlib>		// getenv
 
@@ -39,18 +22,19 @@ Settings::~Settings()
 	save();
 }
 
-//Settings& Settings::getInstance()
-//{
-	//static Settings settings;
-	//return settings;
-//}
-
 
 void Settings::parseArgs(int argc, char* argv[])
 {
 	for (int i = 1; i < argc; ++i)
 	{
-		mScript.doString(argv[i]);
+		if (mScript.doString(argv[i]) != Script::SUCCESS)
+		{
+			std::string str;
+			mScript[-1].get(str);
+			logWarning << "invalid option: " << argv[i]
+					   << ": " << str << std::endl;
+			mScript.clearStack();
+		}
 	}
 }
 
@@ -68,7 +52,7 @@ void Settings::loadFromFiles(const std::vector<std::string>& path)
 	std::vector<std::string> copy(path);
 	std::vector<std::string>::iterator it;
 
-#if defined(_WIN32) || defined(__WIN32__)
+#if defined(_WIN32)
 	char* homeDrive = getenv("HOMEDRIVE");
 	char* homePath = getenv("HOMEPATH");
 	std::string home(homeDrive ? homeDrive : "");
@@ -95,7 +79,7 @@ void Settings::loadFromFiles(const std::vector<std::string>& path)
 			std::string str;
 			mScript[-1].get(str);
 			logWarning(str);
-			mScript.clear();
+			mScript.clearStack();
 		}
 	}
 }
@@ -115,13 +99,9 @@ void Settings::saveAs(const std::string& path)
 
 void Settings::save() const
 {
+	// TODO saving settings not yet implemented
 }
 
 
-Settings settings;
-
-
 } // namepsace Mf
 
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-