 @@ -1,14 +1,14 @@
-/*	$NetBSD: filecomplete.c,v 1.23 2010/12/06 00:05:38 dholland Exp $	*/
+/*	$NetBSD: filecomplete.c,v 1.24 2011/07/28 00:50:23 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,48 +21,45 @@
  * 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: filecomplete.c,v 1.23 2010/12/06 00:05:38 dholland Exp $");
+__RCSID("$NetBSD: filecomplete.c,v 1.24 2011/07/28 00:50:23 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>
 #include <fcntl.h>
 #ifdef HAVE_VIS_H
 #include <vis.h>
 #else
-#include "np/vis.h"
+#include "vis.h"
 #endif
 #ifdef HAVE_ALLOCA_H
 #include <alloca.h>
 #endif
 #include "el.h"
 #include "fcns.h"		/* for EL_NUM_FCNS */
 #include "histedit.h"
 #include "filecomplete.h"
 static const Char break_chars[] = { ' ', '\t', '\n', '"', '\\', '\'', '`', '@',
     '$', '>', '<', '=', ';', '|', '&', '{', '(', '\0' };
 /********************************/
 /* completion functions */
 @@ -88,31 +85,44 @@ fn_tilde_expand(const char *txt)
 	if (temp == NULL) {
 		temp = strdup(txt + 1);
 		if (temp == NULL)
 			return NULL;
 	} else {
 		len = temp - txt + 1;	/* text until string after slash */
 		temp = malloc(len);
 		if (temp == NULL)
 			return NULL;
 		(void)strncpy(temp, txt + 1, len - 2);
 		temp[len - 2] = '\0';
+	}
 	if (temp[0] == 0) {
-		if (getpwuid_r(getuid(), &pwres, pwbuf, sizeof(pwbuf), &pass) != 0)
+#ifdef HAVE_GETPW_R_POSIX
-			pass = NULL;
+ 		if (getpwuid_r(getuid(), &pwres, pwbuf, sizeof(pwbuf),
 		    &pass) != 0)
  			pass = NULL;
 #elif HAVE_GETPW_R_DRAFT
 		pass = getpwuid_r(getuid(), &pwres, pwbuf, sizeof(pwbuf));
 #else
 		pass = getpwuid(getuid());
 #endif
 	} else {
 #ifdef HAVE_GETPW_R_POSIX
 		if (getpwnam_r(temp, &pwres, pwbuf, sizeof(pwbuf), &pass) != 0)
 			pass = NULL;
 #elif HAVE_GETPW_R_DRAFT
 		pass = getpwnam_r(temp, &pwres, pwbuf, sizeof(pwbuf));
 #else
 		pass = getpwnam(temp);
 #endif
+	}
 	free(temp);		/* value no more needed */
 	if (pass == NULL)
 		return (strdup(txt));
 	/* update pointer txt to point at string immedially following */
 	/* first slash */
 	txt += len;
 	temp = malloc(strlen(pass->pw_dir) + 1 + strlen(txt) + 1);
 	if (temp == NULL)
 		return NULL;
 	(void)sprintf(temp, "%s/%s", pass->pw_dir, txt);
 @@ -338,27 +348,27 @@ _fn_qsort_string_compare(const void *i1,
 /*
  * Display list of strings in columnar format on readline's output stream.
  * 'matches' is list of strings, 'num' is number of strings in 'matches',
  * 'width' is maximum length of string in 'matches'.
+ *
  * matches[0] is not one of the match strings, but it is counted in
  * num, so the strings are matches[1] *through* matches[num-1].
  */
 void
 fn_display_match_list (EditLine *el, char **matches, size_t num, size_t width)
+{
 	size_t line, lines, col, cols, thisguy;
-	int screenwidth = el->el_term.t_size.h;
+	int screenwidth = el->el_terminal.t_size.h;
 	/* Ignore matches[0]. Avoid 1-based array logic below. */
 	matches++;
 	num--;
 	/*
 	 * Find out how many entries can be put on one line; count
 	 * with one space between strings the same way it's printed.
 	 */
 	cols = screenwidth / (width + 1);
 	if (cols == 0)
 		cols = 1;
 @@ -422,31 +432,27 @@ fn_complete(EditLine *el,
 		complet_func = fn_filename_completion_function;
 	if (!app_func)
 		app_func = append_char_function;
 	/* We now look backwards for the start of a filename/variable word */
 	li = FUN(el,line)(el);
 	ctemp = li->cursor;
 	while (ctemp > li->buffer
 	    && !Strchr(word_break, ctemp[-1])
 	    && (!special_prefixes || !Strchr(special_prefixes, ctemp[-1]) ) )
 		ctemp--;
 	len = li->cursor - ctemp;
 #if defined(__SSP__) || defined(__SSP_ALL__)
 	temp = malloc(sizeof(*temp) * (len + 1));
 #else
 	temp = alloca(sizeof(*temp) * (len + 1));
 #endif
 	(void)Strncpy(temp, ctemp, len);
 	temp[len] = '\0';
 	/* these can be used by function called in completion_matches() */
 	/* or (*attempted_completion_function)() */
 	if (point != 0)
 		*point = (int)(li->cursor - li->buffer);
 	if (end != NULL)
 		*end = (int)(li->lastchar - li->buffer);
 	if (attempted_completion_function) {
 		int cur_off = (int)(li->cursor - li->buffer);
 		matches = (*attempted_completion_function) (ct_encode_string(temp, &el->el_scratch),
 @@ -541,29 +547,27 @@ fn_complete(EditLine *el,
 		} else {
 			/* lcd is not a valid object - further specification */
 			/* is needed */
 			el_beep(el);
 			retval = CC_NORM;
+		}
 		/* free elements of array and the array itself */
 		for (i = 0; matches[i]; i++)
 			free(matches[i]);
 		free(matches);
 		matches = NULL;
+	}
 #if defined(__SSP__) || defined(__SSP_ALL__)
 	free(temp);
 #endif
 	return retval;
+}
 /*
  * el-compatible wrapper around rl_complete; needed for key binding
  */
 /* ARGSUSED */
 unsigned char
 _el_fn_complete(EditLine *el, int ch __attribute__((__unused__)))
+{
 	return (unsigned char)fn_complete(el, NULL, NULL,
 	    break_chars, NULL, NULL, 100,
 	    NULL, NULL, NULL, NULL);