Changeset 49039 in vbox for trunk/src/VBox/Installer

Timestamp:

Oct 10, 2013 6:27:32 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

89816

Message:

IPRT: Filename extension versus suffix cleanup, long overdue.

Location:

trunk/src/VBox/Installer

Files:

• linux/install_service/generate_service_file.cpp (modified) (1 diff)
• win/Stub/VBoxStub.cpp (modified) (1 diff)

trunk/src/VBox/Installer/linux/install_service/generate_service_file.cpp

@@ -585 +585 @@
             else
             {
-                const char *pcszFileName =
-                    RTPathFilename(pParameters->pcszCommand);
-                const char *pcszExtension =
-                    RTPathExt(pParameters->pcszCommand);
+                const char *pcszFileName = RTPathFilename(pParameters->pcszCommand);
+                const char *pcszSuffix   = RTPathSuffix(pParameters->pcszCommand);
                 char *pszName = RTStrDupN(pcszFileName,
-                                            pcszExtension
-                                          ? pcszExtension - pcszFileName
+                                            pcszSuffix
+                                          ? pcszSuffix - pcszFileName
                                           : RTPATH_MAX);
                 bool fRc;

trunk/src/VBox/Installer/win/Stub/VBoxStub.cpp

@@ -626 +626 @@
 
     RTEXITCODE rcExit;
-    const char *pszExt = RTPathExt(szPkgFile);
-    if (RTStrICmp(pszExt, ".msi") == 0)
+    const char *pszSuff = RTPathSuffix(szPkgFile);
+    if (RTStrICmp(pszSuff, ".msi") == 0)
         rcExit = ProcessMsiPackage(szPkgFile, pszMsiArgs, fLogging);
-    else if (RTStrICmp(pszExt, ".cab") == 0)
+    else if (RTStrICmp(pszSuff, ".cab") == 0)
         rcExit = RTEXITCODE_SUCCESS; /* Ignore .cab files, they're generally referenced by other files. */
     else