am 32ecc299: am c56a6045: Merge "Remove HAVE_SYMLINKS."
* commit '32ecc29996d8061ebf5ba2a039368575488132ff': Remove HAVE_SYMLINKS.
This commit is contained in:
commit
527bf18609
|
@ -41,12 +41,6 @@
|
|||
*/
|
||||
#define HAVE_PTHREADS
|
||||
|
||||
/*
|
||||
* Define this if your platforms implements symbolic links
|
||||
* in its filesystems
|
||||
*/
|
||||
#define HAVE_SYMLINKS
|
||||
|
||||
/*
|
||||
* Add any extra platform-specific defines here.
|
||||
*/
|
||||
|
|
|
@ -41,12 +41,6 @@
|
|||
*/
|
||||
#define HAVE_PTHREADS
|
||||
|
||||
/*
|
||||
* Define this if your platforms implements symbolic links
|
||||
* in its filesystems
|
||||
*/
|
||||
#define HAVE_SYMLINKS
|
||||
|
||||
/*
|
||||
* Define if we have <malloc.h> header
|
||||
*/
|
||||
|
|
|
@ -41,12 +41,6 @@
|
|||
*/
|
||||
#define HAVE_PTHREADS
|
||||
|
||||
/*
|
||||
* Define this if your platforms implements symbolic links
|
||||
* in its filesystems
|
||||
*/
|
||||
#define HAVE_SYMLINKS
|
||||
|
||||
/*
|
||||
* Define if we have <malloc.h> header
|
||||
*/
|
||||
|
|
|
@ -46,12 +46,6 @@
|
|||
*/
|
||||
/* #define HAVE_MS_C_RUNTIME */
|
||||
|
||||
/*
|
||||
* Define this if your platforms implements symbolic links
|
||||
* in its filesystems
|
||||
*/
|
||||
#define HAVE_SYMLINKS
|
||||
|
||||
/*
|
||||
* Define if we have <malloc.h> header
|
||||
*/
|
||||
|
|
|
@ -41,12 +41,6 @@
|
|||
*/
|
||||
#define HAVE_PTHREADS
|
||||
|
||||
/*
|
||||
* Define this if your platforms implements symbolic links
|
||||
* in its filesystems
|
||||
*/
|
||||
#define HAVE_SYMLINKS
|
||||
|
||||
/*
|
||||
* Define if we have <malloc.h> header
|
||||
*/
|
||||
|
|
|
@ -41,12 +41,6 @@
|
|||
*/
|
||||
#define HAVE_PTHREADS
|
||||
|
||||
/*
|
||||
* Define this if your platforms implements symbolic links
|
||||
* in its filesystems
|
||||
*/
|
||||
#define HAVE_SYMLINKS
|
||||
|
||||
/*
|
||||
* We need to choose between 32-bit and 64-bit off_t. All of our code should
|
||||
* agree on the same size. For desktop systems, use 64-bit values,
|
||||
|
|
|
@ -27,12 +27,6 @@
|
|||
*/
|
||||
#define HAVE_PTHREADS
|
||||
|
||||
/*
|
||||
* Define this if your platforms implements symbolic links
|
||||
* in its filesystems
|
||||
*/
|
||||
#define HAVE_SYMLINKS 1
|
||||
|
||||
/*
|
||||
* Define if we have <malloc.h> header
|
||||
*/
|
||||
|
|
|
@ -28,7 +28,8 @@
|
|||
# define mkdir(path,mode) _mkdir(path)
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_SYMLINKS
|
||||
#if defined(_WIN32)
|
||||
# define S_ISLNK(s) 0
|
||||
# define lstat stat
|
||||
# ifndef EACCESS /* seems to be missing from the Mingw headers */
|
||||
# define EACCESS 13
|
||||
|
@ -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 {
|
||||
|
|
|
@ -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("\";");
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue