-- Leo's gemini proxy

-- Connecting to git.thebackupbox.net:1965...

-- Connected

-- Sending request

-- Meta line: 20 text/gemini

repo: rxvt-unicode-sixel
action: commit
revision:
path_from:
revision_from: a1644bf06f8ac0a0ac8daeb3942214e3bb18834c:
path_to:
revision_to:

commit a1644bf06f8ac0a0ac8daeb3942214e3bb18834c
Author: Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
Date:   Wed Jul 21 08:46:13 2010 +0000

    libptytty sync

diff --git a/ptytty.m4 b/ptytty.m4

--- a/ptytty.m4
+++ b/ptytty.m4
@@ -26,20 +26,9 @@ AC_CHECK_FUNCS( \

 have_clone=no

-AC_MSG_CHECKING(for /dev/ptym/clone)
-if test -e /dev/ptym/clone; then
-  AC_MSG_RESULT(yes)
-  AC_DEFINE(HAVE_DEV_CLONE, 1, [Define to 1 if you have /dev/ptym/clone])
-  AC_DEFINE(CLONE_DEVICE, "/dev/ptym/clone", [clone device filename])
-  have_clone=yes
-else
-  AC_MSG_RESULT(no)
-fi
-
 AC_MSG_CHECKING(for /dev/ptc)
 if test -e /dev/ptc; then
   AC_MSG_RESULT(yes)
-  AC_DEFINE(HAVE_DEV_PTC, 1, [Define to 1 if you have /dev/ptc])
   AC_DEFINE(CLONE_DEVICE, "/dev/ptc", [clone device filename])
   have_clone=yes
 else
@@ -75,7 +64,7 @@ if test x$ac_cv_func_getpt = xyes -o x$ac_cv_func_posix_openpt = xyes -o x$have_
 fi

 if test -z "$unix98_pty"; then
-  AC_CHECK_FUNCS(openpty, [], [AC_CHECK_LIB(util, openpty, [AC_DEFINE(HAVE_OPENPTY) LIBS="$LIBS -lutil"])])
+  AC_SEARCH_LIBS(openpty, util, AC_DEFINE(HAVE_OPENPTY, 1, ""))
 fi
 ])

@@ -242,53 +231,6 @@ fi

 dnl# --------------------------------------------------------------------------

-dnl# find utmpx - if a utmp file exists at the same location and is more than
-dnl# a day newer, then dump the utmpx.  People leave lots of junk around.
-AC_CACHE_CHECK(where utmpx is located, pt_cv_path_utmpx,
-[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <utmpx.h>
-#include <errno.h>
-#include <sys/stat.h>
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-main()
-{
-    char **u, *p, *utmplist[] = {
-#ifdef UTMPX_FILE
-	UTMPX_FILE,
-#endif
-#ifdef _PATH_UTMPX
-	_PATH_UTMPX,
-#endif
-    "/var/adm/utmpx", "/etc/utmpx", NULL };
-    FILE *a, *f=fopen("conftestval", "w");
-    struct stat statu, statux;
-    if (!f) exit(1);
-    for (u = utmplist; *u; u++) {
-	if ((a = fopen(*u, "r")) != NULL || errno == EACCES) {
-	    if (stat(*u, &statux) < 0)
-		continue;
-	    p = strdup(*u);
-	    p[strlen(p) - 1] = '\0';
-	    if (stat(p, &statu) >= 0
-		&& (statu.st_mtime - statux.st_mtime > 86400))
-		continue;
-	    fprintf(f, "%s\n", *u);
-	    exit(0);
-	}
-    }
-    exit(0);
-}]])],[pt_cv_path_utmpx=`cat conftestval`],[pt_cv_path_utmpx=],[dnl
-  AC_MSG_WARN(Define UTMPX_FILE in config.h manually)])])
-if test x$pt_cv_path_utmpx != x; then
-  AC_DEFINE_UNQUOTED(UTMPX_FILE, "$pt_cv_path_utmpx", Define location of utmpx)
-fi
-
-dnl# --------------------------------------------------------------------------
-
 dnl# find wtmp
 AC_CACHE_CHECK(where wtmp is located, pt_cv_path_wtmp,
 [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h>
diff --git a/src/fdpass.C b/src/fdpass.C

--- a/src/fdpass.C
+++ b/src/fdpass.C
@@ -23,7 +23,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *----------------------------------------------------------------------*/

-#include "../config.h"
+#include "config.h"

 #include <cstddef> // needed by broken bsds for NULL used in sys/uio.h
 #include <cstdlib>
diff --git a/src/logging.C b/src/logging.C

--- a/src/logging.C
+++ b/src/logging.C
@@ -35,7 +35,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *----------------------------------------------------------------------*/

-#include "../config.h"
+#include "config.h"

 #include "ptytty.h"

@@ -164,9 +164,7 @@ update_lastlog (const char *fname, const char *pty, const char *host)
     return;
   if (S_ISDIR (st.st_mode))
     {
-      sprintf (lastlogfile, "%.*s/%.*s",
-               (int)(sizeof (lastlogfile) - sizeof (pwent->pw_name) - 2), fname,
-               (int)sizeof (pwent->pw_name),
+      snprintf (lastlogfile, sizeof (lastlogfile), "%s/%s", fname,
                (!pwent->pw_name || pwent->pw_name[0] == '\0') ? "unknown"
                : pwent->pw_name);
       if ((fd = open (lastlogfile, O_WRONLY | O_CREAT, 0644)) >= 0)
diff --git a/src/proxy.C b/src/proxy.C

--- a/src/proxy.C
+++ b/src/proxy.C
@@ -23,7 +23,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *---------------------------------------------------------------------*/

-#include "../config.h"
+#include "config.h"

 #include "ptytty.h"

diff --git a/src/ptytty.C b/src/ptytty.C

--- a/src/ptytty.C
+++ b/src/ptytty.C
@@ -25,7 +25,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *---------------------------------------------------------------------*/

-#include "../config.h"
+#include "config.h"

 #include "ptytty.h"

@@ -139,38 +139,6 @@
     return -1;
   }

-#elif defined(HAVE_DEV_PTC)
-
-  static int
-  get_pty (int *fd_tty, char **ttydev)
-  {
-    int pfd;
-
-    if ((pfd = open ("/dev/ptc", O_RDWR | O_NOCTTY, 0)) >= 0)
-      {
-        *ttydev = strdup (ttyname (pfd));
-        return pfd;
-      }
-
-    return -1;
-  }
-
-#elif defined(HAVE_DEV_CLONE)
-
-  static int
-  get_pty (int *fd_tty, char **ttydev)
-  {
-    int pfd;
-
-    if ((pfd = open ("/dev/ptym/clone", O_RDWR | O_NOCTTY, 0)) >= 0)
-      {
-        *ttydev = strdup (ptsname (pfd));
-        return pfd;
-      }
-
-    return -1;
-  }
-
 #else

   /* Based on the code in openssh/openbsd-compat/bsd-openpty.c */

-- Response ended

-- Page fetched on Sun Jun 2 10:30:37 2024