procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't call gnulib's careadlinkat on Windows.

Browse source 
src/w32.c (careadlinkat, careadlinkatcwd): New always-fail stubs.
 lib/makefile.w32-in ($(BLD)/careadlinkat.$(O), GNULIBOBJS):
 Revert last change.
This commit is contained in:
Eli Zaretskii 2011-04-06 19:05:49 +03:00
parent 0f1ba050b3
commit 973f782d33
4 changed files with 34 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2011-04-06 Eli Zaretskii <eliz@gnu.org>
* lib/makefile.w32-in ($(BLD)/careadlinkat.$(O), GNULIBOBJS):
Revert last change.
2011-04-06 Juanma Barranquero <lekktu@gmail.com>
* lib/makefile.w32-in (GNULIBOBJS): Add careadlinkat.$(O).

15
lib/makefile.w32-in
View file

@ -29,8 +29,7 @@ GNULIBOBJS = $(BLD)/dtoastr.$(O) \
$(BLD)/strftime.$(O) \
$(BLD)/time_r.$(O) \
$(BLD)/md5.$(O) \
$(BLD)/filemode.$(O) \
$(BLD)/careadlinkat.$(O)
$(BLD)/filemode.$(O)
#
# Build the library
@ -119,22 +118,12 @@ $(BLD)/filemode.$(O) : \
$(EMACS_ROOT)/src/m/intel386.h \
$(EMACS_ROOT)/src/config.h
$(BLD)/careadlinkat.$(O) : \
$(SRC)/careadlinkat.c \
$(SRC)/careadlinkat.h \
$(SRC)/allocator.h \
$(EMACS_ROOT)/nt/inc/unistd.h \
$(EMACS_ROOT)/nt/inc/sys/stat.h \
$(EMACS_ROOT)/src/s/ms-w32.h \
$(EMACS_ROOT)/src/m/intel386.h \
$(EMACS_ROOT)/src/config.h
# The following dependencies are for supporting parallel builds, where
# we must make sure $(BLD) exists before any compilation starts.
#
$(BLD)/dtoastr.$(O) $(BLD)/getopt.$(O) $(BLD)/getopt1.$(O): stamp_BLD
$(BLD)/strftime.$(O) $(BLD)/time_r.$(O) $(BLD)/md5.$(O): stamp_BLD
$(BLD)/filemode.$(O) $(BLD)/careadlinkat.$(O): stamp_BLD
$(BLD)/filemode.$(O): stamp_BLD
#
# Headers we would preprocess if we could.

4
src/ChangeLog
View file

@ -1,3 +1,7 @@
2011-04-06 Eli Zaretskii <eliz@gnu.org>
* w32.c (careadlinkat, careadlinkatcwd): New always-fail stubs.
2011-04-06 Paul Eggert <eggert@cs.ucla.edu>
Fix more problems found by GCC 4.6.0's static checks.

25
src/w32.c
View file

@ -138,6 +138,9 @@ typedef struct _PROCESS_MEMORY_COUNTERS_EX {
#include "dispextern.h" /* for xstrcasecmp */
#include "coding.h" /* for Vlocale_coding_system */
#include "careadlinkat.h"
#include "allocator.h"
/* For serial_configure and serial_open. */
#include "process.h"
@ -3610,8 +3613,8 @@ utime (const char *name, struct utimbuf *times)
}
/* Symlink-related functions that always fail. Used in fileio.c to
avoid #ifdef's. */
/* Symlink-related functions that always fail. Used in fileio.c and in
sysdep.c to avoid #ifdef's. */
int
symlink (char const *dummy1, char const *dummy2)
{
@ -3628,6 +3631,24 @@ readlink (const char *name, char *dummy1, size_t dummy2)
return -1;
}
char *
careadlinkat (int fd, char const *filename,
char *buffer, size_t buffer_size,
struct allocator const *alloc,
ssize_t (*preadlinkat) (int, char const *, char *, size_t))
{
errno = ENOSYS;
return NULL;
}
ssize_t
careadlinkatcwd (int fd, char const *filename, char *buffer,
size_t buffer_size)
{
(void) fd;
return readlink (filename, buffer, buffer_size);
}
/* Support for browsing other processes and their attributes. See
process.c for the Lisp bindings. */