Changeset 499 for AE/Installer/trunk/source

Timestamp:

Mar 3, 2010, 3:09:02 AM (15 years ago)

Author:

iritscen

Message:

I don't fully understand the CR/LF bug, but this fixes it *shrug*.

Location:

AE/Installer/trunk/source

Files:

• installer.cpp (modified) (2 diffs)
• installer.h (modified) (1 diff)

AE/Installer/trunk/source/installer.cpp

@@ -940 +940 @@
         while (getline(*fileHandler, line))
         {
+                StripNewlines(&line);
                 tokenize(line, tokens);
                 iter = tokens.begin();
@@ -1471 +1472 @@
 }
 
+/* StripNewlines() gets rids of any linebreaks that come from text returned by getline(); \
+|  getline() should be stripping those out, but Windows CR/LF files seem to be sneaking   |
+\  some extra return characters into strings in the ReadInstallInfoCfg() function.               */
+void StripNewlines(string *theLine)
+{
+        int deleteFromHere = 0;
+        deleteFromHere = theLine->find("\r");
+        if (deleteFromHere > 0)
+                theLine->erase(deleteFromHere, theLine->size());
+}
+
 void clearOldDats(void) {
         directory_iterator end_iter_gdf;

AE/Installer/trunk/source/installer.h

@@ -59 +59 @@
 bool SortBySize(string, string);
 void tokenize(const string&, vector<string>&, const string& delimiters = " ");
+void StripNewlines(string *);
 void clearOldDats(void);
 void writeInstalledMods( vector<string> );