diff options
author | Bram Moolenaar <Bram@vim.org> | 2016-11-04 20:35:31 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2016-11-04 20:35:31 +0100 |
commit | de5e2c219b99895445fb75ae3541ee69282a5846 (patch) | |
tree | 66c568296d890abef12e5d04f7e62256e28b45e1 /src | |
parent | 91e44a3305ef6bf2d43496c351dcff0a45c6bfb8 (diff) |
patch 8.0.0059v8.0.0059
Problem: Vim does not build on VMS systems.
Solution: Various changes for VMS. (Zoltan Arpadffy)
Diffstat (limited to 'src')
-rw-r--r-- | src/Make_vms.mms | 54 | ||||
-rw-r--r-- | src/json.c | 4 | ||||
-rw-r--r-- | src/macros.h | 1 | ||||
-rw-r--r-- | src/os_unix.c | 9 | ||||
-rw-r--r-- | src/os_unix.h | 4 | ||||
-rw-r--r-- | src/os_vms.c | 3 | ||||
-rw-r--r-- | src/os_vms_conf.h | 7 | ||||
-rw-r--r-- | src/proto/os_vms.pro | 2 | ||||
-rw-r--r-- | src/testdir/Make_vms.mms | 53 | ||||
-rw-r--r-- | src/version.c | 2 |
10 files changed, 105 insertions, 34 deletions
diff --git a/src/Make_vms.mms b/src/Make_vms.mms index 4ddb8a1292..00d47635d7 100644 --- a/src/Make_vms.mms +++ b/src/Make_vms.mms @@ -2,7 +2,7 @@ # Makefile for Vim on OpenVMS # # Maintainer: Zoltan Arpadffy <arpadffy@polarhome.com> -# Last change: 2016 Jul 02 +# Last change: 2016 Nov 04 # # This has script been tested on VMS 6.2 to 8.2 on DEC Alpha, VAX and IA64 # with MMS and MMK @@ -38,7 +38,7 @@ MODEL = HUGE # GUI or terminal mode executable. # Comment out if you want just the character terminal mode only. # GUI with Motif -# GUI = YES +GUI = YES # GUI with GTK # If you have GTK installed you might want to enable this option. @@ -299,22 +299,22 @@ ALL_CFLAGS_VER = /def=($(MODEL_DEF)$(DEFS)$(DEBUG_DEF)$(PERL_DEF)$(PYTHON_DEF) - ALL_LIBS = $(LIBS) $(GUI_LIB_DIR) $(GUI_LIB) \ $(PERL_LIB) $(PYTHON_LIB) $(TCL_LIB) $(RUBY_LIB) -SRC = arabic.c blowfish.c buffer.c charset.c crypt.c, crypt_zip.c diff.c digraph.c edit.c eval.c ex_cmds.c ex_cmds2.c \ - ex_docmd.c ex_eval.c ex_getln.c if_xcmdsrv.c farsi.c fileio.c fold.c getchar.c \ - hardcopy.c hashtab.c json.c main.c mark.c menu.c mbyte.c memfile.c memline.c message.c misc1.c \ +SRC = arabic.c blowfish.c buffer.c charset.c crypt.c crypt_zip.c dict.c diff.c digraph.c edit.c eval.c evalfunc.c \ + ex_cmds.c ex_cmds2.c ex_docmd.c ex_eval.c ex_getln.c if_cscope.c if_xcmdsrv.c farsi.c fileio.c fold.c getchar.c \ + hardcopy.c hashtab.c json.c list.c main.c mark.c menu.c mbyte.c memfile.c memline.c message.c misc1.c \ misc2.c move.c normal.c ops.c option.c popupmnu.c quickfix.c regexp.c search.c sha256.c\ - spell.c syntax.c tag.c term.c termlib.c ui.c undo.c version.c screen.c \ + spell.c spellfile.c syntax.c tag.c term.c termlib.c ui.c undo.c userfunc.c version.c screen.c \ window.c os_unix.c os_vms.c pathdef.c \ $(GUI_SRC) $(PERL_SRC) $(PYTHON_SRC) $(TCL_SRC) \ $(RUBY_SRC) $(HANGULIN_SRC) $(MZSCH_SRC) -OBJ = arabic.obj blowfish.obj buffer.obj charset.obj crypt.obj, crypt_zip.obj diff.obj digraph.obj edit.obj eval.obj \ - ex_cmds.obj ex_cmds2.obj ex_docmd.obj ex_eval.obj ex_getln.obj \ - if_xcmdsrv.obj farsi.obj fileio.obj fold.obj getchar.obj hardcopy.obj hashtab.obj json.obj main.obj mark.obj \ +OBJ = arabic.obj blowfish.obj buffer.obj charset.obj crypt.obj crypt_zip.obj dict.obj diff.obj digraph.obj edit.obj eval.obj \ + evalfunc.obj ex_cmds.obj ex_cmds2.obj ex_docmd.obj ex_eval.obj ex_getln.obj if_cscope.obj \ + if_xcmdsrv.obj farsi.obj fileio.obj fold.obj getchar.obj hardcopy.obj hashtab.obj json.obj list.obj main.obj mark.obj \ menu.obj memfile.obj memline.obj message.obj misc1.obj misc2.obj \ move.obj mbyte.obj normal.obj ops.obj option.obj popupmnu.obj quickfix.obj \ - regexp.obj search.obj sha256.obj spell.obj syntax.obj tag.obj term.obj termlib.obj \ - ui.obj undo.obj screen.obj version.obj window.obj os_unix.obj \ + regexp.obj search.obj sha256.obj spell.obj spellfile.obj syntax.obj tag.obj term.obj termlib.obj \ + ui.obj undo.obj userfunc.obj screen.obj version.obj window.obj os_unix.obj \ os_vms.obj pathdef.obj if_mzsch.obj\ $(GUI_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(TCL_OBJ) \ $(RUBY_OBJ) $(HANGULIN_OBJ) $(MZSCH_OBJ) @@ -496,6 +496,18 @@ charset.obj : charset.c vim.h [.auto]config.h feature.h os_unix.h \ ascii.h keymap.h term.h macros.h structs.h regexp.h \ gui.h gui_beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ globals.h farsi.h arabic.h +crypt.obj : crypt.c vim.h [.auto]config.h feature.h os_unix.h \ + ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ + gui_beval.h [.proto]gui_beval.pro alloc.h ex_cmds.h spell.h proto.h \ + globals.h farsi.h arabic.h +crypt_zip.obj : crypt_zip.c vim.h [.auto]config.h feature.h os_unix.h \ + ascii.h keymap.h term.h macros.h option.h structs.h \ + regexp.h gui.h gui_beval.h [.proto]gui_beval.pro alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h +dict.obj : dict.c vim.h [.auto]config.h feature.h os_unix.h \ + ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ + gui_beval.h [.proto]gui_beval.pro alloc.h ex_cmds.h spell.h proto.h \ + globals.h farsi.h arabic.h diff.obj : diff.c vim.h [.auto]config.h feature.h os_unix.h \ ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \ [.proto]gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \ @@ -512,6 +524,10 @@ eval.obj : eval.c vim.h [.auto]config.h feature.h os_unix.h \ ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \ [.proto]gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \ arabic.h version.h +evalfunc.obj : evalfunc.c vim.h [.auto]config.h feature.h os_unix.h \ + ascii.h keymap.h term.h macros.h option.h structs.h \ + regexp.h gui.h gui_beval.h [.proto]gui_beval.pro alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h version.h ex_cmds.obj : ex_cmds.c vim.h [.auto]config.h feature.h os_unix.h \ ascii.h keymap.h term.h macros.h structs.h regexp.h \ gui.h gui_beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ @@ -569,6 +585,10 @@ json.obj : json.c vim.h [.auto]config.h feature.h os_unix.h \ ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \ [.proto]gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \ arabic.h version.h +list.obj : list.c vim.h [.auto]config.h feature.h os_unix.h \ + ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ + gui_beval.h [.proto]gui_beval.pro alloc.h ex_cmds.h spell.h proto.h \ + globals.h farsi.h arabic.h main.obj : main.c vim.h [.auto]config.h feature.h os_unix.h \ ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \ [.proto]gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \ @@ -653,10 +673,18 @@ search.obj : search.c vim.h [.auto]config.h feature.h os_unix.h \ ascii.h keymap.h term.h macros.h structs.h regexp.h \ gui.h gui_beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ globals.h farsi.h arabic.h +sha256.obj : sha256.c vim.h [.auto]config.h feature.h os_unix.h \ + ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ + gui_beval.h [.proto]gui_beval.pro alloc.h ex_cmds.h spell.h proto.h \ + globals.h farsi.h arabic.h spell.obj : spell.c vim.h [.auto]config.h feature.h os_unix.h \ ascii.h keymap.h term.h macros.h structs.h regexp.h \ gui.h gui_beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ globals.h farsi.h arabic.h +spellfile.obj : spellfile.c vim.h [.auto]config.h feature.h os_unix.h \ + ascii.h keymap.h term.h macros.h option.h structs.h \ + regexp.h gui.h gui_beval.h [.proto]gui_beval.pro alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h syntax.obj : syntax.c vim.h [.auto]config.h feature.h os_unix.h \ ascii.h keymap.h term.h macros.h structs.h regexp.h \ gui.h gui_beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ @@ -681,6 +709,10 @@ undo.obj : undo.c vim.h [.auto]config.h feature.h os_unix.h \ ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \ [.proto]gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \ arabic.h +userfunc.obj : userfunc.c vim.h [.auto]config.h feature.h os_unix.h \ + ascii.h keymap.h term.h macros.h option.h structs.h \ + regexp.h gui.h gui_beval.h [.proto]gui_beval.pro alloc.h ex_cmds.h spell.h \ + proto.h globals.h farsi.h arabic.h version.obj : version.c vim.h [.auto]config.h feature.h os_unix.h \ ascii.h keymap.h term.h macros.h structs.h regexp.h \ gui.h gui_beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ diff --git a/src/json.c b/src/json.c index 36d47aa99d..7c1181ca55 100644 --- a/src/json.c +++ b/src/json.c @@ -16,6 +16,10 @@ #include "vim.h" +#ifdef VAX +# undef FEAT_FLOAT // VAX does not handle well the Infinities +#endif + #if defined(FEAT_EVAL) || defined(PROTO) static int json_encode_item(garray_T *gap, typval_T *val, int copyID, int options); diff --git a/src/macros.h b/src/macros.h index 691a819b01..5920b5dc7b 100644 --- a/src/macros.h +++ b/src/macros.h @@ -177,6 +177,7 @@ # define mch_fstat(n, p) fstat(vms_fixfilename(n), (p)) /* VMS does not have lstat() */ # define mch_stat(n, p) stat(vms_fixfilename(n), (p)) +# define mch_rmdir(n) rmdir(vms_fixfilename(n)) #else # ifndef WIN32 # define mch_access(n, p) access((n), (p)) diff --git a/src/os_unix.c b/src/os_unix.c index 6b26b06203..c6beba2cc9 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -501,7 +501,7 @@ mch_inchar( /* no character available */ #if !(defined(HAVE_GETTIMEOFDAY) && defined(HAVE_SYS_TIME_H)) /* estimate the elapsed time */ - elapsed += wait_time; + elapsed_time += wait_time; #endif if (do_resize /* interrupted by SIGWINCH signal */ @@ -2644,7 +2644,7 @@ fname_case( DIR *dirp; struct dirent *dp; - if (lstat((char *)name, &st) >= 0) + if (mch_lstat((char *)name, &st) >= 0) { /* Open the directory where the file is located. */ slash = vim_strrchr(name, '/'); @@ -2677,7 +2677,7 @@ fname_case( vim_strncpy(newname, name, MAXPATHL); vim_strncpy(newname + (tail - name), (char_u *)dp->d_name, MAXPATHL - (tail - name)); - if (lstat((char *)newname, &st2) >= 0 + if (mch_lstat((char *)newname, &st2) >= 0 && st.st_ino == st2.st_ino && st.st_dev == st2.st_dev) { @@ -3040,7 +3040,7 @@ mch_isrealdir(char_u *name) if (*name == NUL) /* Some stat()s don't flag "" as an error. */ return FALSE; - if (lstat((char *)name, &statb)) + if (mch_lstat((char *)name, &statb)) return FALSE; #ifdef _POSIX_SOURCE return (S_ISDIR(statb.st_mode) ? TRUE : FALSE); @@ -4098,6 +4098,7 @@ mch_call_shell( int tmode = cur_tmode; #ifdef USE_SYSTEM /* use system() to start the shell: simple but slow */ char_u *newcmd; /* only needed for unix */ + int x; out_flush(); diff --git a/src/os_unix.h b/src/os_unix.h index 1070746f9c..d28aa4dde4 100644 --- a/src/os_unix.h +++ b/src/os_unix.h @@ -75,10 +75,6 @@ # ifdef VMS # define mch_remove(x) delete((char *)(x)) # define vim_mkdir(x, y) mkdir((char *)(x), y) -# ifdef VAX -# else -# define mch_rmdir(x) rmdir((char *)(x)) -# endif # else # define vim_mkdir(x, y) mkdir((char *)(x), y) # define mch_rmdir(x) rmdir((char *)(x)) diff --git a/src/os_vms.c b/src/os_vms.c index 747c6a206e..f1c06985cc 100644 --- a/src/os_vms.c +++ b/src/os_vms.c @@ -726,7 +726,8 @@ struct typeahead_st { RealWaitForChar( int fd UNUSED, /* always read from iochan */ long msec, - int *check_for_gpm UNUSED) + int *check_for_gpm UNUSED, + int *interrupted) { int status; struct _generic_64 time_curr; diff --git a/src/os_vms_conf.h b/src/os_vms_conf.h index 6da074b1f9..5c110f206e 100644 --- a/src/os_vms_conf.h +++ b/src/os_vms_conf.h @@ -141,6 +141,7 @@ #undef HAVE_SYS_POLL_H #undef HAVE_PWD_H #undef HAVE_FCHDIR +#undef HAVE_LSTAT /* Hardware specific */ #ifdef VAX @@ -148,13 +149,15 @@ #undef HAVE_USLEEP #undef HAVE_STRCASECMP #undef HAVE_STRINGS_H -#undef HAVE_SIGSETJMP +#undef HAVE_SIGSETJMP +#undef HAVE_ISNAN #else #define HAVE_GETTIMEOFDAY #define HAVE_USLEEP #define HAVE_STRCASECMP #define HAVE_STRINGS_H -#define HAVE_SIGSETJMP +#define HAVE_SIGSETJMP +#define HAVE_ISNAN #endif /* Compiler specific */ diff --git a/src/proto/os_vms.pro b/src/proto/os_vms.pro index ccae9818f5..c1cfd4442a 100644 --- a/src/proto/os_vms.pro +++ b/src/proto/os_vms.pro @@ -12,5 +12,5 @@ int mch_expand_wildcards(int num_pat, char_u **pat, int *num_file, char_u ***fil int mch_expandpath(garray_T *gap, char_u *path, int flags); void *vms_fixfilename(void *instring); void vms_remove_version(void *fname); -int RealWaitForChar(int fd, long msec, int *check_for_gpm); +int RealWaitForChar(int fd, long msec, int *check_for_gpm, int *interrupted); /* vim: set ft=c : */ diff --git a/src/testdir/Make_vms.mms b/src/testdir/Make_vms.mms index 5ce32aaa14..6962cf0072 100644 --- a/src/testdir/Make_vms.mms +++ b/src/testdir/Make_vms.mms @@ -4,7 +4,7 @@ # Authors: Zoltan Arpadffy, <arpadffy@polarhome.com> # Sandor Kopanyi, <sandor.kopanyi@mailbox.hu> # -# Last change: 2016 Aug 04 +# Last change: 2016 Nov 04 # # This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64. # Edit the lines in the Configuration section below to select. @@ -74,14 +74,45 @@ VIMPROG = <->vim.exe -default : all - -# This probably doesn't work, please fix. -.INCLUDE Make_all.mak - .SUFFIXES : .out .in -SCRIPT = $(SCRIPTS_ALL) $(SCRIPTS_MORE3) +SCRIPT = test1.out test3.out test4.out test5.out \ + test7.out test8.out test9.out \ + test14.out test15.out \ + test19.out test20.out test22.out \ + test23.out test24.out test26.out \ + test28.out test29.out test30.out test31.out test32.out \ + test33.out test34.out test36.out test37.out \ + test38.out test39.out test40.out test41.out test42.out \ + test43.out test44.out test45.out \ + test48.out test49.out test51.out test53.out test54.out \ + test55.out test56.out test57.out test60.out \ + test64.out test65.out \ + test66.out test67.out test68.out test69.out \ + test72.out test75.out \ + test77a.out test78.out test79.out test80.out \ + test82.out test84.out test88.out test89.out \ + test90.out test91.out test92.out test93.out test94.out \ + test95.out test98.out test99.out \ + test103.out test104.out \ + test107.out test108.out\ + test_autocmd_option.out \ + test_autoformat_join.out \ + test_breakindent.out \ + test_changelist.out \ + test_close_count.out \ + test_comparators.out \ + test_erasebackword.out \ + test_eval.out \ + test_fixeol.out \ + test_getcwd.out \ + test_insertcount.out \ + test_listchars.out \ + test_listlbr.out \ + test_listlbr_utf8.out \ + test_search_mbyte.out \ + test_utf8.out \ + test_wordcount.out # Known problems: # test17: ? @@ -104,12 +135,12 @@ SCRIPT = $(SCRIPTS_ALL) $(SCRIPTS_MORE3) # On ODS-2 tests fail. .IFDEF WANT_GUI -SCRIPT_GUI = +SCRIPT_GUI = test16.out GUI_OPTION = -g .ENDIF .IFDEF WANT_UNIX -SCRIPT_UNIX = test12.out test17.out test25.out test27.out test49.out test73.out +SCRIPT_UNIX = test10.out test12.out test17.out test25.out test27.out test49.out test73.out .ENDIF .IFDEF WANT_WIN @@ -163,7 +194,7 @@ SCRIPT_PYTHON = test86.out test87.out -@ write sys$output " "$*" " -@ write sys$output "-----------------------------------------------" -@ !run the test - -@ create/term/wait/nodetach mcr $(VIMPROG) $(GUI_OPTION) -u vms.vim $(NO_PLUGIN) -s dotest.in $*.in + -@ create/term/wait/nodetach mcr $(VIMPROG) $(GUI_OPTION) -u vms.vim --noplugin -s dotest.in $*.in -@ !analyse the result -@ directory /size/date test.out -@ if "''F$SEARCH("test.out.*")'" .NES. "" then rename/nolog test.out $*.out @@ -172,7 +203,7 @@ SCRIPT_PYTHON = test86.out test87.out -@ if "''F$SEARCH("Xdotest.*")'" .NES. "" then delete/noconfirm/nolog Xdotest.*.* -@ if "''F$SEARCH("Xtest.*")'" .NES. "" then delete/noconfirm/nolog Xtest.*.* -all : clean nolog $(SCRIPTS_FIRST) $(SCRIPT) $(SCRIPT_GUI) $(SCRIPT_UNIX) $(SCRIPT_WIN) $(SCRIPT_SPELL) $(SCRIPT_ODS5) $(SCRIPT_GZIP) \ +all : clean nolog $(START_WITH) $(SCRIPT) $(SCRIPT_GUI) $(SCRIPT_UNIX) $(SCRIPT_WIN) $(SCRIPT_SPELL) $(SCRIPT_ODS5) $(SCRIPT_GZIP) \ $(SCRIPT_GDIFF) $(SCRIPT_MZSCH) $(SCRIPT_CKSUM) $(SCRIPT_ICONV) $(SCRIPT_LUA) $(SCRIPT_PYTHON) nolog -@ write sys$output " " -@ write sys$output "-----------------------------------------------" diff --git a/src/version.c b/src/version.c index dc3cb58f53..97b7e30981 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 59, +/**/ 58, /**/ 57, |