From c50444914b7236b549370c15d2f37703db41397a Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Sun, 9 Oct 2011 16:51:59 +0200 Subject: Add stat64 (-D_FILE_OFFSET_BITS=64) makeflag to support 64bit CIFS shares on 32bit hosts --- ChangeLog | 2 ++ README | 3 ++- config.mk | 4 ++++ src/filelist.c | 4 ++++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5871729..f5b3b60 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,8 @@ git HEAD Use --index-info 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 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); -- cgit v1.2.3