Commit c5044491 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Add stat64 (-D_FILE_OFFSET_BITS=64) makeflag to support 64bit CIFS shares on 32bit hosts

parent 43d52da2

ChangeLog

+2 −0
Original line number Diff line number Diff line
@@ -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>

README

+2 −1
Original line number Diff line number Diff line
@@ -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.

config.mk

+4 −0
Original line number Diff line number Diff line
@@ -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

src/filelist.c

+4 −0
Original line number Diff line number Diff line
@@ -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);