aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorPaul Eggert2019-06-25 15:54:37 -0700
committerPaul Eggert2019-06-25 15:56:58 -0700
commit824f78418783ee0af1c804b0decb037a13a4365e (patch)
tree7a4127256fa1117b609b1d5c50c8490b391708e1 /admin
parent7dcefa7a2bb4d2531d23cbf51eb98ce7727b366c (diff)
downloademacs-824f78418783ee0af1c804b0decb037a13a4365e.tar.gz
emacs-824f78418783ee0af1c804b0decb037a13a4365e.zip
Prefer PATH_MAX to MAXPATHLEN
PATH_MAX is standardized, MAXPATHLEN is not. Also, the Gnulib pathmax module fixes some rare bugs with PATH_MAX. So prefer PATH_MAX to MAXPATHLEN unless we know the latter is also correct (for some platform-specific code). * admin/merge-gnulib (GNULIB_MODULES): Add pathmax. This module was already present, as a dependency of canonicalize-lgpl, but now Emacs is using it directly. Sort. * lib-src/emacsclient.c: Include stdint.h, pathmax.h. (get_current_dir_name): Sync to current src/sysdep.c. * lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate. * src/sysdep.c: Include pathmax.h. (get_current_dir_name_or_unreachable): Use PATH_MAX instead of MAXPATHLEN.
Diffstat (limited to 'admin')
-rwxr-xr-xadmin/merge-gnulib5
1 files changed, 3 insertions, 2 deletions
diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index 6cf29589f71..42e9c0c8645 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -27,9 +27,9 @@ GNULIB_URL=git://git.savannah.gnu.org/gnulib.git
27 27
28GNULIB_MODULES=' 28GNULIB_MODULES='
29 alloca-opt binary-io byteswap c-ctype c-strcase 29 alloca-opt binary-io byteswap c-ctype c-strcase
30 canonicalize-lgpl
30 careadlinkat close-stream copy-file-range 31 careadlinkat close-stream copy-file-range
31 count-leading-zeros count-one-bits count-trailing-zeros 32 count-leading-zeros count-one-bits count-trailing-zeros
32 canonicalize-lgpl
33 crypto/md5-buffer crypto/sha1-buffer crypto/sha256-buffer crypto/sha512-buffer 33 crypto/md5-buffer crypto/sha1-buffer crypto/sha256-buffer crypto/sha512-buffer
34 d-type diffseq dosname dtoastr dtotimespec dup2 34 d-type diffseq dosname dtoastr dtotimespec dup2
35 environ execinfo explicit_bzero faccessat 35 environ execinfo explicit_bzero faccessat
@@ -38,7 +38,8 @@ GNULIB_MODULES='
38 getloadavg getopt-gnu gettime gettimeofday gitlog-to-changelog 38 getloadavg getopt-gnu gettime gettimeofday gitlog-to-changelog
39 ieee754-h ignore-value intprops largefile lstat 39 ieee754-h ignore-value intprops largefile lstat
40 manywarnings memmem-simple memrchr minmax mkostemp mktime nstrftime 40 manywarnings memmem-simple memrchr minmax mkostemp mktime nstrftime
41 pipe2 pselect pthread_sigmask putenv qcopy-acl readlink readlinkat regex 41 pathmax pipe2 pselect pthread_sigmask putenv
42 qcopy-acl readlink readlinkat regex
42 sig2str socklen stat-time std-gnu11 stdalign stddef stdio 43 sig2str socklen stat-time std-gnu11 stdalign stddef stdio
43 stpcpy strnlen strtoimax symlink sys_stat sys_time 44 stpcpy strnlen strtoimax symlink sys_stat sys_time
44 tempname time time_r time_rz timegm timer-time timespec-add timespec-sub 45 tempname time time_r time_rz timegm timer-time timespec-add timespec-sub