===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/Attic/cmd-string.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -c -r1.22 -r1.23
*** src/usr.bin/tmux/Attic/cmd-string.c	2016/01/19 15:59:12	1.22
--- src/usr.bin/tmux/Attic/cmd-string.c	2016/10/10 21:51:39	1.23
***************
*** 1,4 ****
! /* $OpenBSD: cmd-string.c,v 1.22 2016/01/19 15:59:12 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-string.c,v 1.23 2016/10/10 21:51:39 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 31,44 ****
   * Parse a command from a string.
   */
  
! int	 cmd_string_getc(const char *, size_t *);
! void	 cmd_string_ungetc(size_t *);
! void	 cmd_string_copy(char **, char *, size_t *);
! char	*cmd_string_string(const char *, size_t *, char, int);
! char	*cmd_string_variable(const char *, size_t *);
! char	*cmd_string_expand_tilde(const char *, size_t *);
  
! int
  cmd_string_getc(const char *s, size_t *p)
  {
  	const u_char	*ucs = s;
--- 31,44 ----
   * Parse a command from a string.
   */
  
! static int	 cmd_string_getc(const char *, size_t *);
! static void	 cmd_string_ungetc(size_t *);
! static void	 cmd_string_copy(char **, char *, size_t *);
! static char	*cmd_string_string(const char *, size_t *, char, int);
! static char	*cmd_string_variable(const char *, size_t *);
! static char	*cmd_string_expand_tilde(const char *, size_t *);
  
! static int
  cmd_string_getc(const char *s, size_t *p)
  {
  	const u_char	*ucs = s;
***************
*** 48,54 ****
  	return (ucs[(*p)++]);
  }
  
! void
  cmd_string_ungetc(size_t *p)
  {
  	(*p)--;
--- 48,54 ----
  	return (ucs[(*p)++]);
  }
  
! static void
  cmd_string_ungetc(size_t *p)
  {
  	(*p)--;
***************
*** 173,179 ****
  	return (rval);
  }
  
! void
  cmd_string_copy(char **dst, char *src, size_t *len)
  {
  	size_t srclen;
--- 173,179 ----
  	return (rval);
  }
  
! static void
  cmd_string_copy(char **dst, char *src, size_t *len)
  {
  	size_t srclen;
***************
*** 187,193 ****
  	free(src);
  }
  
! char *
  cmd_string_string(const char *s, size_t *p, char endch, int esc)
  {
  	int	ch;
--- 187,193 ----
  	free(src);
  }
  
! static char *
  cmd_string_string(const char *s, size_t *p, char endch, int esc)
  {
  	int	ch;
***************
*** 245,251 ****
  	return (NULL);
  }
  
! char *
  cmd_string_variable(const char *s, size_t *p)
  {
  	int			ch, fch;
--- 245,251 ----
  	return (NULL);
  }
  
! static char *
  cmd_string_variable(const char *s, size_t *p)
  {
  	int			ch, fch;
***************
*** 314,320 ****
  	return (NULL);
  }
  
! char *
  cmd_string_expand_tilde(const char *s, size_t *p)
  {
  	struct passwd		*pw;
--- 314,320 ----
  	return (NULL);
  }
  
! static char *
  cmd_string_expand_tilde(const char *s, size_t *p)
  {
  	struct passwd		*pw;
***************
*** 337,343 ****
  		cp = user = xmalloc(strlen(s));
  		for (;;) {
  			last = cmd_string_getc(s, p);
! 			if (last == EOF || last == '/' || last == ' '|| last == '\t')
  				break;
  			*cp++ = last;
  		}
--- 337,346 ----
  		cp = user = xmalloc(strlen(s));
  		for (;;) {
  			last = cmd_string_getc(s, p);
! 			if (last == EOF ||
! 			    last == '/' ||
! 			    last == ' '||
! 			    last == '\t')
  				break;
  			*cp++ = last;
  		}