patch 9.1.1832: if_perl: contains references to legacy if_perlsfio

Problem:  if_perl: contains references to legacy if_perlsfio.{c,pro} and
          USE_SFIO
Solution: Remove those references (Hirohito Higashi)

fixes: #18496
closes: #18500

Signed-off-by: Hirohito Higashi <h.east.727@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/.github/labeler.yml b/.github/labeler.yml
index 3b8ab48b877be3bfb43da6672680cd7eb4542c48..5b884c89e0e1a25270b65e37ff79fa4b32b40c16 100644 (file)
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -45,9 +45,7 @@ if_perl:
     - changed-files:
       - any-glob-to-any-file:
         - 'src/if_perl.xs'
-        - 'src/if_perlsfio.c'
         - 'src/proto/if_perl.pro'
-        - 'src/proto/if_perlsfio.pro'
         - 'runtime/doc/if_perl.txt'
 
 if_python:

diff --git a/Filelist b/Filelist
index ae9379d1b8bb335c8bfdb24fc220fa3ec85b586d..bd218c3c1ec177867f419590125eb7ca7f66a80a 100644 (file)
--- a/Filelist
+++ b/Filelist
@@ -550,7 +550,6 @@ SRC_DOS_UNIX =      \
                src/if_mzsch.c \
                src/if_mzsch.h \
                src/if_perl.xs \
-               src/if_perlsfio.c \
                src/if_python.c \
                src/if_python3.c \
                src/if_py_both.h \
@@ -561,7 +560,6 @@ SRC_DOS_UNIX =      \
                src/proto/if_lua.pro \
                src/proto/if_mzsch.pro \
                src/proto/if_perl.pro \
-               src/proto/if_perlsfio.pro \
                src/proto/if_python.pro \
                src/proto/if_python3.pro \
                src/proto/if_ruby.pro \

diff --git a/src/INSTALLvms.txt b/src/INSTALLvms.txt
index 60e13c7cdf3a3653e3a65a72f6738d8e5a0124d1..9d9626d05d01a04f7131bf6ac03f22e118ee27c3 100644 (file)
--- a/src/INSTALLvms.txt
+++ b/src/INSTALLvms.txt
@@ -294,7 +294,7 @@ from CVS mirror ftp://ftp.polarhome.com/pub/cvs/SOURCE/
 7.1.3   feature_OBJ = code1.obj code2.obj
 
      Lists objects created from source codes listed in feature_SRC
-     Example: PERL_OBJ = if_perlsfio.obj if_perl.obj
+     Example: PERL_OBJ = if_perl.obj
 
 7.1.4  feature_LIB = ,OS_VMS_TCL.OPT/OPT
 

diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index ba0f5125737e2dff80ba8c47cf9871ea0e269204..a59b083e72139c8a59bc0e41ff46cfc9b676d240 100644 (file)
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -1129,7 +1129,7 @@ CFLAGS = $(CFLAGS) -DDYNAMIC_PERL -DDYNAMIC_PERL_DLL=\"$(PERL_DLL)\"
 
 PERL_EXE = $(PERL)\Bin$(PERL_ARCH)\perl
 PERL_INC = /I $(PERL_INCDIR)
-PERL_OBJ = $(OUTDIR)\if_perl.obj $(OUTDIR)\if_perlsfio.obj
+PERL_OBJ = $(OUTDIR)\if_perl.obj
 XSUBPP = $(PERL)\lib\ExtUtils\xsubpp
 ! IF exist($(XSUBPP))
 XSUBPP = $(PERL_EXE) $(XSUBPP)
@@ -1647,9 +1647,6 @@ auto/if_perl.c: if_perl.xs typemap
 $(OUTDIR)/if_perl.obj: $(OUTDIR) auto/if_perl.c $(INCL)
        $(CC) $(CFLAGS_OUTDIR) $(PERL_INC) auto/if_perl.c
 
-$(OUTDIR)/if_perlsfio.obj: $(OUTDIR) if_perlsfio.c $(INCL)
-       $(CC) $(CFLAGS_OUTDIR) $(PERL_INC) if_perlsfio.c
-
 $(OUTDIR)/if_mzsch.obj: $(OUTDIR) if_mzsch.c $(MZSCHEME_INCL) $(INCL) \
                        $(MZSCHEME_EXTRA_DEP)
        $(CC) $(CFLAGS_OUTDIR) if_mzsch.c \

diff --git a/src/Make_vms.mms b/src/Make_vms.mms
index d452291af0fbba1c3c711d814ec4a7b9d0f41c7d..8ab68e5c0f5bef41ca08a64080f589b86c182a6d 100644 (file)
--- a/src/Make_vms.mms
+++ b/src/Make_vms.mms
@@ -359,9 +359,8 @@ LIBS         =
 # Perl related setup.
 PERL    = perl
 PERL_DEF = ,"FEAT_PERL"
-PERL_SRC = if_perlsfio.c if_perl.xs
+PERL_SRC = if_perl.xs
 PERL_OBJ = \
-[.$(DEST)]if_perlsfio.obj \
 [.$(DEST)]if_perl.obj
 
 PERL_LIB = ,OS_VMS_PERL.OPT/OPT
@@ -1506,10 +1505,6 @@ lua_env :
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
  gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
  errors.h globals.h
-[.$(DEST)]if_perlsfio.obj : if_perlsfio.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
- ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
- gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
- errors.h globals.h
 [.$(DEST)]if_python.obj : if_python.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
  gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \

diff --git a/src/Makefile b/src/Makefile
index 877310fe8b30fdd77aa6963a84998ff4a90fa51d..f5a4672aadda7846e0a0349a19b53875e5dee9f3 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1620,7 +1620,7 @@ SRC =     $(BASIC_SRC) \
        $(RUBY_SRC) \
        $(WAYLAND_SRC)
 
-EXTRA_SRC = if_lua.c if_mzsch.c auto/if_perl.c if_perlsfio.c \
+EXTRA_SRC = if_lua.c if_mzsch.c auto/if_perl.c \
            if_python.c if_python3.c if_tcl.c if_ruby.c \
            gui_beval.c netbeans.c job.c channel.c \
            $(GRESOURCE_SRC)
@@ -3397,9 +3397,6 @@ mzscheme_base.c:
 objects/if_perl.o: auto/if_perl.c
        $(CCC_NF) $(PERL_CFLAGS) $(ALL_CFLAGS) $(PERL_CFLAGS_EXTRA) -o $@ auto/if_perl.c
 
-objects/if_perlsfio.o: if_perlsfio.c
-       $(CCC_NF) $(PERL_CFLAGS) $(ALL_CFLAGS) $(PERL_CFLAGS_EXTRA) -o $@ if_perlsfio.c
-
 objects/if_python.o: if_python.c if_py_both.h
        $(CCC_NF) $(PYTHON_CFLAGS) $(ALL_CFLAGS) $(PYTHON_CFLAGS_EXTRA) -o $@ if_python.c
 
@@ -4513,11 +4510,6 @@ objects/if_perl.o: auto/if_perl.c vim.h protodef.h auto/config.h feature.h \
  beval.h proto/gui_beval.pro structs.h regexp.h gui.h \
  libvterm/include/vterm.h libvterm/include/vterm_keycodes.h alloc.h \
  ex_cmds.h spell.h proto.h globals.h errors.h
-objects/if_perlsfio.o: if_perlsfio.c vim.h protodef.h auto/config.h feature.h \
- os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h \
- beval.h proto/gui_beval.pro structs.h regexp.h gui.h \
- libvterm/include/vterm.h libvterm/include/vterm_keycodes.h alloc.h \
- ex_cmds.h spell.h proto.h globals.h errors.h
 objects/if_python.o: if_python.c vim.h protodef.h auto/config.h feature.h \
  os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h \
  beval.h proto/gui_beval.pro structs.h regexp.h gui.h \

diff --git a/src/auto/configure b/src/auto/configure
index d3aa017fc174a3944ad940bb3aa94280ac3011fe..6b88ea9dd3cc9acc616c0ab63f93e7251c6f3e56 100755 (executable)
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -6967,9 +6967,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
          fi
        fi
        PERL_LIBS=$perllibs
-       PERL_SRC="auto/if_perl.c if_perlsfio.c"
-       PERL_OBJ="objects/if_perl.o objects/if_perlsfio.o"
-       PERL_PRO="if_perl.pro if_perlsfio.pro"
+       PERL_SRC="auto/if_perl.c"
+       PERL_OBJ="objects/if_perl.o"
+       PERL_PRO="if_perl.pro"
        printf "%s\n" "#define FEAT_PERL 1" >>confdefs.h
 
       fi
@@ -6995,7 +6995,7 @@ printf "%s\n" ">>> too old; need Perl version 5.003_01 or later <<<" >&6; }
     if test -n "$PERL"; then
       PERL_DIR="$dir"
       PERL_CFLAGS="-DFEAT_PERL -I$darwindir/CORE"
-      PERL_OBJ="objects/if_perl.o objects/if_perlsfio.o $darwindir/auto/DynaLoader/DynaLoader.a"
+      PERL_OBJ="objects/if_perl.o $darwindir/auto/DynaLoader/DynaLoader.a"
       PERL_LIBS="-L$darwindir/CORE -lperl"
     fi
                 PERL_LIBS=`echo "$PERL_LIBS" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'`

diff --git a/src/configure.ac b/src/configure.ac
index aacb45d1153c6f024612c58325fa37c5f9cf2dc5..9755029cfc039471fbc9a614c51274258cd29475 100644 (file)
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -1246,9 +1246,9 @@ if test "$enable_perlinterp" = "yes" -o "$enable_perlinterp" = "dynamic"; then
          fi
        fi
        PERL_LIBS=$perllibs
-       PERL_SRC="auto/if_perl.c if_perlsfio.c"
-       PERL_OBJ="objects/if_perl.o objects/if_perlsfio.o"
-       PERL_PRO="if_perl.pro if_perlsfio.pro"
+       PERL_SRC="auto/if_perl.c"
+       PERL_OBJ="objects/if_perl.o"
+       PERL_PRO="if_perl.pro"
        AC_DEFINE(FEAT_PERL)
       fi
      fi
@@ -1274,7 +1274,7 @@ if test "$enable_perlinterp" = "yes" -o "$enable_perlinterp" = "dynamic"; then
     if test -n "$PERL"; then
       PERL_DIR="$dir"
       PERL_CFLAGS="-DFEAT_PERL -I$darwindir/CORE"
-      PERL_OBJ="objects/if_perl.o objects/if_perlsfio.o $darwindir/auto/DynaLoader/DynaLoader.a"
+      PERL_OBJ="objects/if_perl.o $darwindir/auto/DynaLoader/DynaLoader.a"
       PERL_LIBS="-L$darwindir/CORE -lperl"
     fi
     dnl Perl on Mac OS X 10.5 adds "-arch" flags but these should only

diff --git a/src/if_perl.xs b/src/if_perl.xs
index cdac145adb039a1d87547ac51f54803679b4b37f..34feb3a96f803fd2c90500a3c8a4acb5b8717ac4 100644 (file)
--- a/src/if_perl.xs
+++ b/src/if_perl.xs
@@ -48,7 +48,7 @@
 #include <EXTERN.h>
 #include <perl.h>
 #include <XSUB.h>
-#if defined(PERLIO_LAYERS) && !defined(USE_SFIO)
+#if defined(PERLIO_LAYERS)
 # include <perliol.h>
 #endif
 
@@ -80,7 +80,6 @@ const char PL_memory_wrap[] = "panic: memory wrap";
 #ifndef PROTO
 # ifndef __MINGW32__
 #  include "proto/if_perl.pro"
-#  include "proto/if_perlsfio.pro"
 # endif
 #endif
 
@@ -324,7 +323,7 @@ typedef int perl_key;
 # define Perl_av_fetch dll_Perl_av_fetch
 # define Perl_av_len dll_Perl_av_len
 # define Perl_sv_2nv_flags dll_Perl_sv_2nv_flags
-# if defined(PERLIO_LAYERS) && !defined(USE_SFIO)
+# if defined(PERLIO_LAYERS)
 #  define PerlIOBase_pushed dll_PerlIOBase_pushed
 #  define PerlIO_define_layer dll_PerlIO_define_layer
 # endif
@@ -497,7 +496,7 @@ static SV * (*Perl_hv_iterval)(pTHX_ HV *, HE *);
 static SV** (*Perl_av_fetch)(pTHX_ AV *, SSize_t, I32);
 static SSize_t (*Perl_av_len)(pTHX_ AV *);
 static NV (*Perl_sv_2nv_flags)(pTHX_ SV *const, const I32);
-# if defined(PERLIO_LAYERS) && !defined(USE_SFIO)
+# if defined(PERLIO_LAYERS)
 static IV (*PerlIOBase_pushed)(pTHX_ PerlIO *, const char *, SV *, PerlIO_funcs *);
 static void (*PerlIO_define_layer)(pTHX_ PerlIO_funcs *);
 # endif
@@ -655,7 +654,7 @@ static struct {
     {"Perl_av_fetch", (PERL_PROC*)&Perl_av_fetch},
     {"Perl_av_len", (PERL_PROC*)&Perl_av_len},
     {"Perl_sv_2nv_flags", (PERL_PROC*)&Perl_sv_2nv_flags},
-# if defined(PERLIO_LAYERS) && !defined(USE_SFIO)
+# if defined(PERLIO_LAYERS)
     {"PerlIOBase_pushed", (PERL_PROC*)&PerlIOBase_pushed},
     {"PerlIO_define_layer", (PERL_PROC*)&PerlIO_define_layer},
 # endif
@@ -721,7 +720,7 @@ perl_enabled(int verbose)
 }
 #endif /* DYNAMIC_PERL */
 
-#if defined(PERLIO_LAYERS) && !defined(USE_SFIO)
+#if defined(PERLIO_LAYERS)
 static void vim_IOLayer_init(void);
 #endif
 
@@ -745,12 +744,7 @@ perl_init(void)
     perl_parse(perl_interp, xs_init, argc, argv, 0);
     perl_call_argv("VIM::bootstrap", (long)G_DISCARD, bootargs);
     VIM_init();
-#ifdef USE_SFIO
-    sfdisc(PerlIO_stdout(), sfdcnewvim());
-    sfdisc(PerlIO_stderr(), sfdcnewvim());
-    sfsetbuf(PerlIO_stdout(), NULL, 0);
-    sfsetbuf(PerlIO_stderr(), NULL, 0);
-#elif defined(PERLIO_LAYERS)
+#if defined(PERLIO_LAYERS)
     vim_IOLayer_init();
 #endif
 }
@@ -1399,7 +1393,7 @@ err:
     }
 }
 
-#if defined(PERLIO_LAYERS) && !defined(USE_SFIO)
+#if defined(PERLIO_LAYERS)
 typedef struct {
     struct _PerlIO base;
     int attr;
@@ -1470,7 +1464,7 @@ vim_IOLayer_init(void)
     (void)eval_pv(   "binmode(STDOUT, ':Vim')"
                 "  && binmode(STDERR, ':Vim(ErrorMsg)');", 0);
 }
-#endif /* PERLIO_LAYERS && !USE_SFIO */
+#endif /* PERLIO_LAYERS */
 
 #ifdef DYNAMIC_PERL
 

diff --git a/src/if_perlsfio.c b/src/if_perlsfio.c
deleted file mode 100644 (file)
index af15d3e..0000000
--- a/src/if_perlsfio.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/* vi:set ts=8 sts=4 sw=4 noet:
- *
- * VIM - Vi IMproved   by Bram Moolenaar
- *
- * Do ":help uganda"  in Vim to read copying and usage conditions.
- * Do ":help credits" in Vim to see a list of people who contributed.
- * See README.txt for an overview of the Vim source code.
- */
-/*
- * if_perlsfio.c: Special I/O functions for Perl interface.
- */
-
-#define _memory_h      // avoid memset redeclaration
-#define IN_PERL_FILE   // don't include if_perl.pro from prot.h
-
-#include "vim.h"
-
-#if defined(USE_SFIO) || defined(PROTO)
-
-#ifndef USE_SFIO       // just generating prototypes
-# define Sfio_t int
-# define Sfdisc_t int
-#endif
-
-#define NIL(type)      ((type)0)
-
-    static int
-sfvimwrite(
-    Sfio_t         *f,         // stream involved
-    char           *buf,       // buffer to read from
-    int                    n,          // number of bytes to write
-    Sfdisc_t       *disc)      // discipline
-{
-    char_u *str;
-
-    str = vim_strnsave((char_u *)buf, n);
-    if (str == NULL)
-       return 0;
-    msg_split((char *)str);
-    vim_free(str);
-
-    return n;
-}
-
-/*
- * sfdcnewnvi --
- *  Create Vim discipline
- */
-    Sfdisc_t *
-sfdcnewvim(void)
-{
-    Sfdisc_t   *disc;
-
-    disc = ALLOC_ONE(Sfdisc_t);
-    if (disc == NULL)
-       return NULL;
-
-    disc->readf = (Sfread_f)NULL;
-    disc->writef = sfvimwrite;
-    disc->seekf = (Sfseek_f)NULL;
-    disc->exceptf = (Sfexcept_f)NULL;
-
-    return disc;
-}
-
-#endif // USE_SFIO

diff --git a/src/proto.h b/src/proto.h
index e9e5efcbc5431c8d5499a9a93dda0cd7d7dd3310..d7390c079c15d8159ba5153ca4dbb4b290f085c8 100644 (file)
--- a/src/proto.h
+++ b/src/proto.h
@@ -337,7 +337,6 @@ extern char_u *vimpty_getenv(const char_u *string); // in misc2.c
 # if defined(FEAT_PERL) && !defined(IN_PERL_FILE)
 #  define CV void
 #  include "if_perl.pro"
-#  include "if_perlsfio.pro"
 # endif
 
 # ifdef MACOS_CONVERT

diff --git a/src/proto/if_perlsfio.pro b/src/proto/if_perlsfio.pro
deleted file mode 100644 (file)
index df8e438..0000000
--- a/src/proto/if_perlsfio.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-/* if_perlsfio.c */
-int *sfdcnewvim(void);
-/* vim: set ft=c : */

diff --git a/src/version.c b/src/version.c
index 27edfb16ce9026d13ff3744c497feab11f39c512..0b342a2b1c0fd63923ac8a1a6c088a7959521ac0 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1832,
 /**/
     1831,
 /**/