summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-01-12 16:20:24 -0800
committerElliott Hughes <enh@google.com>2015-01-12 17:21:01 -0800
commit5877c21436816ced9dfc1abade6a9e81c9edb230 (patch)
tree8ad338b98f0a7cd33921b6d5d72e7695b2093190 /libs
parent1e61f12f1ecf42c91f71bcc7610a25d83ca738d9 (diff)
downloadbuild-5877c21436816ced9dfc1abade6a9e81c9edb230.zip
build-5877c21436816ced9dfc1abade6a9e81c9edb230.tar.gz
build-5877c21436816ced9dfc1abade6a9e81c9edb230.tar.bz2
Remove HAVE_SYMLINKS.
Change-Id: I685357292af45a048439f0df0ae45f513479841a
Diffstat (limited to 'libs')
-rw-r--r--libs/host/CopyFile.c13
-rw-r--r--libs/host/list.java35
2 files changed, 7 insertions, 41 deletions
diff --git a/libs/host/CopyFile.c b/libs/host/CopyFile.c
index f0c8fe5..855a565 100644
--- a/libs/host/CopyFile.c
+++ b/libs/host/CopyFile.c
@@ -28,8 +28,9 @@
# define mkdir(path,mode) _mkdir(path)
#endif
-#ifndef HAVE_SYMLINKS
-# define lstat stat
+#if defined(_WIN32)
+# define S_ISLNK(s) 0
+# define lstat stat
# ifndef EACCESS /* seems to be missing from the Mingw headers */
# define EACCESS 13
# endif
@@ -337,7 +338,6 @@ static int copyRegular(const char* src, const char* dst, const struct stat* pSrc
}
-#ifdef HAVE_SYMLINKS
/*
* Copy a symlink. This only happens if we're in "no derefence" mode,
* in which we copy the links rather than the files that are pointed at.
@@ -346,6 +346,9 @@ static int copyRegular(const char* src, const char* dst, const struct stat* pSrc
* we want to throw it out and replace it. If it's not a symlink, we
* need to trash it so we can create one.
*/
+#if defined(_WIN32)
+extern int copySymlink(const char* src, const char* dst, const struct stat* pSrcStat, unsigned int options) __attribute__((error("no symlinks on Windows")));
+#else
static int copySymlink(const char* src, const char* dst, const struct stat* pSrcStat, unsigned int options)
{
struct stat dstStat;
@@ -420,7 +423,7 @@ static int copySymlink(const char* src, const char* dst, const struct stat* pSrc
return 0;
}
-#endif /* HAVE_SYMLINKS */
+#endif
/*
* Copy the contents of one directory to another. Both "src" and "dst"
@@ -616,10 +619,8 @@ static int copyFileRecursive(const char* src, const char* dst, bool isCmdLine, u
} else {
retVal = copyDirectory(src, dst, &srcStat, options);
}
-#ifdef HAVE_SYMLINKS
} else if (S_ISLNK(srcStat.st_mode)) {
retVal = copySymlink(src, dst, &srcStat, options);
-#endif
} else if (S_ISREG(srcStat.st_mode)) {
retVal = copyRegular(src, dst, &srcStat, options);
} else {
diff --git a/libs/host/list.java b/libs/host/list.java
deleted file mode 100644
index 30546e3..0000000
--- a/libs/host/list.java
+++ /dev/null
@@ -1,35 +0,0 @@
-import java.io.*;
-
-public class list {
- private static char nibble(int c) {
- return (char)(c < 10 ? ('0' + c) : ('a' + (c-10)));
- }
- public static void main(String[] argv)
- {
- ByteArrayOutputStream stream = new ByteArrayOutputStream(100);
- OutputStreamWriter writer = null;
- try {
- writer = new OutputStreamWriter(stream, "utf-8");
- } catch (UnsupportedEncodingException e) {
- e.printStackTrace(System.err);
- }
-
- int n = Integer.parseInt(argv[1], 16);
- try {
- writer.write(n);
- writer.close();
- } catch (IOException e) {
- e.printStackTrace(System.err);
- }
-
- byte[] array = stream.toByteArray();
-
- System.out.print(" case '" + argv[0] + "': return \"");
- for (int i=0; i<array.length; i++) {
- int b = array[i];
- System.out.print("\\x" + nibble((b >> 4) & 0x0f) + nibble(b & 0xf));
- }
- System.out.println("\";");
- }
-}
-