Changeset 1545 for trunk/gsinstaller/fileCopier.cpp

Timestamp:

2000-09-14T02:01:44+12:00 (24 years ago)

Author:

cs025

Message:

Improved logging of manifest items, tidied the handling of items with extended
paths in the manifest (logging creation of directories on the path); finally
removed some old garbage from gsinstall.cpp.

File:

• trunk/gsinstaller/fileCopier.cpp (modified) (4 diffs)

trunk/gsinstaller/fileCopier.cpp

@@ -48 +48 @@
 }
 
+bool fileCopySet::ensureParent(FilePath &child, fileCopyMonitor *monitor)
+{ FilePath *parentName = child.parent();
+
+    // check for existence of parent
+    if (parentName->exists() == false)
+  { // ensure the grandparent exists
+    if (!this->ensureParent(*parentName, monitor))
+    { return false;
+    }
+
+    // create parent directory
+    _mkdir(parentName->cString());
+
+    // log the creation - we don't give a source - it's not needed for directories
+    if (monitor != NULL)
+    {   monitor->copiedDir(parentName->cString());
+    }
+  }
+    delete parentName;
+  return true;
+}
+
 /**
  * Copy a particular file to its destination
@@ -62 +84 @@
   destination = this->destination(file);
 
+  // ensure that the parent exists, as some install requirements are for files with
+  // directory paths which may not preexist
     FilePath destPath(destination);
-  FilePath *destDir = destPath.parent();
-  if (!destDir->ensureWriteablePath())
-  { delete destDir;
-    return false;
-  }
-  delete destDir;
+  this->ensureParent(destPath, monitor);
 
   // get read and write file handles
@@ -112 +131 @@
   if (monitor != NULL)
     {
-      monitor->copied(file->cString(), destination, false);
+      monitor->copiedFile(file->cString(), destination);
     }
   delete destination;
@@ -133 +152 @@
   if (file->isDirectory())
     {
-      // create directory
+      // get destination directory
       char *thisDestDir = this->destination(file);
-      _mkdir(thisDestDir);
-
-      // note amount of data copied
-      // this->copied += file->getRawFileSize();
-
-      // note for uninstall the action done
-      if (monitor != NULL)
-    {
-      monitor->copied(file->cString(), thisDestDir, true);
-    }
+      FilePath destPath(thisDestDir);
+
+      // create a directory if needsbe
+      if (destPath.exists() == false)
+      {
+        _mkdir(thisDestDir);
+
+          // note amount of data copied
+        // this->copied += file->getRawFileSize();
+
+          // note for uninstall the action done
+        if (monitor != NULL)
+            {
+                monitor->copiedDir(thisDestDir);
+            }
+      }
 
       // copy children