1,2c1
< /* $FreeBSD: head/contrib/libreadline/shell.c 136758 2004-10-21 20:02:02Z peter $ */
<
---
> /* $FreeBSD: head/contrib/libreadline/shell.c 157188 2006-03-27 23:11:32Z ache $ */
52a52
> #if defined (HAVE_FCNTL_H)
53a54,55
> #endif
> #if defined (HAVE_PWD_H)
54a57
> #endif
62c65
< #if !defined (HAVE_GETPW_DECLS)
---
> #if defined (HAVE_GETPWUID) && !defined (HAVE_GETPW_DECLS)
64c67
< #endif /* !HAVE_GETPW_DECLS */
---
> #endif /* HAVE_GETPWUID && !HAVE_GETPW_DECLS */
127,136c130
< #if defined (HAVE_PUTENV)
< b = (char *)xmalloc (INT_STRLEN_BOUND (int) + sizeof ("LINES=") + 1);
< sprintf (b, "LINES=%d", lines);
< putenv (b);
<
< b = (char *)xmalloc (INT_STRLEN_BOUND (int) + sizeof ("COLUMNS=") + 1);
< sprintf (b, "COLUMNS=%d", cols);
< putenv (b);
< #else /* !HAVE_PUTENV */
< # if defined (HAVE_SETENV)
---
> #if defined (HAVE_SETENV)
146,147c140,150
< # endif /* HAVE_SETENV */
< #endif /* !HAVE_PUTENV */
---
> #else /* !HAVE_SETENV */
> # if defined (HAVE_PUTENV)
> b = (char *)xmalloc (INT_STRLEN_BOUND (int) + sizeof ("LINES=") + 1);
> sprintf (b, "LINES=%d", lines);
> putenv (b);
>
> b = (char *)xmalloc (INT_STRLEN_BOUND (int) + sizeof ("COLUMNS=") + 1);
> sprintf (b, "COLUMNS=%d", cols);
> putenv (b);
> # endif /* HAVE_PUTENV */
> #endif /* !HAVE_SETENV */
163a167
> #if defined (HAVE_GETPWUID)
166a171
> #endif
179a185
> #if defined (HAVE_FCNTL)
199a206
> #endif