|
|
|
@ -1,36 +1,36 @@ |
|
|
|
Index: src/sort.c
|
|
|
|
Index: src/sort.c
|
|
|
|
--- src/sort.c.orig 2012-02-19 13:54:57.000000000 +0100
|
|
|
|
--- src/sort.c.orig 2012-06-03 13:15:30.000000000 +0200
|
|
|
|
+++ src/sort.c 2012-02-20 21:47:03.000000000 +0100
|
|
|
|
+++ src/sort.c 2012-06-05 10:19:09.000000000 +0200
|
|
|
|
@@ -42,7 +42,7 @@
|
|
|
|
@@ -43,7 +43,7 @@
|
|
|
|
static int sort_type;
|
|
|
|
static int sort_type;
|
|
|
|
|
|
|
|
|
|
|
|
static int sort_dir_list(const void *one, const void *two);
|
|
|
|
static int sort_dir_list(const void *one, const void *two);
|
|
|
|
-#if defined(_WIN32) || defined(__APPLE__)
|
|
|
|
-#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__)
|
|
|
|
+#if defined(_WIN32) || defined(__APPLE__) || defined(__FreeBSD__)
|
|
|
|
+#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__FreeBSD__)
|
|
|
|
#ifndef TEST
|
|
|
|
#ifndef TEST
|
|
|
|
static
|
|
|
|
static
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
@@ -95,14 +95,14 @@
|
|
|
|
@@ -96,14 +96,14 @@
|
|
|
|
if(!cfg.sort_numbers)
|
|
|
|
if(!cfg.sort_numbers)
|
|
|
|
return strcmp(s, t);
|
|
|
|
return strcmp(s, t);
|
|
|
|
else
|
|
|
|
else
|
|
|
|
-#if defined(_WIN32) || defined(__APPLE__)
|
|
|
|
-#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__)
|
|
|
|
+#if defined(_WIN32) || defined(__APPLE__) || defined(__FreeBSD__)
|
|
|
|
+#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__FreeBSD__)
|
|
|
|
return vercmp(s, t);
|
|
|
|
return vercmp(s, t);
|
|
|
|
#else
|
|
|
|
#else
|
|
|
|
return strverscmp(s, t);
|
|
|
|
return strverscmp(s, t);
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
-#if defined(_WIN32) || defined(__APPLE__)
|
|
|
|
-#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__)
|
|
|
|
+#if defined(_WIN32) || defined(__APPLE__) || defined(__FreeBSD__)
|
|
|
|
+#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__FreeBSD__)
|
|
|
|
#ifndef TEST
|
|
|
|
#ifndef TEST
|
|
|
|
static
|
|
|
|
static
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
Index: src/utils.c
|
|
|
|
Index: src/utils/utils.c
|
|
|
|
--- src/utils.c.orig 2012-02-19 13:54:57.000000000 +0100
|
|
|
|
--- src/utils/utils.c.orig 2012-06-03 13:15:30.000000000 +0200
|
|
|
|
+++ src/utils.c 2012-02-20 21:46:15.000000000 +0100
|
|
|
|
+++ src/utils/utils.c 2012-06-05 10:18:47.000000000 +0200
|
|
|
|
@@ -43,7 +43,7 @@
|
|
|
|
@@ -36,7 +36,7 @@
|
|
|
|
#include <sys/wait.h> /* waitpid() */
|
|
|
|
#include <sys/wait.h> /* waitpid() */
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
@ -39,7 +39,7 @@ Index: src/utils.c |
|
|
|
#include <mntent.h> /* getmntent() */
|
|
|
|
#include <mntent.h> /* getmntent() */
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
@@ -535,7 +535,7 @@
|
|
|
|
@@ -257,7 +257,7 @@
|
|
|
|
int
|
|
|
|
int
|
|
|
|
is_on_slow_fs(const char *full_path)
|
|
|
|
is_on_slow_fs(const char *full_path)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
@ -48,9 +48,9 @@ Index: src/utils.c |
|
|
|
return 0;
|
|
|
|
return 0;
|
|
|
|
#else
|
|
|
|
#else
|
|
|
|
FILE *f;
|
|
|
|
FILE *f;
|
|
|
|
Index: src/utils.h
|
|
|
|
Index: src/utils/utils.h
|
|
|
|
--- src/utils.h.orig 2012-02-19 13:54:57.000000000 +0100
|
|
|
|
--- src/utils/utils.h.orig 2012-06-03 13:15:30.000000000 +0200
|
|
|
|
+++ src/utils.h 2012-02-20 21:45:56.000000000 +0100
|
|
|
|
+++ src/utils/utils.h 2012-06-05 10:18:47.000000000 +0200
|
|
|
|
@@ -24,6 +24,7 @@
|
|
|
|
@@ -24,6 +24,7 @@
|
|
|
|
#include <windef.h>
|
|
|
|
#include <windef.h>
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
@ -58,4 +58,4 @@ Index: src/utils.h |
|
|
|
+#include <stdio.h>
|
|
|
|
+#include <stdio.h>
|
|
|
|
#include <regex.h>
|
|
|
|
#include <regex.h>
|
|
|
|
|
|
|
|
|
|
|
|
#include <limits.h> /* PATH_MAX */
|
|
|
|
#include <sys/types.h> /* mode_t */
|
|
|
|
|
