mirror of
https://github.com/neovim/neovim.git
synced 2024-12-19 18:55:14 -07:00
os/*_defs.h: MAXNAMLEN cleanup
For non-Windows systems, we assume that NAME_MAX is in <limits.h>, as specified in POSIX.1-2008[1]. For Windows, which doesn't have NAME_MAX, just define it ourselves to _MAX_PATH[2]. Also, remove two (now unused) HAVE_*_H checks. [1]: http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/limits.h.html [2]: https://msdn.microsoft.com/en-us/library/930f87yf.aspx Helped-by: Seth Jackson
This commit is contained in:
parent
a1c770ca27
commit
f65d58907d
@ -16,7 +16,6 @@ check_type_size("void *" SIZEOF_VOID_PTR)
|
||||
check_symbol_exists(_NSGetEnviron crt_externs.h HAVE__NSGETENVIRON)
|
||||
|
||||
# Headers
|
||||
check_include_files(dirent.h HAVE_DIRENT_H)
|
||||
check_include_files(fcntl.h HAVE_FCNTL_H)
|
||||
check_include_files(iconv.h HAVE_ICONV_H)
|
||||
check_include_files(langinfo.h HAVE_LANGINFO_H)
|
||||
@ -25,7 +24,6 @@ check_include_files(locale.h HAVE_LOCALE_H)
|
||||
check_include_files(pwd.h HAVE_PWD_H)
|
||||
check_include_files(strings.h HAVE_STRINGS_H)
|
||||
check_include_files(stropts.h HAVE_STROPTS_H)
|
||||
check_include_files(sys/param.h HAVE_SYS_PARAM_H)
|
||||
check_include_files(sys/wait.h HAVE_SYS_WAIT_H)
|
||||
if(NOT HAVE_SYS_WAIT_H AND UNIX)
|
||||
# See if_cscope.c
|
||||
|
@ -42,7 +42,6 @@
|
||||
#cmakedefine HAVE_STRINGS_H
|
||||
#cmakedefine HAVE_STRNCASECMP
|
||||
#cmakedefine HAVE_STROPTS_H
|
||||
#cmakedefine HAVE_SYS_PARAM_H
|
||||
#cmakedefine HAVE_SYS_UTSNAME_H
|
||||
#cmakedefine HAVE_SYS_WAIT_H
|
||||
#cmakedefine HAVE_UNISTD_H
|
||||
|
@ -13,28 +13,7 @@
|
||||
# include "nvim/os/unix_defs.h"
|
||||
#endif
|
||||
|
||||
#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
|
||||
|
||||
#if defined(_MAX_PATH) && !defined(MAXNAMLEN)
|
||||
# define MAXNAMLEN _MAX_PATH /* for Windows */
|
||||
#endif
|
||||
|
||||
// Default value.
|
||||
#ifndef MAXNAMLEN
|
||||
# define MAXNAMLEN 512
|
||||
#endif
|
||||
|
||||
#define BASENAMELEN (MAXNAMLEN - 5)
|
||||
#define BASENAMELEN (NAME_MAX - 5)
|
||||
|
||||
// Use the system path length if it makes sense.
|
||||
#if defined(PATH_MAX) && (PATH_MAX > 1000)
|
||||
|
@ -1,13 +1,12 @@
|
||||
#ifndef NVIM_OS_UNIX_DEFS_H
|
||||
#define NVIM_OS_UNIX_DEFS_H
|
||||
|
||||
// Windows doesn't have unistd.h, so we include it here to avoid numerous
|
||||
// instances of `#ifdef HAVE_UNISTD_H'.
|
||||
#include <unistd.h>
|
||||
#include <signal.h>
|
||||
|
||||
// Defines BSD, if it's a BSD system.
|
||||
#ifdef HAVE_SYS_PARAM_H
|
||||
# include <sys/param.h>
|
||||
#endif
|
||||
// POSIX.1-2008 says that NAME_MAX should be in here
|
||||
#include <limits.h>
|
||||
|
||||
#define TEMP_DIR_NAMES {"$TMPDIR", "/tmp", ".", "~"}
|
||||
#define TEMP_FILE_PATH_MAXLEN 256
|
||||
|
@ -5,6 +5,8 @@
|
||||
#include <sys/stat.h>
|
||||
#include <stdio.h>
|
||||
|
||||
#define NAME_MAX _MAX_PATH
|
||||
|
||||
#define TEMP_DIR_NAMES {"$TMP", "$TEMP", "$USERPROFILE", ""}
|
||||
#define TEMP_FILE_PATH_MAXLEN _MAX_PATH
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user