External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-03 11:35:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

virsh: remove trailing whitespace even when editing the description

Browse Source 
When editing the title of a domain or network via the `desc` or
`net-desc` commands, we strip the final newline that is added by some
editors.

Do the same when editing the description as well.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Ján Tomko 2024-02-28 13:33:12 +01:00
parent 2f22d2a1ef
commit 3b31aeaae3
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/virsh-domain.c
View File

@ -8525,10 +8525,9 @@ cmdDesc(vshControl *ctl, const vshCmd *cmd)
return false; return false;
/* strip a possible newline at the end of file; some /* strip a possible newline at the end of file; some
* editors enforce a newline, this makes editing the title * editors enforce a newline, this makes editing
* more convenient */ * more convenient */
if (title && if ((tmpstr = strrchr(desc_edited, '\n')) &&
(tmpstr = strrchr(desc_edited, '\n')) &&
*(tmpstr+1) == '\0') *(tmpstr+1) == '\0')
*tmpstr = '\0'; *tmpstr = '\0';

3
tools/virsh-network.c
View File

@ -481,8 +481,7 @@ cmdNetworkDesc(vshControl *ctl, const vshCmd *cmd)
/* strip a possible newline at the end of file; some /* strip a possible newline at the end of file; some
* editors enforce a newline, this makes editing the title * editors enforce a newline, this makes editing the title
* more convenient */ * more convenient */
if (title && if ((tmpstr = strrchr(desc_edited, '\n')) &&
(tmpstr = strrchr(desc_edited, '\n')) &&
*(tmpstr+1) == '\0') *(tmpstr+1) == '\0')
*tmpstr = '\0'; *tmpstr = '\0';