libburnia/libisofs
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed apostrophe from some error messages and

Browse Source 
dangerous text display from character set conversion
error messages.
This commit is contained in:
Thomas Schmitt 2008-11-25 12:05:03 +01:00
parent cb3a879baf
commit 88ef351e74
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libisofs/ecma119.c
View File

@ -317,8 +317,8 @@ char *get_relaxed_vol_id(Ecma119Image *t, const char *name)
return str; return str;
} }
iso_msg_submit(t->image->id, ISO_FILENAME_WRONG_CHARSET, ret, iso_msg_submit(t->image->id, ISO_FILENAME_WRONG_CHARSET, ret,
"Charset conversion error. Can't convert %s from %s to %s", "Charset conversion error. Cannot convert from %s to %s",
name, t->input_charset, t->output_charset); t->input_charset, t->output_charset);
} }
return strdup(name); return strdup(name);
} }
@ -912,6 +912,7 @@ int ecma119_image_new(IsoImage *src, IsoWriteOpts *opts, Ecma119Image **img)
/* default to locale charset */ /* default to locale charset */
setlocale(LC_CTYPE, ""); setlocale(LC_CTYPE, "");
target->input_charset = strdup(nl_langinfo(CODESET)); target->input_charset = strdup(nl_langinfo(CODESET));
if (target->input_charset == NULL) { if (target->input_charset == NULL) {
iso_image_unref(src); iso_image_unref(src);

12
libisofs/fs_image.c
View File

@ -944,8 +944,8 @@ char *get_name(_ImageFsData *fsdata, const char *str, size_t len)
return name; return name;
} else { } else {
ret = iso_msg_submit(fsdata->msgid, ISO_FILENAME_WRONG_CHARSET, ret, ret = iso_msg_submit(fsdata->msgid, ISO_FILENAME_WRONG_CHARSET, ret,
"Charset conversion error. Can't convert %s from %s to %s", "Charset conversion error. Cannot convert from %s to %s",
str, fsdata->input_charset, fsdata->local_charset); fsdata->input_charset, fsdata->local_charset);
if (ret < 0) { if (ret < 0) {
return NULL; /* aborted */ return NULL; /* aborted */
} }
@ -1275,8 +1275,8 @@ int iso_file_source_new_ifs(IsoImageFilesystem *fs, IsoFileSource *parent,
if (ret < 0) { if (ret < 0) {
/* its just a hint message */ /* its just a hint message */
ret = iso_msg_submit(fsdata->msgid, ISO_FILENAME_WRONG_CHARSET, ret = iso_msg_submit(fsdata->msgid, ISO_FILENAME_WRONG_CHARSET,
ret, "Charset conversion error. Can't " ret, "Charset conversion error. Cannot "
"convert %s from %s to %s", name, "convert from %s to %s",
fsdata->input_charset, fsdata->local_charset); fsdata->input_charset, fsdata->local_charset);
free(newname); free(newname);
if (ret < 0) { if (ret < 0) {
@ -1297,8 +1297,8 @@ int iso_file_source_new_ifs(IsoImageFilesystem *fs, IsoFileSource *parent,
fsdata->local_charset, &newlinkdest); fsdata->local_charset, &newlinkdest);
if (ret < 0) { if (ret < 0) {
ret = iso_msg_submit(fsdata->msgid, ISO_FILENAME_WRONG_CHARSET, ret = iso_msg_submit(fsdata->msgid, ISO_FILENAME_WRONG_CHARSET,
ret, "Charset conversion error. Can't " ret, "Charset conversion error. Cannot "
"convert %s from %s to %s", name, "convert from %s to %s",
fsdata->input_charset, fsdata->local_charset); fsdata->input_charset, fsdata->local_charset);
free(newlinkdest); free(newlinkdest);
if (ret < 0) { if (ret < 0) {

14
libisofs/messages.c
View File

@ -109,7 +109,7 @@ const char *iso_error_to_msg(int errcode)
case ISO_ASSERT_FAILURE: case ISO_ASSERT_FAILURE:
return "Internal programming error. Please report this bug"; return "Internal programming error. Please report this bug";
case ISO_NULL_POINTER: 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: case ISO_OUT_OF_MEM:
return "Memory allocation error"; return "Memory allocation error";
case ISO_INTERRUPTED: case ISO_INTERRUPTED:
@ -117,7 +117,7 @@ const char *iso_error_to_msg(int errcode)
case ISO_WRONG_ARG_VALUE: case ISO_WRONG_ARG_VALUE:
return "Invalid parameter value"; return "Invalid parameter value";
case ISO_THREAD_ERROR: case ISO_THREAD_ERROR:
return "Can't create a needed thread"; return "Cannot create a needed thread";
case ISO_WRITE_ERROR: case ISO_WRITE_ERROR:
return "Write error"; return "Write error";
case ISO_BUF_READ_ERROR: case ISO_BUF_READ_ERROR:
@ -155,7 +155,7 @@ const char *iso_error_to_msg(int errcode)
case ISO_FILE_IS_NOT_SYMLINK: case ISO_FILE_IS_NOT_SYMLINK:
return "Not symlink used where a symlink is expected"; return "Not symlink used where a symlink is expected";
case ISO_FILE_SEEK_ERROR: case ISO_FILE_SEEK_ERROR:
return "Can't seek to specified location"; return "Cannot seek to specified location";
case ISO_FILE_IGNORED: case ISO_FILE_IGNORED:
return "File not supported in ECMA-119 tree and thus ignored"; return "File not supported in ECMA-119 tree and thus ignored";
case ISO_FILE_TOO_BIG: case ISO_FILE_TOO_BIG:
@ -163,15 +163,15 @@ const char *iso_error_to_msg(int errcode)
case ISO_FILE_CANT_WRITE: case ISO_FILE_CANT_WRITE:
return "File read error during image creation"; return "File read error during image creation";
case ISO_FILENAME_WRONG_CHARSET: 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: 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: case ISO_FILE_IMGPATH_WRONG:
return "File path break specification constraints and will be ignored"; return "File path break specification constraints and will be ignored";
case ISO_CHARSET_CONV_ERROR: case ISO_CHARSET_CONV_ERROR:
return "Charset conversion error"; return "Charset conversion error";
case ISO_MANGLE_TOO_MUCH_FILES: 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: case ISO_WRONG_PVD:
return "Wrong or damaged Primary Volume Descriptor"; return "Wrong or damaged Primary Volume Descriptor";
case ISO_WRONG_RR: case ISO_WRONG_RR:
@ -187,7 +187,7 @@ const char *iso_error_to_msg(int errcode)
case ISO_UNSUPPORTED_EL_TORITO: case ISO_UNSUPPORTED_EL_TORITO:
return "Unsupported El-Torito feature"; return "Unsupported El-Torito feature";
case ISO_ISOLINUX_CANT_PATCH: case ISO_ISOLINUX_CANT_PATCH:
return "Can't patch isolinux boot image"; return "Cannot patch isolinux boot image";
case ISO_UNSUPPORTED_SUSP: case ISO_UNSUPPORTED_SUSP:
return "Unsupported SUSP feature"; return "Unsupported SUSP feature";
case ISO_WRONG_RR_WARN: case ISO_WRONG_RR_WARN: