Changeset 1539 for trunk/gsinstaller/gsManifest.cpp

Timestamp:

2000-09-12T13:36:44+12:00 (24 years ago)

Author:

sjboddie

Message:

Got compiling on VC++ 4.2

File:

• trunk/gsinstaller/gsManifest.cpp (modified) (6 diffs)

trunk/gsinstaller/gsManifest.cpp

@@ -8 +8 @@
 gsManifest::gsManifest(installManager &manager)
   : installAgent(manager)
-{   // do nothing!
+{   
+  // do nothing!
 }
 
 gsManifest::gsManifest(installManager &manager, FilePath &root)
   : installAgent(manager), fileCopyMonitor()
-{   this->getManifest(root);
-    this->expandGroups();
+{   
+  this->getManifest(root);
+  this->expandGroups();
 }
 
 bool gsManifest::getManifest(FilePath &root)
-{ FilePath *manifestPath = new FilePath((char *) root.cString(), "manifest.cfg");
-    FILE *    file;
-  DWORD         fileSize;
-  string        currentgroup;
-  char *        buffer;
-  char *        line;
-  char *        eol;
-
-    // open file handle for read access
+{
+  FilePath *manifestPath = new FilePath((char *) root.cString(), "manifest.cfg");
+  FILE *file;
+  DWORD fileSize;
+  string currentgroup;
+  char *buffer;
+  char *line;
+  char *eol;
+
+  // open file handle for read access
   file = fopen(manifestPath->cString(), "rb");
-    if (file == NULL)
-  { return false;
-  }
+  if (file == NULL)
+    {
+      return false;
+    }
 
   // get size of file
   File f(manifestPath->cString());
-  fileSize  = f.getFileSize();
+  fileSize = f.getFileSize();
 
   // allocate buffer for whole file and read it in
-    buffer  = new char[fileSize];
+  buffer = new char[fileSize];
   if (fread(buffer, 1, fileSize, file) < fileSize)
-  { // TODO: error handling
-  }
+    {   
+      // TODO: error handling
+    }
   fclose(file);
 
   //parse file into lines and send to the line fn
   line  = buffer;
-  while ((eol = strchr(line, '\x0a')) != NULL)  // use 0a for the eol to remove
-                                                // dependency on dos 0d,0a eol
-  { *eol = '\0';
-
-    this->getManifestLine(line, currentgroup);
-
-    line = eol + 1;
-  }
+  while ((eol = strchr(line, '\x0a')) != NULL)  
+    // use 0a for the eol to remove
+    // dependency on dos 0d,0a eol
+    {   
+      *eol = '\0';
+
+      this->getManifestLine(line, currentgroup);
+
+      line = eol + 1;
+    }
   this->getManifestLine(line, currentgroup);
 
-    delete buffer;
+  delete buffer;
   return true;
 }
 
 bool gsManifest::getManifestLine(char *line, string &group)
-{ char *eol;    // we (potentially) need to clean up the end of
-              // line, and we won't use the eol from the main
-              // getManifest fn. as for the last line it'd be
-              // null.
-
-    // clean up the start of the line
-    while (*line <= ' ' && *line != '\0')
-    { line ++;
-  }
+{
+  char *eol; // we (potentially) need to clean up the end of
+             // line, and we won't use the eol from the main
+             // getManifest fn. as for the last line it'd be
+             // null.
+
+  // clean up the start of the line
+  while (*line <= ' ' && *line != '\0')
+    {
+      line ++;
+    }
 
   // it's a blank line - don't bother!
-  if (line == '\0')
-  { return true;
-  }
+  if (*line == '\0')
+    {
+      return true;
+    }
 
   // clean up the end of line
-  eol   = line + strlen(line) - 1;
+  eol = line + strlen(line) - 1;
   while (*eol <= ' ' && eol >= line)
-  { *eol = '\0';
-    eol --;
-  }
+    {   
+      *eol = '\0';
+      eol --;
+    }
 
   // does the line end with a colon?; if so take it as a group definition
   if (*eol == ':')
-  { if (eol == line) // if it's literally just a colon do nothing
-    {   return true;
-    }
-
-    // note the new group name
-    string newgroup(line, 0, eol - line);
-    group = newgroup;
-  }
+    { 
+      if (eol == line) // if it's literally just a colon do nothing
+    {
+      return true;
+    }
+
+      // note the new group name
+      string newgroup(line, 0, eol - line);
+      group = newgroup;
+    }
   // if it starts with a hash it's just a comment line; skip it
   else if (*line == '#')
-  { // do nothing!
-  }
+    {   
+      // do nothing!
+    }
   // an actual line of member items; read them in
   else
-  { stringArray array;
-    array   =   stringArray::words(line);
-
-    if (group.length() == 0)
-    {   this->manifests["all"].add(array);
-    }
-    else
-    {   this->manifests[group].add(array);
-    }
-  }
+    {   
+      stringArray array;
+      array = stringArray::words(line);
+
+      if (group.length() == 0)
+    {   
+      this->manifests["all"].add(array);
+    }
+      else
+    {   
+      this->manifests[group].add(array);
+    }
+    }
   return true;
 }
@@ -209 +226 @@
 
 void gsManifest::clearSelection()
-{   this->selected.empty();
+{   
+  this->selected.empty();
 }
 
@@ -226 +244 @@
  */
 bool gsManifest::copy(FilePath *source)
-{ fileCopier    copy(this);
-
-    pathStringArrayMap::iterator here = this->selected.begin();
-  pathStringArrayMap::iterator end  = this->selected.end();
+{ 
+  fileCopier copy(this);
+
+  pathStringArrayMap::iterator here = this->selected.begin();
+  pathStringArrayMap::iterator end = this->selected.end();
 
   // add all the sets to copy to the manifest
   while (here != end)
-  { FileVector *fileList;
-    stringArray &array = (*here).second;
-    FilePath path((*here).first);
-
-    // TODO: eliminate inefficiency; we're doing FilePath->string->FilePath in
-    // effect between constructing the copy lists, and then the sets, as far
-    // as the destinations go
-    fileList = this->selection(*source, array);
-    fileCopySet copySet(*fileList, *source, path);
-    copy.addSet(copySet);
-        delete fileList;
-    here ++;
-  }
+    {
+      FileVector *fileList;
+      stringArray &array = (*here).second;
+      FilePath path((*here).first);
+
+      // TODO: eliminate inefficiency; we're doing FilePath->string->FilePath in
+      // effect between constructing the copy lists, and then the sets, as far
+      // as the destinations go
+      fileList = this->selection(*source, array);
+      fileCopySet copySet(*fileList, *source, path);
+      copy.addSet(copySet);
+      delete fileList;
+      here ++;
+    }
 
   // check that we've got enough space @ the destination(s)
   if (!copy.checkSpace())
-  { return false;
-  }
+    {   
+      return false;
+    }
 
   // do the actual copying
@@ -258 +279 @@
 
 void gsManifest::copied(string from, string to, bool isDir)
-{ if (isDir)
-    {   this->logAction("Manifest.CreateDir", to);
-    }
+{
+  if (isDir)
+    {
+      this->logAction("Manifest.CreateDir", to);
+    }
   else
-  { this->logAction("Manifest.CopyFile", from, to);
-  }
+    {   
+      this->logAction("Manifest.CopyFile", from, to);
+    }
 }
 
 void gsManifest::logAction(string actionName, string file)
-{ unInstallCommand command(actionName);
-    command.addParameter(file);
+{
+  unInstallCommand command(actionName);
+  command.addParameter(file);
   manager->storeCommand(command);
 }
 
 void gsManifest::logAction(string actionName, string source, string dest)
-{   unInstallCommand command(actionName);
-    command.addParameter(source);
+{
+  unInstallCommand command(actionName);
+  command.addParameter(source);
   command.addParameter(dest);
   manager->storeCommand(command);
@@ -280 +306 @@
 
 bool gsManifest::undoAction(string actionName, stringArray &params)
-{   if (actionName == "Manifest.CreateDir" || actionName == "CreateDir")
-    {   RemoveDirectory(params[0].c_str());
-      return true;
-  }
+{   
+  if (actionName == "Manifest.CreateDir" || actionName == "CreateDir")
+    {
+      RemoveDirectory(params[0].c_str());
+      return true;
+    }
   else if (actionName == "Manifest.CopyFile" || actionName == "CopyFile")
-    {   DeleteFile(params[1].c_str());
-    return true;
-  }
+    {
+      DeleteFile(params[1].c_str());
+      return true;
+    }
   return false;
 }
 
 FileVector *gsManifest::selection(FilePath &root, stringArray &array)
-{   FileVector *reply = new FileVector();
+{
+  FileVector *reply = new FileVector();
 
   for (unsigned int i = 0; i < array.size(); i++)
-  { FilePath    fileName(root.pathString(), array[i]);
-    File file(fileName.pathString());
-    reply->push_back(file);
+  {
+    FilePath fileName(root.pathString(), array[i]);
+    File file(fileName.pathString());
+    reply->push_back(file);
   }
   return reply;
@@ -303 +334 @@
 
 FileVector *gsManifest::selection(FilePath &source, FilePath &destination)
-{   return this->selection(source, this->selected[destination]);
-}
-
+{
+  return this->selection(source, this->selected[destination]);
+}
+