Changeset 61604 in vbox for trunk/src/VBox

Timestamp:

Jun 9, 2016 8:02:03 AM (9 years ago)

Author:

vboxsync

Message:

bugref:8344. using RTPATH_SLASH.

File:

• trunk/src/VBox/Main/src-server/MediumImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-server/MediumImpl.cpp

@@ -2991 +2991 @@
             destMediumFileName.stripPath();
 
+            Utf8Str suffix(destMediumFileName);
+            suffix.stripSuffix();//for small trick, see next condition
+
+            if(suffix.equals(destMediumFileName) && !destMediumFileName.isEmpty())
+            {
+                /*
+                 * small trick. This case means target path has no filename at the end
+                 * it will look like "/path/to/new/location"
+                 * there is no backslash in the end
+                 * and there is no filename with extension(suffix) in the end
+                 * In this case just set destMediumFileName to NULL and 
+                 * and add '/' in the end of path.destMediumPath
+                 */
+                destMediumFileName.setNull();
+                destMediumPath.append(RTPATH_SLASH);
+            }
+
             if (destMediumFileName.isEmpty())
             {
@@ -3003 +3020 @@
                      * next move medium within the source directory with the passed new name
                      */
-                    destMediumPath = sourceMediumPath.stripFilename().append('/').append(destMediumFileName);
+                    destMediumPath = sourceMediumPath.stripFilename().append(RTPATH_SLASH).append(destMediumFileName);
                 }
                 else
                 {
                     /* set the target extension like on the source. Permission to convert is prohibited */
-                    Utf8Str suffix = i_getFormat();
+                    suffix = i_getFormat();
 
                     if (suffix.compare("RAW", Utf8Str::CaseInsensitive) == 0)