|
Lucio Andrés Illanes Albornoz |
6dbfcb |
diff -ru zsh-5.7.1.orig/Src/utils.c zsh-5.7.1/Src/utils.c
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
--- zsh-5.7.1.orig/Src/utils.c 2019-02-01 01:37:34.000000000 +0100
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
+++ zsh-5.7.1/Src/utils.c 2019-10-19 21:46:34.155130850 +0200
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
@@ -30,6 +30,8 @@
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
#include "zsh.mdh"
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
#include "utils.pro"
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
+#include <ncurses/term.h>
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
+
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
/* name of script being sourced */
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
/**/
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
diff -ru zsh-5.7.1.orig/Src/prototypes.h zsh-5.7.1/Src/prototypes.h
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
--- zsh-5.7.1.orig/Src/prototypes.h 2017-12-04 15:09:36.000000000 +0100
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
+++ zsh-5.7.1/Src/prototypes.h 2019-10-19 21:57:37.140589499 +0200
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
@@ -1,134 +1,2 @@
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-/*
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
- * prototypes.h - prototypes header file
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
- *
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
- * This file is part of zsh, the Z shell.
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
- *
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
- * Copyright (c) 1992-1997 Paul Falstad
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
- * All rights reserved.
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
- *
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
- * Permission is hereby granted, without written agreement and without
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
- * license or royalty fees, to use, copy, modify, and distribute this
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
- * software and to distribute modified versions of this software for any
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
- * purpose, provided that the above copyright notice and the following
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
- * two paragraphs appear in all copies of this software.
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
- *
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
- * In no event shall Paul Falstad or the Zsh Development Group be liable
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
- * to any party for direct, indirect, special, incidental, or consequential
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
- * damages arising out of the use of this software and its documentation,
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
- * even if Paul Falstad and the Zsh Development Group have been advised of
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
- * the possibility of such damage.
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
- *
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
- * Paul Falstad and the Zsh Development Group specifically disclaim any
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
- * warranties, including, but not limited to, the implied warranties of
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
- * merchantability and fitness for a particular purpose. The software
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
- * provided hereunder is on an "as is" basis, and Paul Falstad and the
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
- * Zsh Development Group have no obligation to provide maintenance,
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
- * support, updates, enhancements, or modifications.
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
- *
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
- */
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-#ifndef HAVE_STDLIB_H
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-char *malloc _((size_t));
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-char *realloc _((void *, size_t));
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-char *calloc _((size_t, size_t));
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-#endif
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-#if !(defined(USES_TERMCAP_H) || defined(USES_TERM_H))
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-/*
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
- * These prototypes are only used where we don't have the
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
- * headers. In some cases they need tweaking.
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
- * TBD: we'd much prefer to get hold of the header where
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
- * these are defined.
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
- */
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-#ifdef _AIX
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-#define TC_CONST const
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-#else
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-#define TC_CONST
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-#endif
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-extern int tgetent _((char *bp, TC_CONST char *name));
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-extern int tgetnum _((char *id));
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-extern int tgetflag _((char *id));
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-extern char *tgetstr _((char *id, char **area));
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-extern int tputs _((TC_CONST char *cp, int affcnt, int (*outc) (int)));
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-#undef TC_CONST
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-#endif
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-/*
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
- * Some systems that do have termcap headers nonetheless don't
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
- * declare tgoto, so we detect if that is missing separately.
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
- */
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-#ifdef TGOTO_PROTO_MISSING
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-char *tgoto(const char *cap, int col, int row);
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-#endif
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-/* MISSING PROTOTYPES FOR VARIOUS OPERATING SYSTEMS */
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-#if defined(__hpux) && defined(_HPUX_SOURCE) && !defined(_XPG4_EXTENDED)
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-# define SELECT_ARG_2_T int *
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-#else
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-# define SELECT_ARG_2_T fd_set *
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-#endif
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-#ifdef __osf__
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-char *mktemp _((char *));
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-#endif
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-#if defined(__osf__) && defined(__alpha) && defined(__GNUC__)
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-/* Digital cc does not need these prototypes, gcc does need them */
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-# ifndef HAVE_IOCTL_PROTO
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-int ioctl _((int d, unsigned long request, void *argp));
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-# endif
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-# ifndef HAVE_MKNOD_PROTO
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-int mknod _((const char *pathname, int mode, dev_t device));
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-# endif
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-int nice _((int increment));
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-int select _((int nfds, fd_set * readfds, fd_set * writefds, fd_set * exceptfds, struct timeval *timeout));
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-#endif
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-#if defined(DGUX) && defined(__STDC__)
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-/* Just plain missing. */
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-extern int getrlimit _((int resource, struct rlimit *rlp));
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-extern int setrlimit _((int resource, const struct rlimit *rlp));
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-extern int getrusage _((int who, struct rusage *rusage));
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-extern int gettimeofday _((struct timeval *tv, struct timezone *tz));
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-extern int wait3 _((union wait *wait_status, int options, struct rusage *rusage));
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-extern int getdomainname _((char *name, int maxlength));
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-extern int select _((int nfds, fd_set * readfds, fd_set * writefds, fd_set * exceptfds, struct timeval *timeout));
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-#endif /* DGUX and __STDC__ */
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-#ifdef __NeXT__
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-extern pid_t getppid(void);
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-#endif
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-#if defined(__sun__) && !defined(__SVR4) /* SunOS */
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-extern char *strerror _((int errnum));
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-#endif
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-/**************************************************/
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-/*** prototypes for functions built in compat.c ***/
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-#ifndef HAVE_STRSTR
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-extern char *strstr _((const char *s, const char *t));
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-#endif
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-#ifndef HAVE_GETHOSTNAME
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-extern int gethostname _((char *name, size_t namelen));
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-#endif
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-#ifndef HAVE_GETTIMEOFDAY
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-extern int gettimeofday _((struct timeval *tv, struct timezone *tz));
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-#endif
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-#ifndef HAVE_DIFFTIME
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-extern double difftime _((time_t t2, time_t t1));
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-#endif
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-#ifndef HAVE_STRERROR
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-extern char *strerror _((int errnum));
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-#endif
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-/*** end of prototypes for functions in compat.c ***/
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-/***************************************************/
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-#ifndef HAVE_MEMMOVE
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-extern void bcopy _((const void *, void *, size_t));
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
-#endif
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
+/* this is really questionable. */
|
|
Lucio Andrés Illanes Albornoz |
6dbfcb |
+#define SELECT_ARG_2_T fd_set *
|