mirror of
https://github.com/neovim/neovim.git
synced 2025-09-14 23:38:17 +00:00
Removes 'proto' dir
See #137 for the issue. Every header in the proto directory was: * Given include guards in the form #ifndef NEOVIM_FILENAME_H #define NEOVIM_FILENAME_H ... #endif /* NEOVIM_FILENAM_H */ * Renamed from *.pro -> *.h * Moved from src/proto/ to src/ This would have caused conficts with some existing headers in src/; rather than merge these conflicts now (which is a whole other can of worms involving multiple and conditional inclusion), any header in src/ with a conflicting name was renamed from *.h -> *_defs.h (which may or may not actually describe its purpose, the change is purely a namespacing issue). Once all of these changes were made a script was developed to determine what #includes needed to be added to each source file to describe its dependencies and allow it to compile; because the script is so short and I'll just list it here: #! /bin/bash cd $(dirname $0) # Scrapes `make` output for provided error messages and outputs #includes # needed to resolve them. # $1 : part of the clang error message between filename and identifier list_missing_includes() { for file_missing_pair in $(CC=clang make 2>&1 >/dev/null | sed -n "s/\/\(.*\.[hc]\).*$1.*'\(.*\)'.*/\1:\2/p"); do fields=(${file_missing_pair//:/ }) source_file=${fields[0]} missing_func=${fields[1]} # Try to find the declaration of the missing function. echo $(basename $source_file) \ \#include \"$(grep -r "\b$missing_func __ARGS" | sed -n "s/.*\/\(.*\)\:.*/\1/p")\" # Remove duplicates done | sort | uniq } echo "Finding missing function prototypes..." list_missing_includes "implicit declaration of function" echo "Finding missing identifier declarations..." list_missing_includes "use of undeclared identifier" Each list of required headers was added by hand in the following format: #include "vim.h" #include "*_defs.h" #include "filename.h" /* All other includes in same module here, in alphabetical order. */ /* All includes from other modules (e.g. "os/*.h") here in alphabetical * order. */
This commit is contained in:

committed by
Thiago de Arruda

parent
82e0636e78
commit
0ef90c13b7
429
src/os_unix.h
429
src/os_unix.h
@@ -1,351 +1,78 @@
|
||||
/* vi:set ts=8 sts=4 sw=4:
|
||||
*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
/*
|
||||
* NextStep has a problem with configure, undefine a few things:
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <ctype.h>
|
||||
|
||||
# include <sys/types.h>
|
||||
# include <sys/stat.h>
|
||||
|
||||
#ifdef HAVE_STDLIB_H
|
||||
# include <stdlib.h>
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
/* On AIX 4.2 there is a conflicting prototype for ioctl() in stropts.h and
|
||||
* unistd.h. This hack should fix that (suggested by Jeff George).
|
||||
* But on AIX 4.3 it's alright (suggested by Jake Hamby). */
|
||||
|
||||
#ifdef HAVE_UNISTD_H
|
||||
# include <unistd.h>
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_LIBC_H
|
||||
# include <libc.h> /* for NeXT */
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_SYS_PARAM_H
|
||||
# include <sys/param.h> /* defines BSD, if it's a BSD system */
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Sun defines FILE on SunOS 4.x.x, Solaris has a typedef for FILE
|
||||
*/
|
||||
|
||||
#ifndef __ARGS
|
||||
/* The AIX VisualAge cc compiler defines __EXTENDED__ instead of __STDC__
|
||||
* because it includes pre-ansi features. */
|
||||
# if defined(__STDC__) || defined(__GNUC__) || defined(__EXTENDED__)
|
||||
# define __ARGS(x) x
|
||||
# else
|
||||
# define __ARGS(x) ()
|
||||
# endif
|
||||
#endif
|
||||
|
||||
/* always use unlink() to remove files */
|
||||
# define vim_mkdir(x, y) mkdir((char *)(x), y)
|
||||
# define mch_rmdir(x) rmdir((char *)(x))
|
||||
# define mch_remove(x) unlink((char *)(x))
|
||||
|
||||
/* The number of arguments to a signal handler is configured here. */
|
||||
/* It used to be a long list of almost all systems. Any system that doesn't
|
||||
* have an argument??? */
|
||||
#define SIGHASARG
|
||||
|
||||
/* List 3 arg systems here. I guess __sgi, please test and correct me. jw. */
|
||||
|
||||
#ifdef SIGHASARG
|
||||
# ifdef SIGHAS3ARGS
|
||||
# define SIGPROTOARG (int, int, struct sigcontext *)
|
||||
# define SIGDEFARG(s) (s, sig2, scont) int s, sig2; struct sigcontext *scont;
|
||||
# define SIGDUMMYARG 0, 0, (struct sigcontext *)0
|
||||
# else
|
||||
# define SIGPROTOARG (int)
|
||||
# define SIGDEFARG(s) (s) int s;
|
||||
# define SIGDUMMYARG 0
|
||||
# endif
|
||||
#else
|
||||
# define SIGPROTOARG (void)
|
||||
# define SIGDEFARG(s) ()
|
||||
# define SIGDUMMYARG
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_DIRENT_H
|
||||
# include <dirent.h>
|
||||
# ifndef NAMLEN
|
||||
# define NAMLEN(dirent) strlen((dirent)->d_name)
|
||||
# endif
|
||||
#else
|
||||
# define dirent direct
|
||||
# define NAMLEN(dirent) (dirent)->d_namlen
|
||||
# if HAVE_SYS_NDIR_H
|
||||
# include <sys/ndir.h>
|
||||
# endif
|
||||
# if HAVE_SYS_DIR_H
|
||||
# include <sys/dir.h>
|
||||
# endif
|
||||
# if HAVE_NDIR_H
|
||||
# include <ndir.h>
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#if !defined(HAVE_SYS_TIME_H) || defined(TIME_WITH_SYS_TIME)
|
||||
# include <time.h> /* on some systems time.h should not be
|
||||
included together with sys/time.h */
|
||||
#endif
|
||||
#ifdef HAVE_SYS_TIME_H
|
||||
# include <sys/time.h>
|
||||
#endif
|
||||
|
||||
#include <signal.h>
|
||||
|
||||
#if defined(DIRSIZ) && !defined(MAXNAMLEN)
|
||||
# define MAXNAMLEN DIRSIZ
|
||||
#endif
|
||||
|
||||
#if defined(UFS_MAXNAMLEN) && !defined(MAXNAMLEN)
|
||||
# define MAXNAMLEN UFS_MAXNAMLEN /* for dynix/ptx */
|
||||
#endif
|
||||
|
||||
#if defined(NAME_MAX) && !defined(MAXNAMLEN)
|
||||
# define MAXNAMLEN NAME_MAX /* for Linux before .99p3 */
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Note: if MAXNAMLEN has the wrong value, you will get error messages
|
||||
* for not being able to open the swap file.
|
||||
*/
|
||||
#if !defined(MAXNAMLEN)
|
||||
# define MAXNAMLEN 512 /* for all other Unix */
|
||||
#endif
|
||||
|
||||
#define BASENAMELEN (MAXNAMLEN - 5)
|
||||
|
||||
#ifdef HAVE_PWD_H
|
||||
# include <pwd.h>
|
||||
#endif
|
||||
|
||||
#ifdef __COHERENT__
|
||||
# undef __ARGS
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Unix system-dependent file names
|
||||
*/
|
||||
#ifndef SYS_VIMRC_FILE
|
||||
# define SYS_VIMRC_FILE "$VIM/vimrc"
|
||||
#endif
|
||||
#ifndef SYS_GVIMRC_FILE
|
||||
# define SYS_GVIMRC_FILE "$VIM/gvimrc"
|
||||
#endif
|
||||
#ifndef DFLT_HELPFILE
|
||||
# define DFLT_HELPFILE "$VIMRUNTIME/doc/help.txt"
|
||||
#endif
|
||||
#ifndef FILETYPE_FILE
|
||||
# define FILETYPE_FILE "filetype.vim"
|
||||
#endif
|
||||
#ifndef FTPLUGIN_FILE
|
||||
# define FTPLUGIN_FILE "ftplugin.vim"
|
||||
#endif
|
||||
#ifndef INDENT_FILE
|
||||
# define INDENT_FILE "indent.vim"
|
||||
#endif
|
||||
#ifndef FTOFF_FILE
|
||||
# define FTOFF_FILE "ftoff.vim"
|
||||
#endif
|
||||
#ifndef FTPLUGOF_FILE
|
||||
# define FTPLUGOF_FILE "ftplugof.vim"
|
||||
#endif
|
||||
#ifndef INDOFF_FILE
|
||||
# define INDOFF_FILE "indoff.vim"
|
||||
#endif
|
||||
#ifndef SYS_MENU_FILE
|
||||
# define SYS_MENU_FILE "$VIMRUNTIME/menu.vim"
|
||||
#endif
|
||||
|
||||
#ifndef USR_EXRC_FILE
|
||||
# define USR_EXRC_FILE "$HOME/.exrc"
|
||||
#endif
|
||||
|
||||
|
||||
#ifndef USR_VIMRC_FILE
|
||||
# define USR_VIMRC_FILE "$HOME/.neovimrc"
|
||||
#endif
|
||||
|
||||
|
||||
#if !defined(USR_EXRC_FILE2)
|
||||
# define USR_VIMRC_FILE2 "~/.neovim/vimrc"
|
||||
#endif
|
||||
|
||||
|
||||
#ifndef USR_GVIMRC_FILE
|
||||
# define USR_GVIMRC_FILE "$HOME/.neogvimrc"
|
||||
#endif
|
||||
|
||||
#ifndef USR_GVIMRC_FILE2
|
||||
# define USR_GVIMRC_FILE2 "~/.neovim/gvimrc"
|
||||
#endif
|
||||
|
||||
|
||||
#ifndef EVIM_FILE
|
||||
# define EVIM_FILE "$VIMRUNTIME/evim.vim"
|
||||
#endif
|
||||
|
||||
# ifndef VIMINFO_FILE
|
||||
# define VIMINFO_FILE "$HOME/.neoviminfo"
|
||||
# endif
|
||||
|
||||
#ifndef EXRC_FILE
|
||||
# define EXRC_FILE ".exrc"
|
||||
#endif
|
||||
|
||||
#ifndef VIMRC_FILE
|
||||
# define VIMRC_FILE ".neovimrc"
|
||||
#endif
|
||||
|
||||
|
||||
#ifndef SYNTAX_FNAME
|
||||
# define SYNTAX_FNAME "$VIMRUNTIME/syntax/%s.vim"
|
||||
#endif
|
||||
|
||||
#ifndef DFLT_BDIR
|
||||
# define DFLT_BDIR ".,~/tmp,~/" /* default for 'backupdir' */
|
||||
#endif
|
||||
|
||||
#ifndef DFLT_DIR
|
||||
# define DFLT_DIR ".,~/tmp,/var/tmp,/tmp" /* default for 'directory' */
|
||||
#endif
|
||||
|
||||
#ifndef DFLT_VDIR
|
||||
# define DFLT_VDIR "$HOME/.neovim/view" /* default for 'viewdir' */
|
||||
#endif
|
||||
|
||||
#define DFLT_ERRORFILE "errors.err"
|
||||
|
||||
# ifdef RUNTIME_GLOBAL
|
||||
# define DFLT_RUNTIMEPATH "~/.neovim," RUNTIME_GLOBAL ",$VIMRUNTIME," \
|
||||
RUNTIME_GLOBAL "/after,~/.neovim/after"
|
||||
# else
|
||||
# define DFLT_RUNTIMEPATH \
|
||||
"~/.neovim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,~/.neovim/after"
|
||||
# endif
|
||||
|
||||
# define TEMPDIRNAMES "$TMPDIR", "/tmp", ".", "$HOME"
|
||||
# define TEMPNAMELEN 256
|
||||
|
||||
/* Special wildcards that need to be handled by the shell */
|
||||
#define SPECIAL_WILDCHAR "`'{"
|
||||
|
||||
#ifndef HAVE_OPENDIR
|
||||
# define NO_EXPANDPATH
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Unix has plenty of memory, use large buffers
|
||||
*/
|
||||
#define CMDBUFFSIZE 1024 /* size of the command processing buffer */
|
||||
|
||||
/* Use the system path length if it makes sense. */
|
||||
#if defined(PATH_MAX) && (PATH_MAX > 1000)
|
||||
# define MAXPATHL PATH_MAX
|
||||
#else
|
||||
# define MAXPATHL 1024
|
||||
#endif
|
||||
|
||||
#define CHECK_INODE /* used when checking if a swap file already
|
||||
exists for a file */
|
||||
# ifndef DFLT_MAXMEM
|
||||
# define DFLT_MAXMEM (5*1024) /* use up to 5 Mbyte for a buffer */
|
||||
# endif
|
||||
# ifndef DFLT_MAXMEMTOT
|
||||
# define DFLT_MAXMEMTOT (10*1024) /* use up to 10 Mbyte for Vim */
|
||||
# endif
|
||||
|
||||
/* memmove is not present on all systems, use memmove, bcopy, memcpy or our
|
||||
* own version */
|
||||
/* Some systems have (void *) arguments, some (char *). If we use (char *) it
|
||||
* works for all */
|
||||
#ifdef USEMEMMOVE
|
||||
# define mch_memmove(to, from, len) memmove((char *)(to), (char *)(from), len)
|
||||
#else
|
||||
# ifdef USEBCOPY
|
||||
# define mch_memmove(to, from, len) bcopy((char *)(from), (char *)(to), len)
|
||||
# else
|
||||
# ifdef USEMEMCPY
|
||||
# define mch_memmove(to, from, len) memcpy((char *)(to), (char *)(from), len)
|
||||
# else
|
||||
# define VIM_MEMMOVE /* found in misc2.c */
|
||||
# endif
|
||||
# endif
|
||||
#endif
|
||||
|
||||
# ifdef HAVE_RENAME
|
||||
# define mch_rename(src, dst) rename(src, dst)
|
||||
# else
|
||||
int mch_rename __ARGS((const char *src, const char *dest));
|
||||
# endif
|
||||
# ifdef __MVS__
|
||||
/* on OS390 Unix getenv() doesn't return a pointer to persistent
|
||||
* storage -> use __getenv() */
|
||||
# define mch_getenv(x) (char_u *)__getenv((char *)(x))
|
||||
# else
|
||||
# define mch_getenv(x) (char_u *)getenv((char *)(x))
|
||||
# endif
|
||||
# define mch_setenv(name, val, x) setenv(name, val, x)
|
||||
|
||||
#if !defined(S_ISDIR) && defined(S_IFDIR)
|
||||
# define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
|
||||
#endif
|
||||
#if !defined(S_ISREG) && defined(S_IFREG)
|
||||
# define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
|
||||
#endif
|
||||
#if !defined(S_ISBLK) && defined(S_IFBLK)
|
||||
# define S_ISBLK(m) (((m) & S_IFMT) == S_IFBLK)
|
||||
#endif
|
||||
#if !defined(S_ISSOCK) && defined(S_IFSOCK)
|
||||
# define S_ISSOCK(m) (((m) & S_IFMT) == S_IFSOCK)
|
||||
#endif
|
||||
#if !defined(S_ISFIFO) && defined(S_IFIFO)
|
||||
# define S_ISFIFO(m) (((m) & S_IFMT) == S_IFIFO)
|
||||
#endif
|
||||
#if !defined(S_ISCHR) && defined(S_IFCHR)
|
||||
# define S_ISCHR(m) (((m) & S_IFMT) == S_IFCHR)
|
||||
#endif
|
||||
|
||||
/* Note: Some systems need both string.h and strings.h (Savage). However,
|
||||
* some systems can't handle both, only use string.h in that case. */
|
||||
#ifdef HAVE_STRING_H
|
||||
# include <string.h>
|
||||
#endif
|
||||
#if defined(HAVE_STRINGS_H) && !defined(NO_STRINGS_WITH_STRING_H)
|
||||
# include <strings.h>
|
||||
#endif
|
||||
|
||||
#if defined(HAVE_SETJMP_H)
|
||||
# include <setjmp.h>
|
||||
# ifdef HAVE_SIGSETJMP
|
||||
# define JMP_BUF sigjmp_buf
|
||||
# define SETJMP(x) sigsetjmp((x), 1)
|
||||
# define LONGJMP siglongjmp
|
||||
# else
|
||||
# define JMP_BUF jmp_buf
|
||||
# define SETJMP(x) setjmp(x)
|
||||
# define LONGJMP longjmp
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#define HAVE_DUP /* have dup() */
|
||||
#define HAVE_ST_MODE /* have stat.st_mode */
|
||||
|
||||
/* We have three kinds of ACL support. */
|
||||
#define HAVE_ACL (HAVE_POSIX_ACL || HAVE_SOLARIS_ACL || HAVE_AIX_ACL)
|
||||
#ifndef NEOVIM_OS_UNIX_H
|
||||
#define NEOVIM_OS_UNIX_H
|
||||
/* os_unix.c */
|
||||
void mch_write __ARGS((char_u *s, int len));
|
||||
int mch_inchar __ARGS((char_u *buf, int maxlen, long wtime, int tb_change_cnt));
|
||||
int mch_char_avail __ARGS((void));
|
||||
void mch_delay __ARGS((long msec, int ignoreinput));
|
||||
int mch_stackcheck __ARGS((char *p));
|
||||
void mch_startjmp __ARGS((void));
|
||||
void mch_endjmp __ARGS((void));
|
||||
void mch_didjmp __ARGS((void));
|
||||
void mch_suspend __ARGS((void));
|
||||
void mch_init __ARGS((void));
|
||||
void reset_signals __ARGS((void));
|
||||
int vim_handle_signal __ARGS((int sig));
|
||||
int mch_check_win __ARGS((int argc, char **argv));
|
||||
int mch_input_isatty __ARGS((void));
|
||||
int mch_can_restore_title __ARGS((void));
|
||||
int mch_can_restore_icon __ARGS((void));
|
||||
void mch_settitle __ARGS((char_u *title, char_u *icon));
|
||||
void mch_restore_title __ARGS((int which));
|
||||
int vim_is_xterm __ARGS((char_u *name));
|
||||
int use_xterm_like_mouse __ARGS((char_u *name));
|
||||
int use_xterm_mouse __ARGS((void));
|
||||
int vim_is_iris __ARGS((char_u *name));
|
||||
int vim_is_vt300 __ARGS((char_u *name));
|
||||
int vim_is_fastterm __ARGS((char_u *name));
|
||||
int mch_get_user_name __ARGS((char_u *s, int len));
|
||||
int mch_get_uname __ARGS((uid_t uid, char_u *s, int len));
|
||||
void mch_get_host_name __ARGS((char_u *s, int len));
|
||||
long mch_get_pid __ARGS((void));
|
||||
void slash_adjust __ARGS((char_u *p));
|
||||
void fname_case __ARGS((char_u *name, int len));
|
||||
long mch_getperm __ARGS((char_u *name));
|
||||
int mch_setperm __ARGS((char_u *name, long perm));
|
||||
void mch_copy_sec __ARGS((char_u *from_file, char_u *to_file));
|
||||
vim_acl_T mch_get_acl __ARGS((char_u *fname));
|
||||
void mch_set_acl __ARGS((char_u *fname, vim_acl_T aclent));
|
||||
void mch_free_acl __ARGS((vim_acl_T aclent));
|
||||
void mch_hide __ARGS((char_u *name));
|
||||
int mch_isdir __ARGS((char_u *name));
|
||||
int mch_can_exe __ARGS((char_u *name));
|
||||
int mch_nodetype __ARGS((char_u *name));
|
||||
void mch_early_init __ARGS((void));
|
||||
void mch_free_mem __ARGS((void));
|
||||
void mch_exit __ARGS((int r));
|
||||
void mch_settmode __ARGS((int tmode));
|
||||
void get_stty __ARGS((void));
|
||||
void mch_setmouse __ARGS((int on));
|
||||
void check_mouse_termcode __ARGS((void));
|
||||
int mch_screenmode __ARGS((char_u *arg));
|
||||
int mch_get_shellsize __ARGS((void));
|
||||
void mch_set_shellsize __ARGS((void));
|
||||
void mch_new_shellsize __ARGS((void));
|
||||
int mch_call_shell __ARGS((char_u *cmd, int options));
|
||||
void mch_breakcheck __ARGS((void));
|
||||
int mch_expandpath __ARGS((garray_T *gap, char_u *path, int flags));
|
||||
int mch_expand_wildcards __ARGS((int num_pat, char_u **pat, int *num_file,
|
||||
char_u ***file,
|
||||
int flags));
|
||||
int mch_has_exp_wildcard __ARGS((char_u *p));
|
||||
int mch_has_wildcard __ARGS((char_u *p));
|
||||
int mch_libcall __ARGS((char_u *libname, char_u *funcname, char_u *argstring,
|
||||
int argint, char_u **string_result,
|
||||
int *number_result));
|
||||
void setup_term_clip __ARGS((void));
|
||||
void start_xterm_trace __ARGS((int button));
|
||||
void stop_xterm_trace __ARGS((void));
|
||||
void clear_xterm_clip __ARGS((void));
|
||||
int clip_xterm_own_selection __ARGS((VimClipboard *cbd));
|
||||
void clip_xterm_lose_selection __ARGS((VimClipboard *cbd));
|
||||
void clip_xterm_request_selection __ARGS((VimClipboard *cbd));
|
||||
void clip_xterm_set_selection __ARGS((VimClipboard *cbd));
|
||||
int xsmp_handle_requests __ARGS((void));
|
||||
void xsmp_init __ARGS((void));
|
||||
void xsmp_close __ARGS((void));
|
||||
/* vim: set ft=c : */
|
||||
#endif /* NEOVIM_OS_UNIX_H */
|
||||
|
Reference in New Issue
Block a user