# HG changeset patch
# User Tom Sutcliffe <thomas.sutcliffe@accenture.com>
# Date 1288103790 -3600
# Node ID 8df58d8c99e8ab0c241bd4edf9d64d6d73c20dce
# Parent  2f382fb2036c588ae4bbe75974523e55ff6057d8
Fix for fzip CIF file

diff -r 2f382fb2036c -r 8df58d8c99e8 commands/fzip/fzip.cif
--- a/commands/fzip/fzip.cif	Mon Oct 25 13:21:33 2010 +0100
+++ b/commands/fzip/fzip.cif	Tue Oct 26 15:36:30 2010 +0100
@@ -20,9 +20,9 @@
 
 Generates compressed archives of files or extracts files from a compressed archive. Both 'zip' and 'gzip' file formats are support ('zip' is used by default).
 
-==argument filename archive optional
+==argument filename zipfile optional
 
-The zip archive to create or extract.
+The zip archive to create or extract. If the zipfile argument is not specified when creating a zip, the first C<file> argument's name is used with a .zip or .gz extension appended.
 
 ==option bool v verbose
 
@@ -30,11 +30,11 @@
 
 ==option bool u unzip
 
-Extract files from the specified archive.
+Extract files from the specified zipfile.
 
 ==option filename d directory
 
-The directory to extract files into. Must be used in conjunction with '--unzip'.
+The directory to extract files into. Must be used in conjunction with C<--unzip>. If not specified, the current working directory is used.
 
 ==option bool r recurse
 
@@ -42,7 +42,7 @@
 
 ==option filename f file multiple
 
-A file or directory to archive. Only applicable when creating a new archive. If a directory is specified then it and any files contained immediately within that directory are archived. Use --recurse to archive all sub-directories and files within the directory. 
+A file or directory to add to the zipfile. Only applicable when creating a new archive. If a directory is specified then it and any files contained immediately within that directory are archived. Use --recurse to archive all sub-directories and files within the directory. 
 
 ==option enum t compression-type
 
@@ -54,6 +54,10 @@
 
 GNU Zip format. Note, this format can only handle a single file.
 
+==option bool o overwrite
+
+By default fzip will exit with an error if a file it is creating already exists on disk. Use this flag to silently overwrite instead.
+
 ==copyright
 
 Copyright (c) 2008-2010 Accenture. All rights reserved.
diff -r 2f382fb2036c -r 8df58d8c99e8 core/src/commands.cpp
--- a/core/src/commands.cpp	Mon Oct 25 13:21:33 2010 +0100
+++ b/core/src/commands.cpp	Tue Oct 26 15:36:30 2010 +0100
@@ -5993,7 +5993,7 @@
 
 	if (iErrorText)
 		{
-		LeaveIfErr(iErrorVal, *iErrorText);
+		LeaveIfErr(iErrorVal, _L("%S"), iErrorText);
 		}
 	else
 		{