[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r103848: Don't call gnulib's careadli
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r103848: Don't call gnulib's careadlinkat on Windows. |
Date: |
Wed, 06 Apr 2011 19:05:49 +0300 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 103848
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Wed 2011-04-06 19:05:49 +0300
message:
Don't call gnulib's careadlinkat on Windows.
src/w32.c (careadlinkat, careadlinkatcwd): New always-fail stubs.
lib/makefile.w32-in ($(BLD)/careadlinkat.$(O), GNULIBOBJS):
Revert last change.
modified:
ChangeLog
lib/makefile.w32-in
src/ChangeLog
src/w32.c
=== modified file 'ChangeLog'
--- a/ChangeLog 2011-04-06 14:16:43 +0000
+++ b/ChangeLog 2011-04-06 16:05:49 +0000
@@ -1,3 +1,8 @@
+2011-04-06 Eli Zaretskii <address@hidden>
+
+ * lib/makefile.w32-in ($(BLD)/careadlinkat.$(O), GNULIBOBJS):
+ Revert last change.
+
2011-04-06 Juanma Barranquero <address@hidden>
* lib/makefile.w32-in (GNULIBOBJS): Add careadlinkat.$(O).
=== modified file 'lib/makefile.w32-in'
--- a/lib/makefile.w32-in 2011-04-06 14:16:43 +0000
+++ b/lib/makefile.w32-in 2011-04-06 16:05:49 +0000
@@ -29,8 +29,7 @@
$(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 @@
$(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.
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2011-04-06 12:18:10 +0000
+++ b/src/ChangeLog 2011-04-06 16:05:49 +0000
@@ -1,3 +1,7 @@
+2011-04-06 Eli Zaretskii <address@hidden>
+
+ * w32.c (careadlinkat, careadlinkatcwd): New always-fail stubs.
+
2011-04-06 Paul Eggert <address@hidden>
Fix more problems found by GCC 4.6.0's static checks.
=== modified file 'src/w32.c'
--- a/src/w32.c 2011-03-29 14:00:16 +0000
+++ b/src/w32.c 2011-04-06 16:05:49 +0000
@@ -138,6 +138,9 @@
#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 @@
}
-/* 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 @@
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. */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r103848: Don't call gnulib's careadlinkat on Windows.,
Eli Zaretskii <=