mirror of
https://github.com/tmux/tmux.git
synced 2025-11-01 15:06:06 +00:00
Tweak error messages so that file name isn't modified when we capitalize
the first letter, from Pavel Roskin in GitHub issue 4666.
This commit is contained in:
@@ -66,7 +66,7 @@ cmd_load_buffer_done(__unused struct client *c, const char *path, int error,
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
if (error != 0)
|
if (error != 0)
|
||||||
cmdq_error(item, "%s: %s", path, strerror(error));
|
cmdq_error(item, "%s: %s", strerror(error), path);
|
||||||
else if (bsize != 0) {
|
else if (bsize != 0) {
|
||||||
copy = xmalloc(bsize);
|
copy = xmalloc(bsize);
|
||||||
memcpy(copy, bdata, bsize);
|
memcpy(copy, bdata, bsize);
|
||||||
|
|||||||
@@ -66,7 +66,7 @@ cmd_save_buffer_done(__unused struct client *c, const char *path, int error,
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
if (error != 0)
|
if (error != 0)
|
||||||
cmdq_error(item, "%s: %s", path, strerror(error));
|
cmdq_error(item, "%s: %s", strerror(error), path);
|
||||||
cmdq_continue(item);
|
cmdq_continue(item);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -115,7 +115,7 @@ cmd_source_file_done(struct client *c, const char *path, int error,
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
if (error != 0)
|
if (error != 0)
|
||||||
cmdq_error(item, "%s: %s", path, strerror(error));
|
cmdq_error(item, "%s: %s", strerror(error), path);
|
||||||
else if (bsize != 0) {
|
else if (bsize != 0) {
|
||||||
if (load_cfg_from_buffer(bdata, bsize, path, c, cdata->after,
|
if (load_cfg_from_buffer(bdata, bsize, path, c, cdata->after,
|
||||||
target, cdata->flags, &new_item) < 0)
|
target, cdata->flags, &new_item) < 0)
|
||||||
@@ -234,7 +234,7 @@ cmd_source_file_exec(struct cmd *self, struct cmdq_item *item)
|
|||||||
error = strerror(ENOMEM);
|
error = strerror(ENOMEM);
|
||||||
else
|
else
|
||||||
error = strerror(EINVAL);
|
error = strerror(EINVAL);
|
||||||
cmdq_error(item, "%s: %s", path, error);
|
cmdq_error(item, "%s: %s", error, path);
|
||||||
retval = CMD_RETURN_ERROR;
|
retval = CMD_RETURN_ERROR;
|
||||||
}
|
}
|
||||||
globfree(&g);
|
globfree(&g);
|
||||||
|
|||||||
Reference in New Issue
Block a user