aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-25 10:54:51 -04:00
Code

patch 8.2.0680: PTYGROUP and PTYMODE are unused

Browse Source 
Problem:    PTYGROUP and PTYMODE are unused.
Solution:   Remove from autoconf. (closes #6024)
This commit is contained in:
Bram Moolenaar 2020-05-02 18:14:37 +02:00
parent bf67ea1af0
commit 01f731e97c
4 changed files with 2 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
src/auto/configure vendored
View File

@ -12476,103 +12476,6 @@ else
$as_echo "don't know" >&6; } $as_echo "don't know" >&6; }
fi fi
rm -f conftest_grp
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default tty permissions/group" >&5
$as_echo_n "checking default tty permissions/group... " >&6; }
if ${vim_cv_tty_group+:} false; then :
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
as_fn_error $? "cross-compiling: please set 'vim_cv_tty_group' and 'vim_cv_tty_mode'" "$LINENO" 5
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
# include <stdlib.h>
# include <stddef.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <sys/stat.h>
#include <stdio.h>
main()
{
struct stat sb;
char *x,*ttyname();
int om, m;
FILE *fp;
if (!(x = ttyname(0))) exit(1);
if (stat(x, &sb)) exit(1);
om = sb.st_mode;
if (om & 002) exit(0);
m = system("mesg y");
if (m == -1 || m == 127) exit(1);
if (stat(x, &sb)) exit(1);
m = sb.st_mode;
if (chmod(x, om)) exit(1);
if (m & 002) exit(0);
if (sb.st_gid == getgid()) exit(1);
if (!(fp=fopen("conftest_grp", "w")))
exit(1);
fprintf(fp, "%d\n", sb.st_gid);
fclose(fp);
exit(0);
}
_ACEOF
if ac_fn_c_try_run "$LINENO"; then :
if test -f conftest_grp; then
vim_cv_tty_group=`cat conftest_grp`
if test "x$vim_cv_tty_mode" = "x" ; then
vim_cv_tty_mode=0620
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: pty mode: $vim_cv_tty_mode, group: $vim_cv_tty_group" >&5
$as_echo "pty mode: $vim_cv_tty_mode, group: $vim_cv_tty_group" >&6; }
else
vim_cv_tty_group=world
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ptys are world accessible" >&5
$as_echo "ptys are world accessible" >&6; }
fi
else
vim_cv_tty_group=world
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: can't determine - assume ptys are world accessible" >&5
$as_echo "can't determine - assume ptys are world accessible" >&6; }
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vim_cv_tty_group" >&5
$as_echo "$vim_cv_tty_group" >&6; }
rm -f conftest_grp
if test "x$vim_cv_tty_group" != "xworld" ; then
cat >>confdefs.h <<_ACEOF
#define PTYGROUP $vim_cv_tty_group
_ACEOF
if test "x$vim_cv_tty_mode" = "x" ; then
as_fn_error $? "It seems you're cross compiling and have 'vim_cv_tty_group' set, please also set the environment variable 'vim_cv_tty_mode' to the correct mode (probably 0620)" "$LINENO" 5
else
$as_echo "#define PTYMODE 0620" >>confdefs.h
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
$as_echo_n "checking return type of signal handlers... " >&6; } $as_echo_n "checking return type of signal handlers... " >&6; }

6
src/config.h.in
View File

@ -126,12 +126,6 @@
#undef PTYRANGE0 #undef PTYRANGE0
#undef PTYRANGE1 #undef PTYRANGE1
/* Define mode for pty */
#undef PTYMODE
/* Define group for pty */
#undef PTYGROUP
/* Define as the return type of signal handlers (int or void). */ /* Define as the return type of signal handlers (int or void). */
#undef RETSIGTYPE #undef RETSIGTYPE

71
src/configure.ac
View File

@ -3673,77 +3673,6 @@ else
AC_MSG_RESULT([don't know]) AC_MSG_RESULT([don't know])
fi fi
dnl **** pty mode/group handling ****
dnl
dnl support provided by Luke Mewburn <lm@rmit.edu.au>, 931222
rm -f conftest_grp
AC_CACHE_CHECK([default tty permissions/group], [vim_cv_tty_group],
[
AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
# include <stdlib.h>
# include <stddef.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <sys/stat.h>
#include <stdio.h>
main()
{
struct stat sb;
char *x,*ttyname();
int om, m;
FILE *fp;
if (!(x = ttyname(0))) exit(1);
if (stat(x, &sb)) exit(1);
om = sb.st_mode;
if (om & 002) exit(0);
m = system("mesg y");
if (m == -1 || m == 127) exit(1);
if (stat(x, &sb)) exit(1);
m = sb.st_mode;
if (chmod(x, om)) exit(1);
if (m & 002) exit(0);
if (sb.st_gid == getgid()) exit(1);
if (!(fp=fopen("conftest_grp", "w")))
exit(1);
fprintf(fp, "%d\n", sb.st_gid);
fclose(fp);
exit(0);
}
]])],[
if test -f conftest_grp; then
vim_cv_tty_group=`cat conftest_grp`
if test "x$vim_cv_tty_mode" = "x" ; then
vim_cv_tty_mode=0620
fi
AC_MSG_RESULT([pty mode: $vim_cv_tty_mode, group: $vim_cv_tty_group])
else
vim_cv_tty_group=world
AC_MSG_RESULT([ptys are world accessible])
fi
],[
vim_cv_tty_group=world
AC_MSG_RESULT([can't determine - assume ptys are world accessible])
],[
AC_MSG_ERROR(cross-compiling: please set 'vim_cv_tty_group' and 'vim_cv_tty_mode')
])
])
rm -f conftest_grp
if test "x$vim_cv_tty_group" != "xworld" ; then
AC_DEFINE_UNQUOTED(PTYGROUP,$vim_cv_tty_group)
if test "x$vim_cv_tty_mode" = "x" ; then
AC_MSG_ERROR([It seems you're cross compiling and have 'vim_cv_tty_group' set, please also set the environment variable 'vim_cv_tty_mode' to the correct mode (probably 0620)])
else
AC_DEFINE(PTYMODE, 0620)
fi
fi
dnl Checks for library functions. =================================== dnl Checks for library functions. ===================================
AC_TYPE_SIGNAL AC_TYPE_SIGNAL

2
src/version.c
View File

@ -746,6 +746,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
680,
/**/ /**/
679, 679,
/**/ /**/