summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--README3
-rw-r--r--config.mk4
-rw-r--r--src/filelist.c4
4 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5871729..f5b3b60 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,8 @@ git HEAD
Use --index-info <string> with format specifiers instead
* The thumbnail index now supports actions on the currently selected
thumbnail (patch by Olof-Joachim Frahm)
+ * feh now supports 'make stat64=1' to access 64bit CIFS shares from 32bit
+ hosts (for 32 <-> 32 or 64 <-> 64 bit, this works anyways)
Mon, 26 Sep 2011 09:35:41 +0200 Daniel Friesel <derf@finalrewind.org>
diff --git a/README b/README
index 2d3cf9c..5b48c66 100644
--- a/README
+++ b/README
@@ -40,7 +40,8 @@ Available flags are:
* curl (default 1) - use libcurl to view http:// and similar images
* debug (default 0) - debug build, enables --debug
* help (default 0) - include help text (refers to the manpage otherwise)
- * xinerama (default 1) - Support Xinerama multiscreen setups
+ * stat64 (default 0) - Support CIFS shares from 64bit hosts on 32bit machines
+ * xinerama (default 1) - Support Xinerama/XRandR multiscreen setups
So, by default libcurl and Xinerama are enabled, while debug is disabled.
diff --git a/config.mk b/config.mk
index 9c366de..f6d4031 100644
--- a/config.mk
+++ b/config.mk
@@ -41,6 +41,10 @@ ifeq (${help},1)
CFLAGS += -DINCLUDE_HELP
endif
+ifeq (${stat64},1)
+ CFLAGS += -D_FILE_OFFSET_BITS=64
+endif
+
ifeq (${xinerama},1)
CFLAGS += -DHAVE_LIBXINERAMA
LDLIBS += -lXinerama
diff --git a/src/filelist.c b/src/filelist.c
index 177711c..050246e 100644
--- a/src/filelist.c
+++ b/src/filelist.c
@@ -172,6 +172,10 @@ void add_file_to_filelist_recursively(char *origpath, unsigned char level)
if (!opt.quiet)
weprintf("you don't have permission to open %s - skipping", path);
break;
+ case EOVERFLOW:
+ weprintf("Cannot open %s - EOVERFLOW.\n"
+ "Recompile with stat64=1 to fix this");
+ break;
default:
if (!opt.quiet)
weprintf("couldn't open %s", path);