Changeset 4742 in vbox for trunk/src/VBox

Timestamp:

Sep 12, 2007 4:56:41 PM (17 years ago)

Author:

vboxsync

Message:

vditool: convert argv[] to Utf8 before calling internal functions

File:

• trunk/src/VBox/Devices/Storage/testcase/vditool.cpp (modified) (13 diffs)

trunk/src/VBox/Devices/Storage/testcase/vditool.cpp

@@ -62 +62 @@
 
 /**
+ * Our internal functions use UTF8
+ */
+static int FilenameToUtf8(char **pszUtf8Filename, const char *pszFilename)
+{
+    int rc = RTStrCurrentCPToUtf8(pszUtf8Filename, pszFilename);
+    if (VBOX_FAILURE(rc))
+        RTPrintf("Error converting filename '%s' to UTF8! (rc=%Rrc)\n",
+                 pszFilename, rc);
+    return rc;
+}
+
+/**
  * Prints a done message indicating success or failure.
  * @returns rc
@@ -80 +92 @@
 {
     RTPrintf("Creating VDI: file=\"%s\" size=%u MB...\n",
-             pszFilename, cMBs);
-    int rc = VDICreateBaseImage(pszFilename,
-                                VDI_IMAGE_TYPE_NORMAL,
-                                (uint64_t)cMBs * (uint64_t)(1024 * 1024),
-                                "Newly created test image", NULL, NULL);
+            pszFilename, cMBs);
+
+    /* translate argv[] to UTF8 */
+    char *pszUtf8Filename;
+    int rc = FilenameToUtf8(&pszUtf8Filename, pszFilename);
+    if (VBOX_FAILURE(rc))
+        return rc;
+
+    rc = VDICreateBaseImage(pszUtf8Filename,
+                            VDI_IMAGE_TYPE_NORMAL,
+                            (uint64_t)cMBs * (uint64_t)(1024 * 1024),
+                            "Newly created test image", NULL, NULL);
     return PrintDone(rc);
 }
@@ -93 +112 @@
              pszDDFilename, pszFilename);
 
+    /* translate argv[] to UTF8 */
+    char *pszUtf8Filename, *pszUtf8DDFilename;
+    int rc = FilenameToUtf8(&pszUtf8Filename, pszFilename);
+    if (VBOX_FAILURE(rc))
+        return rc;
+    rc = FilenameToUtf8(&pszUtf8DDFilename, pszDDFilename);
+    if (VBOX_FAILURE(rc))
+        return rc;
+
     /* open raw image file. */
     RTFILE File;
-    int rc = RTFileOpen(&File, pszDDFilename, RTFILE_O_OPEN | RTFILE_O_READ | RTFILE_O_DENY_WRITE);
+    rc = RTFileOpen(&File, pszUtf8DDFilename, RTFILE_O_OPEN | RTFILE_O_READ | RTFILE_O_DENY_WRITE);
     if (VBOX_FAILURE(rc))
     {
@@ -108 +136 @@
     {
         RTPrintf("Creating fixed image with size %u Bytes...\n", (unsigned)cbFile);
-        rc = VDICreateBaseImage(pszFilename,
+        rc = VDICreateBaseImage(pszUtf8Filename,
                                 VDI_IMAGE_TYPE_FIXED,
                                 cbFile,
@@ -117 +145 @@
             RTPrintf("Writing data...\n");
             PVDIDISK pVdi = VDIDiskCreate();
-            rc = VDIDiskOpenImage(pVdi, pszFilename, VDI_OPEN_FLAGS_NORMAL);
+            rc = VDIDiskOpenImage(pVdi, pszUtf8Filename, VDI_OPEN_FLAGS_NORMAL);
             if (VBOX_SUCCESS(rc))
             {
@@ -148 +176 @@
             {
                 /* delete image on error */
-                VDIDeleteImage(pszFilename);
+                VDIDeleteImage(pszUtf8Filename);
             }
             PrintDone(rc);
@@ -179 +207 @@
              "progress: 0%%",
              pszFilename);
+
+    /* translate argv[] to UTF8 */
+    char *pszUtf8Filename;
+    int rc = FilenameToUtf8(&pszUtf8Filename, pszFilename);
+    if (VBOX_FAILURE(rc))
+        return rc;
+
     unsigned uPercent = 0;
-    int rc = VDIConvertImage(pszFilename, ProcessCallback, &uPercent);
+    rc = VDIConvertImage(pszUtf8Filename, ProcessCallback, &uPercent);
     RTPrintf("\n");
     return PrintDone(rc);
@@ -189 +224 @@
     RTPrintf("Dumping VDI image file=\"%s\" into the log file...\n", pszFilename);
     PVDIDISK pVdi = VDIDiskCreate();
-    int rc = VDIDiskOpenImage(pVdi, pszFilename, VDI_OPEN_FLAGS_READONLY);
+
+    /* translate argv[] to UTF8 */
+    char *pszUtf8Filename;
+    int rc = FilenameToUtf8(&pszUtf8Filename, pszFilename);
+    if (VBOX_FAILURE(rc))
+        return rc;
+    rc = VDIDiskOpenImage(pVdi, pszUtf8Filename, VDI_OPEN_FLAGS_READONLY);
     if (VBOX_SUCCESS(rc))
     {
@@ -202 +243 @@
     RTPrintf("Resetting geometry info of VDI image file=\"%s\"\n", pszFilename);
     PVDIDISK pVdi = VDIDiskCreate();
-    int rc = VDIDiskOpenImage(pVdi, pszFilename, VDI_OPEN_FLAGS_NORMAL);
+
+    /* translate argv[] to UTF8 */
+    char *pszUtf8Filename;
+    int rc = FilenameToUtf8(&pszUtf8Filename, pszFilename);
+    if (VBOX_FAILURE(rc))
+        return rc;
+
+    rc = VDIDiskOpenImage(pVdi, pszUtf8Filename, VDI_OPEN_FLAGS_NORMAL);
     if (VBOX_SUCCESS(rc))
     {
@@ -218 +266 @@
              "progress: 0%%",
              pszSrcFile, pszDstFile);
+
+    /* translate argv[] to UTF8 */
+    char *pszUtf8SrcFile, *pszUtf8DstFile;
+    int rc = FilenameToUtf8(&pszUtf8SrcFile, pszSrcFile);
+    if (VBOX_FAILURE(rc))
+        return rc;
+    rc = FilenameToUtf8(&pszUtf8DstFile, pszDstFile);
+    if (VBOX_FAILURE(rc))
+        return rc;
+
     unsigned uPrecent = 0;
-    int rc = VDICopyImage(pszDstFile, pszSrcFile, NULL, ProcessCallback, &uPrecent);
+    rc = VDICopyImage(pszUtf8DstFile, pszUtf8SrcFile, NULL, ProcessCallback, &uPrecent);
     RTPrintf("\n");
     return PrintDone(rc);
@@ -229 +287 @@
              pszSrcFile, pszDstFile);
     PVDIDISK pVdi = VDIDiskCreate();
-    int rc = VDIDiskOpenImage(pVdi, pszSrcFile, VDI_OPEN_FLAGS_NORMAL);
+
+    /* translate argv[] to UTF8 */
+    char *pszUtf8SrcFile, *pszUtf8DstFile;
+    int rc = FilenameToUtf8(&pszUtf8SrcFile, pszSrcFile);
+    if (VBOX_FAILURE(rc))
+        return rc;
+    rc = FilenameToUtf8(&pszUtf8DstFile, pszDstFile);
+    if (VBOX_FAILURE(rc))
+        return rc;
+
+    rc = VDIDiskOpenImage(pVdi, pszUtf8SrcFile, VDI_OPEN_FLAGS_NORMAL);
     if (VBOX_SUCCESS(rc))
     {
         RTFILE FileDst;
-        rc = RTFileOpen(&FileDst, pszDstFile, RTFILE_O_CREATE | RTFILE_O_READWRITE | RTFILE_O_DENY_WRITE);
+        rc = RTFileOpen(&FileDst, pszUtf8DstFile, RTFILE_O_CREATE | RTFILE_O_READWRITE | RTFILE_O_DENY_WRITE);
         if (VBOX_SUCCESS(rc))
         {
@@ -266 +334 @@
              "progress: 0%%",
              pszFilename);
+
+    /* translate argv[] to UTF8 */
+    char *pszUtf8Filename;
+    int rc = FilenameToUtf8(&pszUtf8Filename, pszFilename);
+    if (VBOX_FAILURE(rc))
+        return rc;
+
     unsigned uPrecent;
-    int rc = VDIShrinkImage(pszFilename, ProcessCallback, &uPrecent);
+    rc = VDIShrinkImage(pszUtf8Filename, ProcessCallback, &uPrecent);
     RTPrintf("\n");
     return PrintDone(rc);
@@ -278 +353 @@
 
     RTR3Init();
-    RTPrintf("vditool    Copyright (c) 2004-2005 innotek GmbH.\n\n");
+    RTPrintf("vditool    Copyright (c) 2004-2007 innotek GmbH.\n\n");
 
     /*