 @@ -1,14 +1,14 @@
-/*	$NetBSD: readline.c,v 1.93 2011/07/28 00:54:26 christos Exp $	*/
+/*	$NetBSD: readline.c,v 1.94 2011/07/28 17:33:39 christos Exp $	*/
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jaromir Dolecek.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -21,27 +21,27 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include "config.h"
 #if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: readline.c,v 1.93 2011/07/28 00:54:26 christos Exp $");
+__RCSID("$NetBSD: readline.c,v 1.94 2011/07/28 17:33:39 christos Exp $");
 #endif /* not lint && not SCCSID */
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdio.h>
 #include <dirent.h>
 #include <string.h>
 #include <pwd.h>
 #include <ctype.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <limits.h>
 #include <errno.h>
 @@ -1663,53 +1663,62 @@ tilde_expand(char *name)
 	return fn_tilde_expand(name);
+}
 char *
 filename_completion_function(const char *name, int state)
+{
 	return fn_filename_completion_function(name, state);
+}
 /*
  * a completion generator for usernames; returns _first_ username
  * which starts with supplied text
  * text contains a partial username preceded by random character
- * (usually '~'); state is ignored
+ * (usually '~'); state resets search from start (??? should we do that anyway)
  * it's callers responsibility to free returned value
  */
 char *
 username_completion_function(const char *text, int state)
+{
-	struct passwd *pwd, pwres;
+#if defined(HAVE_GETPW_R_POSIX) || defined(HAVE_GETPW_R_DRAFT)
 	struct passwd pwres;
 	char pwbuf[1024];
 #endif
 	struct passwd *pass = NULL;
 	if (text[0] == '\0')
 		return (NULL);
 	if (*text == '~')
 		text++;
 	if (state == 0)
 		setpwent();
-	while (getpwent_r(&pwres, pwbuf, sizeof(pwbuf), &pwd) == 0
+	while (
-	    && pwd != NULL && text[0] == pwd->pw_name[0]
+#if defined(HAVE_GETPW_R_POSIX) || defined(HAVE_GETPW_R_DRAFT)
-	    && strcmp(text, pwd->pw_name) == 0);
+	    getpwent_r(&pwres, pwbuf, sizeof(pwbuf), &pass) == 0 && pass != NULL
 #else
 	    (pass = getpwent()) != NULL
 #endif
 	    && text[0] == pass->pw_name[0]
 	    && strcmp(text, pass->pw_name) == 0)
 		continue;
-	if (pwd == NULL) {
+	if (pass == NULL) {
 		endpwent();
 		return NULL;
+	}
-	return strdup(pwd->pw_name);
+	return strdup(pass->pw_name);
+}
 /*
  * el-compatible wrapper to send TSTP on ^Z
  */
 /* ARGSUSED */
 static unsigned char
 _el_rl_tstp(EditLine *el __attribute__((__unused__)), int ch __attribute__((__unused__)))
+{
 	(void)kill(0, SIGTSTP);
 	return CC_NORM;
+}