From 88ef351e7403ab0a794baf508f937786398ae0c3 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Tue, 25 Nov 2008 12:05:03 +0100 Subject: [PATCH] Removed apostrophe from some error messages and dangerous text display from character set conversion error messages. --- libisofs/ecma119.c | 5 +++-- libisofs/fs_image.c | 12 ++++++------ libisofs/messages.c | 14 +++++++------- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/libisofs/ecma119.c b/libisofs/ecma119.c index d4196b4..f411f02 100644 --- a/libisofs/ecma119.c +++ b/libisofs/ecma119.c @@ -317,8 +317,8 @@ char *get_relaxed_vol_id(Ecma119Image *t, const char *name) return str; } iso_msg_submit(t->image->id, ISO_FILENAME_WRONG_CHARSET, ret, - "Charset conversion error. Can't convert %s from %s to %s", - name, t->input_charset, t->output_charset); + "Charset conversion error. Cannot convert from %s to %s", + t->input_charset, t->output_charset); } return strdup(name); } @@ -912,6 +912,7 @@ int ecma119_image_new(IsoImage *src, IsoWriteOpts *opts, Ecma119Image **img) /* default to locale charset */ setlocale(LC_CTYPE, ""); + target->input_charset = strdup(nl_langinfo(CODESET)); if (target->input_charset == NULL) { iso_image_unref(src); diff --git a/libisofs/fs_image.c b/libisofs/fs_image.c index 4190580..d9a6212 100644 --- a/libisofs/fs_image.c +++ b/libisofs/fs_image.c @@ -944,8 +944,8 @@ char *get_name(_ImageFsData *fsdata, const char *str, size_t len) return name; } else { ret = iso_msg_submit(fsdata->msgid, ISO_FILENAME_WRONG_CHARSET, ret, - "Charset conversion error. Can't convert %s from %s to %s", - str, fsdata->input_charset, fsdata->local_charset); + "Charset conversion error. Cannot convert from %s to %s", + fsdata->input_charset, fsdata->local_charset); if (ret < 0) { return NULL; /* aborted */ } @@ -1275,8 +1275,8 @@ int iso_file_source_new_ifs(IsoImageFilesystem *fs, IsoFileSource *parent, if (ret < 0) { /* its just a hint message */ ret = iso_msg_submit(fsdata->msgid, ISO_FILENAME_WRONG_CHARSET, - ret, "Charset conversion error. Can't " - "convert %s from %s to %s", name, + ret, "Charset conversion error. Cannot " + "convert from %s to %s", fsdata->input_charset, fsdata->local_charset); free(newname); if (ret < 0) { @@ -1297,8 +1297,8 @@ int iso_file_source_new_ifs(IsoImageFilesystem *fs, IsoFileSource *parent, fsdata->local_charset, &newlinkdest); if (ret < 0) { ret = iso_msg_submit(fsdata->msgid, ISO_FILENAME_WRONG_CHARSET, - ret, "Charset conversion error. Can't " - "convert %s from %s to %s", name, + ret, "Charset conversion error. Cannot " + "convert from %s to %s", fsdata->input_charset, fsdata->local_charset); free(newlinkdest); if (ret < 0) { diff --git a/libisofs/messages.c b/libisofs/messages.c index 78b4f9a..d8f6c48 100644 --- a/libisofs/messages.c +++ b/libisofs/messages.c @@ -109,7 +109,7 @@ const char *iso_error_to_msg(int errcode) case ISO_ASSERT_FAILURE: return "Internal programming error. Please report this bug"; case ISO_NULL_POINTER: - return "NULL pointer as value for an arg. that doesn't allow NULL"; + return "NULL pointer as value for an arg. that does not allow NULL"; case ISO_OUT_OF_MEM: return "Memory allocation error"; case ISO_INTERRUPTED: @@ -117,7 +117,7 @@ const char *iso_error_to_msg(int errcode) case ISO_WRONG_ARG_VALUE: return "Invalid parameter value"; case ISO_THREAD_ERROR: - return "Can't create a needed thread"; + return "Cannot create a needed thread"; case ISO_WRITE_ERROR: return "Write error"; case ISO_BUF_READ_ERROR: @@ -155,7 +155,7 @@ const char *iso_error_to_msg(int errcode) case ISO_FILE_IS_NOT_SYMLINK: return "Not symlink used where a symlink is expected"; case ISO_FILE_SEEK_ERROR: - return "Can't seek to specified location"; + return "Cannot seek to specified location"; case ISO_FILE_IGNORED: return "File not supported in ECMA-119 tree and thus ignored"; case ISO_FILE_TOO_BIG: @@ -163,15 +163,15 @@ const char *iso_error_to_msg(int errcode) case ISO_FILE_CANT_WRITE: return "File read error during image creation"; case ISO_FILENAME_WRONG_CHARSET: - return "Can't convert filename to requested charset"; + return "Cannot convert filename to requested charset"; case ISO_FILE_CANT_ADD: - return "File can't be added to the tree"; + return "File cannot be added to the tree"; case ISO_FILE_IMGPATH_WRONG: return "File path break specification constraints and will be ignored"; case ISO_CHARSET_CONV_ERROR: return "Charset conversion error"; case ISO_MANGLE_TOO_MUCH_FILES: - return "Too much files to mangle, can't guarantee unique file names"; + return "Too much files to mangle, cannot guarantee unique file names"; case ISO_WRONG_PVD: return "Wrong or damaged Primary Volume Descriptor"; case ISO_WRONG_RR: @@ -187,7 +187,7 @@ const char *iso_error_to_msg(int errcode) case ISO_UNSUPPORTED_EL_TORITO: return "Unsupported El-Torito feature"; case ISO_ISOLINUX_CANT_PATCH: - return "Can't patch isolinux boot image"; + return "Cannot patch isolinux boot image"; case ISO_UNSUPPORTED_SUSP: return "Unsupported SUSP feature"; case ISO_WRONG_RR_WARN: