-- 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: 018a7a76fcb9d2640b5f8fda98d9b20915ca07c3: path_to: revision_to:
commit 018a7a76fcb9d2640b5f8fda98d9b20915ca07c3 Author: Marc Lehmann <schmorp@schmorp.de> Date: Tue Jan 17 11:02:10 2006 +0000 *** empty log message *** diff --git a/src/init.C b/src/init.C
--- a/src/init.C +++ b/src/init.C @@ -1411,7 +1411,6 @@ rxvt_term::run_command (const char *const *argv) return; #endif -#ifndef __QNX__ /* spin off the command interpreter */ switch (cmd_pid = fork ()) { @@ -1468,14 +1467,6 @@ rxvt_term::run_command (const char *const *argv) pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */ break; } -#else /* __QNX__ uses qnxspawn () */ - fchmod (pty.tty, 0622); - fcntl (pty.tty, F_SETFD, FD_CLOEXEC); - fcntl (pty.pty, F_SETFD, FD_CLOEXEC); - - if (run_child (argv) == -1) - exit (EXIT_FAILURE); -#endif } /* ------------------------------------------------------------------------- * @@ -1529,7 +1520,6 @@ rxvt_term::run_child (const char *const *argv) sigemptyset (&ss); sigprocmask (SIG_SETMASK, &ss, 0); -#ifndef __QNX__ /* command interpreter path */ if (argv != NULL) { @@ -1565,62 +1555,6 @@ rxvt_term::run_child (const char *const *argv) /* no error message: STDERR is closed! */ } -#else /* __QNX__ uses qnxspawn () */ - - char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }; - char *command = NULL, fullcommand[_MAX_PATH]; - char **arg_v, *arg_a[2] = { NULL, NULL }; - - if (argv != NULL) - { - if (access (argv[0], X_OK) == -1) - { - if (strchr (argv[0], '/') == NULL) - { - searchenv (argv[0], "PATH", fullcommand); - - if (fullcommand[0] != '\0') - command = fullcommand; - } - - if (access (command, X_OK) == -1) - return -1; - } - else - command = argv[0]; - - arg_v = argv; - } - else - { - if ((command = getenv ("SHELL")) == NULL || *command == '\0') - command = "/bin/sh"; - - arg_a[0] = my_basename (command); - - if (OPTION (Opt_loginShell)) - { - login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char)); - - login[0] = '-'; - strcpy (&login[1], arg_a[0]); - arg_a[0] = login; - } - - arg_v = arg_a; - } - - iov_a[0] = iov_a[1] = iov_a[2] = pty.tty; - cmd_pid = qnx_spawn (0, 0, 0, -1, -1, - _SPAWN_SETSID | _SPAWN_TCSETPGRP, - command, arg_v, environ, iov_a, 0); - if (login) - free (login); - - pty.close_tty (); - return pty.pty; -#endif - return -1; } diff --git a/src/init.h b/src/init.h
--- a/src/init.h +++ b/src/init.h @@ -18,10 +18,6 @@ # define _NEW_TTY_CTRL /* to get proper defines in <termios.h> */ #endif -#ifdef __QNX__ /* autoconf someday */ -# include <process.h> -#endif - #ifdef TTY_GID_SUPPORT # include <grp.h> #endif @@ -143,7 +139,7 @@ # define O_NOCTTY 0 #endif #ifndef ONLCR -# define ONLCR 0 /* QNX, at least */ +# define ONLCR 0 #endif #define CONSOLE "/dev/console" /* console device */ diff --git a/src/logging.C b/src/logging.C
--- a/src/logging.C +++ b/src/logging.C @@ -14,7 +14,7 @@ * - extensive modifications * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com> * - lastlog support - * Copyright (c) 2004 Marc Lehmann <pcg@goof.com> + * Copyright (c) 2004-2006 Marc Lehmann <pcg@goof.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/ptytty.C b/src/ptytty.C
--- a/src/ptytty.C +++ b/src/ptytty.C @@ -224,7 +224,6 @@ get_tty (char *ttydev) static int control_tty (int fd_tty) { -#ifndef __QNX__ int fd; /* ---------------------------------------- */ @@ -288,7 +287,6 @@ control_tty (int fd_tty) return -1; /* fatal */ close (fd); /* ---------------------------------------- */ -#endif /* ! __QNX__ */ return 0; } diff --git a/src/ptytty.h b/src/ptytty.h
--- a/src/ptytty.h +++ b/src/ptytty.h @@ -48,11 +48,6 @@ # endif # endif -# ifdef __QNX__ -# include <sys/utsname.h> -# define ut_name ut_user -# endif - #endif enum rxvt_privaction { IGNORE = 'i', SAVE = 's', RESTORE = 'r' };
-----END OF PAGE-----
-- Response ended
-- Page fetched on Sun Jun 2 09:42:56 2024