X-Git-Url: http://git.jankratochvil.net/?a=blobdiff_plain;f=src%2Fclient%2Fcmdline%2Fcmd_get.c;h=87daf722aa7de57c6b3ad82306b2b77b47ddf249;hb=a2dd38f86df22c46ae18f3ad7d9850eaacb02b92;hp=c852b22b9867a91cb10122c12b8d5c5e2417369e;hpb=dca9a7733209563381481af5997672c72924b4a2;p=captive.git

diff --git a/src/client/cmdline/cmd_get.c b/src/client/cmdline/cmd_get.c
index c852b22..87daf72 100644
--- a/src/client/cmdline/cmd_get.c
+++ b/src/client/cmdline/cmd_get.c
@@ -32,6 +32,7 @@
 #include "cmd_get.h"	/* self */
 #include "cmd_cd.h"	/* for cmdline_path_from_cwd() */
 #include "main.h"
+#include "utf8.h"
 
 
 /* Config: */
@@ -80,7 +81,7 @@ char *endptr;
 		transfer_buffer_size=strtol(string,&endptr,0);
 		if (transfer_buffer_size<=0 || transfer_buffer_size>=LONG_MAX || (endptr && *endptr)) {
 			g_set_error(errp,CMDLINE_CMD_GET_ERROR,CMDLINE_CMD_GET_ERROR_PARSING_TRANSFER_BUFFER_SIZE,
-					_("Error parsing transfer buffer size: %s"),string);
+					_("Error parsing transfer buffer size: %s"),CMD_LOCALE_FROM_UTF8_ALLOCA(string));
 			return;
 			}
 		}
@@ -96,7 +97,7 @@ char *s;
 			targetfile=s+1;
 		}
 
-	if (-1==(fdtgt=open(targetfile,
+	if (-1==(fdtgt=open(CMD_FILENAME_FROM_UTF8_ALLOCA(targetfile),
 			O_CREAT|O_EXCL|O_WRONLY	/* flags */
 #ifdef O_BINARY
 					| O_BINARY
@@ -107,7 +108,7 @@ char *s;
 					,
 			perm))) {	/* mode */
 		g_set_error(errp,CMDLINE_CMD_GET_ERROR,CMDLINE_CMD_GET_ERROR_CANNOT_CREATE_TARGET_HOSTOS_FILE,
-				_("Cannot create target host-os file '%s': %s"),targetfile,g_strerror(errno));
+				_("Cannot create target host-os file '%s': %s"),CMD_LOCALE_FROM_UTF8_ALLOCA(targetfile),g_strerror(errno));
 		return;
 		}
 
@@ -118,7 +119,7 @@ char *s;
 			GNOME_VFS_OPEN_READ))) {	/* mode */
 		err_cleanup(errp);
 		g_set_error(errp,CMDLINE_CMD_GET_ERROR,CMDLINE_CMD_GET_ERROR_OPENING_SOURCE_FILE,
-				_("Error opening source guest-os file: %s"),sourcefile);
+				_("Error opening source guest-os file: %s"),CMD_LOCALE_FROM_UTF8_ALLOCA(sourcefile));
 		goto err_close_fdtgt;
 		}
 
@@ -146,13 +147,13 @@ gboolean errbool;
 			g_assert(errbool==FALSE);
 			err_cleanup(errp);
 			g_set_error(errp,CMDLINE_CMD_GET_ERROR,CMDLINE_CMD_GET_ERROR_READING_SOURCE_FILE,
-					_("Error reading source guest-os file '%s': %s"),sourcefile,g_strerror(errno));
+					_("Error reading source guest-os file '%s': %s"),CMD_LOCALE_FROM_UTF8_ALLOCA(sourcefile),g_strerror(errno));
 			goto err_free_transfer_buffer;
 			}
 
 		if (bytes_read!=(GnomeVFSFileSize)(gotssize=write(fdtgt,transfer_buffer,bytes_read))) {
 			g_set_error(errp,CMDLINE_CMD_GET_ERROR,CMDLINE_CMD_GET_ERROR_WRITING_TARGET_HOSTOS_FILE,
-					_("Error writing target host-os file: %s"),targetfile);
+					_("Error writing target host-os file: %s"),CMD_LOCALE_FROM_UTF8_ALLOCA(targetfile));
 			goto err_free_transfer_buffer;
 			}
 		}
@@ -165,6 +166,6 @@ err_close_fdtgt:
 	if (close(fdtgt)) {
 		err_cleanup(errp);	/* may be clean */
 		g_set_error(errp,CMDLINE_CMD_GET_ERROR,CMDLINE_CMD_GET_ERROR_CLOSING_TARGET_HOSTOS_FILE,
-				_("Error closing target host-os file '%s': %s"),targetfile,g_strerror(errno));
+				_("Error closing target host-os file '%s': %s"),CMD_LOCALE_FROM_UTF8_ALLOCA(targetfile),g_strerror(errno));
 		}
 }