mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-05 22:20:24 -08:00
Fix the MS-DOS port and reading of symlink targets
* doc/misc/eglot.texi (Eglot Features): Add comma after @xref. * msdos/sed2v2.inp (GNULIB_ISSYMLINK): Define to 1. * msdos/sedlibmk.inp (HAVE_RANDOM_H): Undefine, in line with its deletion from gnulib.mk. (GL_GNULIB_STRINGEQ): Define to 1. * src/msdos.c (careadlinkat): NULL terminate at the end of the data written, not one character beyond the same.
This commit is contained in:
parent
6ab56a31a5
commit
abcc099c73
4 changed files with 5 additions and 4 deletions
|
|
@ -449,7 +449,7 @@ command (@pxref{Eglot Commands}).
|
|||
On-the-fly succinct informative annotations, so-called @dfn{inlay
|
||||
hints}. Eglot adds special intangible text nearby certain identifiers,
|
||||
be it the type of a variable, or the name of a formal parameter in a
|
||||
function call. @xref{Eglot Commands} and the
|
||||
function call. @xref{Eglot Commands}, and the
|
||||
@code{eglot-inlay-hints-mode} minor mode.
|
||||
|
||||
@item
|
||||
|
|
|
|||
|
|
@ -140,6 +140,7 @@ s/^#undef HAVE_DECL_STRTOIMAX *$/#define HAVE_DECL_STRTOIMAX 1/
|
|||
s/^#undef HAVE_PDUMPER *$/#define HAVE_PDUMPER 1/
|
||||
s/^#undef HAVE_STRTOLL *$/#define HAVE_STRTOLL 1/
|
||||
s/^#undef HAVE_STRTOULL *$/#define HAVE_STRTOULL 1/
|
||||
s/^#undef GNULIB_ISSYMLINK *$/#define GNULIB_ISSYMLINK 1/
|
||||
/^#undef ALIGNOF_INT *$/s/^.*$/#define ALIGNOF_INT 4/
|
||||
/^#undef ALIGNOF_LONG *$/s/^.*$/#define ALIGNOF_LONG 4/
|
||||
/^#undef ALIGNOF_LONG_LONG *$/s/^.*$/#define ALIGNOF_LONG_LONG 4/
|
||||
|
|
|
|||
|
|
@ -189,6 +189,7 @@ s/@PACKAGE@/emacs/
|
|||
/^GL_GNULIB_MKOSTEMP *=/s/@GL_GNULIB_MKOSTEMP@/1/
|
||||
/^GL_GNULIB_MKTIME *=/s/@GL_GNULIB_MKTIME@/1/
|
||||
/^GL_GNULIB_SIGDESCR_NP *=/s/@GL_GNULIB_SIGDESCR_NP@/1/
|
||||
/^GL_GNULIB_STRINGEQ *=/s/@GL_GNULIB_STRINGEQ@/1/
|
||||
/^GL_GNULIB_TIME_R *=/s/@GL_GNULIB_TIME_R@/1/
|
||||
/^GL_GNULIB_TIMEGM *=/s/@GL_GNULIB_TIMEGM@/1/
|
||||
/^GL_GNULIB_TIME_RZ *=/s/@GL_GNULIB_TIME_RZ@/1/
|
||||
|
|
@ -240,7 +241,6 @@ s/@PACKAGE@/emacs/
|
|||
/^HAVE_PCLOSE *=/s/@HAVE_PCLOSE@/1/
|
||||
/^HAVE_POPEN *=/s/@HAVE_POPEN@/1/
|
||||
/^HAVE_POSIX_SIGNALBLOCKING *=/s/@HAVE_POSIX_SIGNALBLOCKING@/1/
|
||||
/^HAVE_RANDOM_H *=/s/@HAVE_RANDOM_H@/1/
|
||||
/^HAVE_RAISE *=/s/@HAVE_RAISE@/1/
|
||||
/^HAVE_RANDOM *=/s/@HAVE_RANDOM@/1/
|
||||
/^HAVE_READDIR *=/s/@HAVE_READDIR@/1/
|
||||
|
|
|
|||
|
|
@ -3996,12 +3996,12 @@ careadlinkat (int fd, char const *filename,
|
|||
}
|
||||
else
|
||||
{
|
||||
ssize_t len = preadlinkat (fd, filename, buffer, buffer_size);
|
||||
ssize_t len = (*preadlinkat) (fd, filename, buffer, buffer_size);
|
||||
|
||||
if (len < 0 || len == buffer_size)
|
||||
buffer = NULL;
|
||||
else
|
||||
buffer[len + 1] = '\0';
|
||||
buffer[len] = '\0';
|
||||
}
|
||||
return buffer;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue