# HG changeset patch
# User masneyb
# Date 1039574013 0
# Node ID f4f6f44225d3046236e90bf4249771ae3dd8d87e
# Parent  89fd76d345e40370d918478e278ace4291ef6070
2002-12-10 Brian Masney <masneyb@gftp.org>

        * configure.in - check for grantpt function

        * lib/misc.c (pty[ms]_open) - use Unix98 PTY allocation if grantpt()
        is on the current system

        * lib/gftp.h - include stropts.h if grantpt is here

2002-12-5 Brian Masney <masneyb@gftp.org>

        * Release final 2.0.14

        * lib/Chagelog-old - brief updates since 2.0.13

diff -r 89fd76d345e4 -r f4f6f44225d3 ChangeLog
--- a/ChangeLog	Fri Dec 06 02:51:59 2002 +0000
+++ b/ChangeLog	Wed Dec 11 02:33:33 2002 +0000
@@ -1,3 +1,16 @@
+2002-12-10 Brian Masney <masneyb@gftp.org>
+	* configure.in - check for grantpt function
+
+	* lib/misc.c (pty[ms]_open) - use Unix98 PTY allocation if grantpt()
+	is on the current system
+
+	* lib/gftp.h - include stropts.h if grantpt is here
+
+2002-12-5 Brian Masney <masneyb@gftp.org>
+	* Release final 2.0.14
+
+	* lib/Chagelog-old - brief updates since 2.0.13
+
 2002-12-4 Brian Masney <masneyb@gftp.org>
 	* lib/misc.c (ssh_start_login_sequence) - if the word WARNING appears
 	in the banner, don't log into the server
@@ -379,7 +392,7 @@
 
 	* cvsclean - added this script
 
-	* *.[ch] - added $Id: ChangeLog,v 1.47 2002/12/06 02:28:18 masneyb Exp $ tags
+	* *.[ch] - added $Id: ChangeLog,v 1.48 2002/12/11 02:33:32 masneyb Exp $ tags
 
 	* debian/* - updated files from Debian maintainer
 
diff -r 89fd76d345e4 -r f4f6f44225d3 ChangeLog-old
--- a/ChangeLog-old	Fri Dec 06 02:51:59 2002 +0000
+++ b/ChangeLog-old	Wed Dec 11 02:33:33 2002 +0000
@@ -1,3 +1,11 @@
+Changes from 2.0.14rc1 to 2.0.14
+
+* Added key bindings to edit dialogs
+* Don't ask for SSH password in bookmarks if it's disabled in the config file
+* Binary/Ascii fixes for ext= lines in the config file
+* SSH - if the word WARNING appears in the banner, don't log into the server
+* Updated translations: French, German, Polish and Simplified Chinese
+
 Changes from 2.0.13 to 2.0.14rc1
 
 * GTK+ 2.0 improvements - i18n fixes, uses more stock icons
@@ -10,7 +18,7 @@
   remote site
 * DND improvements
 * Fixed several small bugs
-* Added/updated Translations: Bulgarian, Danish, Dutch, French, German,
+* Added/updated translations: Bulgarian, Danish, Dutch, French, German,
   Hungarian, Japanese, Korean, Polish, Romanian, Russian, Spanish,
   Traditional Chinese
 
diff -r 89fd76d345e4 -r f4f6f44225d3 configure.in
--- a/configure.in	Fri Dec 06 02:51:59 2002 +0000
+++ b/configure.in	Wed Dec 11 02:33:33 2002 +0000
@@ -54,7 +54,7 @@
 AC_TYPE_SIGNAL
 AC_FUNC_STRFTIME
 AC_FUNC_UTIME_NULL
-AC_CHECK_FUNCS(gai_strerror getaddrinfo getcwd gettimeofday getwd mkdir mktime putenv rmdir select socket strdup strstr strtod strtol uname)
+AC_CHECK_FUNCS(gai_strerror getaddrinfo getcwd gettimeofday getwd mkdir mktime putenv rmdir select socket strdup strstr strtod strtol uname grantpt)
 
 if test $enable_gtk20 = 1 ; then
   PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.0.0, found_glib20=1, found_glib20=0)
diff -r 89fd76d345e4 -r f4f6f44225d3 lib/gftp.h
--- a/lib/gftp.h	Fri Dec 06 02:51:59 2002 +0000
+++ b/lib/gftp.h	Wed Dec 11 02:33:33 2002 +0000
@@ -58,6 +58,10 @@
 #include <grp.h>
 #include <math.h>
 
+#ifdef HAVE_GRANTPT
+#include <stropts.h>
+#endif
+
 #ifdef HAVE_STRING_H
 #include <string.h>
 #else
diff -r 89fd76d345e4 -r f4f6f44225d3 lib/misc.c
--- a/lib/misc.c	Fri Dec 06 02:51:59 2002 +0000
+++ b/lib/misc.c	Wed Dec 11 02:33:33 2002 +0000
@@ -618,7 +618,7 @@
 
 #else /* !__sgi */
 
-#ifdef SYSV
+#ifdef HAVE_GRANTPT
 
   char *tempstr;
 
@@ -647,7 +647,7 @@
   strcpy (pts_name, tempstr);
   return (fd);
 
-#else /* !SYSV */
+#else /* !GRANTPT */
 
   char *pos1, *pos2;
 
@@ -678,7 +678,7 @@
 {
   int fds;
 
-#if !defined (SYSV) && !defined (__sgi)
+#if !defined (HAVE_GRANTPT) && !defined (__sgi)
 
   chmod (pts_name, S_IRUSR | S_IWUSR);
   chown (pts_name, getuid (), -1);
@@ -691,32 +691,14 @@
       return (-1);
     }
 
-#ifdef SYSV
-
-  if (ioctl (fds, I_PUSH, "ptem") < 0)
-    {
-      close (fdm);
-      close (fds);
-      return (-1);
-    }
-
-  if (ioctl (fds, I_PUSH, "ldterm") < 0)
-    {
-      close (fdm);
-      close (fds);
-      return (-1);
-    }
-
-  if (ioctl (fds, I_PUSH, "ttcompat") < 0)
-    {
-      close (fdm);
-      close (fds);
-      return (-1);
-    }
-
+#ifdef HAVE_GRANTPT
+  /* I intentionally ignore these errors */
+  ioctl (fds, I_PUSH, "ptem");
+  ioctl (fds, I_PUSH, "ldterm");
+  ioctl (fds, I_PUSH, "ttcompat");
 #endif
 
-#if !defined(SYSV) && !defined (__sgi) && defined(TIOCSCTTY) && !defined(CIBAUD)
+#if !defined(HAVE_GRANTPT) && !defined (__sgi) && defined(TIOCSCTTY) && !defined(CIBAUD)
 
   if (ioctl (fds, TIOCSCTTY, (char *) 0) < 0)
     {