[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH] misc: Allow %% to escape a single % in paths.


On Wed, Apr 03, 2019 at 01:03:10PM +0100, Richard W.M. Jones wrote:
> For example "%d/config%%1" is expanded to "~/.ssh/config%1".

Sorry, I forgot the s-o-b, so:

Signed-off-by: Richard W.M. Jones <rjones@xxxxxxxxxx>

>  src/misc.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/src/misc.c b/src/misc.c
> index dccb12a3..c918fc49 100644
> --- a/src/misc.c
> +++ b/src/misc.c
> @@ -819,6 +819,7 @@ char *ssh_path_expand_escape(ssh_session session, const char *s) {
>  
>      for (i = 0; *p != '\0'; p++) {
>          if (*p != '%') {
> +        escape:
>              buf[i] = *p;
>              i++;
>              if (i >= MAX_BUF_SIZE) {
> @@ -835,6 +836,8 @@ char *ssh_path_expand_escape(ssh_session session, const char *s) {
>          }
>  
>          switch (*p) {
> +            case '%':
> +                goto escape;
>              case 'd':
>                  x = strdup(session->opts.sshdir);
>                  break;
> -- 
> 2.20.1
> 

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
virt-top is 'top' for virtual machines.  Tiny program with many
powerful monitoring features, net stats, disk stats, logging, etc.
http://people.redhat.com/~rjones/virt-top

Follow-Ups:
Re: [PATCH] misc: Allow %% to escape a single % in paths.Jakub Jelen <jjelen@xxxxxxxxxx>
References:
[PATCH] misc: Allow %% to escape a single % in paths."Richard W.M. Jones" <rjones@xxxxxxxxxx>
Archive administrator: postmaster@lists.cynapses.org