===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/sndioctl/sndioctl.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -c -r1.11 -r1.12
*** src/usr.bin/sndioctl/sndioctl.c	2020/05/25 09:14:50	1.11
--- src/usr.bin/sndioctl/sndioctl.c	2020/06/18 05:28:49	1.12
***************
*** 1,4 ****
! /*	$OpenBSD: sndioctl.c,v 1.11 2020/05/25 09:14:50 mestre Exp $	*/
  /*
   * Copyright (c) 2014-2020 Alexandre Ratchov <alex@caoua.org>
   *
--- 1,4 ----
! /*	$OpenBSD: sndioctl.c,v 1.12 2020/06/18 05:28:49 ratchov Exp $	*/
  /*
   * Copyright (c) 2014-2020 Alexandre Ratchov <alex@caoua.org>
   *
***************
*** 69,85 ****
  int i_flag = 0, v_flag = 0, m_flag = 0, n_flag = 0, q_flag = 0;
  
  static inline int
! isname_first(int c)
  {
! 	return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
  }
  
- static inline int
- isname_next(int c)
- {
- 	return isname_first(c) || (c >= '0' && c <= '9') || (c == '_');
- }
- 
  static int
  ftoi(float f)
  {
--- 69,81 ----
  int i_flag = 0, v_flag = 0, m_flag = 0, n_flag = 0, q_flag = 0;
  
  static inline int
! isname(int c)
  {
! 	return (c == '_') ||
! 	    (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') ||
! 	    (c >= '0' && c <= '9');
  }
  
  static int
  ftoi(float f)
  {
***************
*** 481,491 ****
  	char *p = *line;
  	unsigned len = 0;
  
! 	if (!isname_first(*p)) {
! 		fprintf(stderr, "letter expected near '%s'\n", p);
  		return 0;
  	}
! 	while (isname_next(*p)) {
  		if (len >= SIOCTL_NAMEMAX - 1) {
  			name[SIOCTL_NAMEMAX - 1] = '\0';
  			fprintf(stderr, "%s...: too long\n", name);
--- 477,487 ----
  	char *p = *line;
  	unsigned len = 0;
  
! 	if (!isname(*p)) {
! 		fprintf(stderr, "letter or digit expected near '%s'\n", p);
  		return 0;
  	}
! 	while (isname(*p)) {
  		if (len >= SIOCTL_NAMEMAX - 1) {
  			name[SIOCTL_NAMEMAX - 1] = '\0';
  			fprintf(stderr, "%s...: too long\n", name);