diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2026-02-13 17:37:50 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2026-02-13 17:44:46 -0800 |
| commit | f81d3a4882ea499a9a36ae7f277d7745e7c09928 (patch) | |
| tree | 213eac6d1ad6dcaf7e73c487c170d37a99744ac6 /lib | |
| parent | a937396e7626a2a217e747aa1320d669f2323032 (diff) | |
Update from Gnulib by running admin/merge-gnulib
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/filename.h | 5 | ||||
| -rw-r--r-- | lib/stdio-consolesafe.c | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lib/filename.h b/lib/filename.h index bc401b17a88..e37a373eb41 100644 --- a/lib/filename.h +++ b/lib/filename.h @@ -49,7 +49,10 @@ extern "C" { any notion of "current directory". IS_RELATIVE_FILE_NAME(Filename) tests whether Filename may be concatenated - to a directory filename. + to a directory filename to yield the name + of a file relative to that directory. + Watch out: IS_RELATIVE_FILE_NAME ("") is 1 + even though "" is not a relative file name. Note: On native Windows, OS/2, DOS, "c:" is neither an absolute nor a relative file name! IS_FILE_NAME_WITH_DIR(Filename) tests whether Filename contains a device diff --git a/lib/stdio-consolesafe.c b/lib/stdio-consolesafe.c index c9486f1a32f..f634de13ef4 100644 --- a/lib/stdio-consolesafe.c +++ b/lib/stdio-consolesafe.c @@ -85,7 +85,7 @@ gl_consolesafe_fwrite (const void *ptr, size_t size, size_t nmemb, FILE *fp) specifiers as the mingw *printf functions. */ static int -vasprintf (char **resultp, const char *format, va_list args) +local_vasprintf (char **resultp, const char *format, va_list args) { /* First try: Use a stack-allocated buffer. */ char buf[2048]; @@ -123,6 +123,9 @@ vasprintf (char **resultp, const char *format, va_list args) return nbytes; } +# undef vasprintf +# define vasprintf local_vasprintf + # endif /* Bypass the functions __mingw_[v][f]printf, that trigger a bug in msvcrt, |