Attachment 151637 Details for Bug 234893 – cvs diff installer/unix/{installer.cc, product.cc}

[patch] cvs diff installer/unix/{installer.cc, product.cc}

installer.diffs (text/plain), 4.01 KB, created by Noriko Hosoi on 2007-04-04 01:34:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Noriko Hosoi

Created: 2007-04-04 01:34:17 UTC

Size: 4.01 KB

patch

obsolete

>Index: installer.cc
>===================================================================
>RCS file: /cvs/dirsec/setuputil/installer/unix/installer.cc,v
>retrieving revision 1.5
>diff -t -w -U4 -r1.5 installer.cc
>--- installer.cc	27 Mar 2006 21:18:35 -0000	1.5
>+++ installer.cc	4 Apr 2007 01:31:19 -0000
>@@ -791,12 +791,32 @@
>    filename = _newSuiteSpot.get("resource");
> 
>    if (filename)
>    {
>-      NSString resourceFile;
>+      NSString resourceFile = NULL;
>+      if ('/' == *filename) /* absolute path */
>+      {
>+         resourceFile = filename;
>+      }
>+      else
>+      {
>       resourceFile = _baseDir + "/" + filename;
>+         if (InstUtil::fileExists(resourceFile) == False)
>+         {
>+            /* the file is not in _baseDir (where dssetup is located) */
>+            resourceFile = NSString(PROPERTYDIR) + "/" + filename;
>+         }
>+      }
>+      if (InstUtil::fileExists(resourceFile) == False)
>+      {
>+         setupLogMessage(WARN, "Setup",
>+                         "Resource file %s does not exist.\n", resourceFile);
>+      }
>+      else
>+      {
>       customResource.read(resourceFile);
>    }
>+   }
> 
>    // Even without resource file defined, we still want to
>    // customize product and vendor name 
>    if (p = _newSuiteSpot.get(SETUP_INF_VENDOR))
>@@ -1429,22 +1449,34 @@
> Installer::getNewProducts(const NSString & sourceDir, const char *infName)
> {
>   NSString infFile;
> 
>+  if ('/' == *infName) /* absolute path */
>+  {
>+    infFile = infName;
>+  }
>+  else
>+  {
>   infFile = sourceDir + "/";
>   infFile = infFile + infName;
> 
>   if (InstUtil::fileExists(infFile) == False)
>   {
>-     return -1;
>+      /* the file is not in sourceDir, try PROPERTYDIR */
>+      infFile = NSString(PROPERTYDIR) + "/" + infName;
>+    }
>+  }
>+  if (InstUtil::fileExists(infFile) == False)
>+  {
>+    return -1; /* infFile does not exist */
>   }
> 
>   if (sourceDir == _sourceDir && _newSuiteSpot.numComponents())
>   {
>      return 0;
>   }
> 
>-  if (_newSuiteSpot.retrieveSuiteSpot(sourceDir, infName) == 0 && _newSuiteSpot.numComponents())
>+  if (_newSuiteSpot.retrieveSuiteSpot(sourceDir, infFile) == 0 && _newSuiteSpot.numComponents())
>   {
>      _newSuiteSpot.getComponents()->sortComponents();
>      _newSuiteSpot.select();
>      _newSuiteSpot.getAllComponents(*_newComponents); // Flatten the structure
>Index: product.cc
>===================================================================
>RCS file: /cvs/dirsec/setuputil/installer/unix/product.cc,v
>retrieving revision 1.5
>diff -t -w -U4 -r1.5 product.cc
>--- product.cc	23 Mar 2006 15:59:17 -0000	1.5
>+++ product.cc	4 Apr 2007 01:31:19 -0000
>@@ -627,9 +627,22 @@
> 
>    // This is top level master configuration file
>    init();
> 
>-   snprintf(tstr, sizeof(tstr), "%s/%s", sourceDir.data(), fileName);
>+   if ('/' == *fileName) /* absolute path */
>+   {
>+      snprintf(tstr, sizeof(tstr), "%s", fileName);
>+   }
>+   else
>+   {
>+      NSString setupFile = sourceDir + "/" + fileName;
>+      if (InstUtil::fileExists(setupFile) == False)
>+      {
>+         /* the file is not in sourceDir, try PROPERTYDIR */
>+         setupFile = NSString(PROPERTYDIR) + "/" + fileName;
>+      }
>+      snprintf(tstr, sizeof(tstr), "%s", setupFile.data(), fileName);
>+   }
>    tstr[sizeof(tstr)-1] = 0;
>    _packageInfo = new PackageInfo(tstr);
> 
>    if (_packageInfo->isEmpty() || (componentList = _packageInfo->getListItems(PKG_COMPONENTS)) == NULL || _packageInfo->numSections() == 0)
>@@ -692,9 +705,22 @@
>    char **componentList = NULL;
> 
>    init();
> 
>-   snprintf(tstr, sizeof(tstr), "%s/%s", sourceDir.data(), fileName);
>+   if ('/' == *fileName) /* absolute path */
>+   {
>+      snprintf(tstr, sizeof(tstr), "%s", fileName);
>+   }
>+   else
>+   {
>+      NSString subFile = sourceDir + "/" + fileName;
>+      if (InstUtil::fileExists(subFile) == False)
>+      {
>+         /* the file is not in sourceDir, try PROPERTYDIR */
>+         subFile = NSString(PROPERTYDIR) + "/" + fileName;
>+      }
>+      snprintf(tstr, sizeof(tstr), "%s", subFile.data(), fileName);
>+   }
>    tstr[sizeof(tstr)-1] = 0;
>    
>    _packageInfo = new PackageInfo(tstr);
>

Actions: View | Diff

Attachments on bug 234893: 151466 | 151468 | 151469 | 151604 | 151605 | 151637 | 151638 | 151698 | 151722 | 151725 | 151728 | 151793 | 151794