simplify LFS

Author: vassilit

.clang_complete

@@ -12,8 +12,8 @@
 -pipe
 -fPIC
 -g
--D_GNU_SOURCE 
--DHAVE_STAT64=0
+-D_GNU_SOURCE
+-D_FILE_OFFSET_BITS=64
 -I/usr/include/gtk-3.0
 -I/usr/include/at-spi2-atk/2.0
 -I/usr/include/gtk-3.0

SConstruct

@@ -191,28 +191,6 @@ def check_fiemap(context):
     return rc
 
 
-def check_bigfiles(context):
-    off_t_is_big_enough = True
-
-    if tests.CheckTypeSize(context, 'off_t', header='#include <sys/types.h>\n') < 8:
-        off_t_is_big_enough = False
-
-    have_stat64 = True
-    if tests.CheckFunc(
-        context, 'stat64'
-    ):
-        have_stat64 = False
-
-    rc = int(off_t_is_big_enough or have_stat64)
-    conf.env['HAVE_BIG_OFF_T'] = int(off_t_is_big_enough)
-    conf.env['HAVE_BIG_STAT'] = int(have_stat64)
-    conf.env['HAVE_BIGFILES'] = rc
-
-    context.did_show_result = True
-    context.Result(rc)
-    return rc
-
-
 def check_blkid(context):
     rc = 1
 
@@ -560,7 +538,6 @@ conf = Configure(env, custom_tests={
     'check_blkid': check_blkid,
     'check_posix_fadvise': check_posix_fadvise,
     'check_sys_block': check_sys_block,
-    'check_bigfiles': check_bigfiles,
     'check_c11': check_c11,
     'check_gettext': check_gettext,
     'check_linux_limits': check_linux_limits,
@@ -648,7 +625,7 @@ else:
 conf.env.Append(CCFLAGS=c_standard)
 
 conf.env.Append(CCFLAGS=[
-    '-pipe', '-D_GNU_SOURCE'
+    '-pipe', '-D_GNU_SOURCE', '-D_FILE_OFFSET_BITS=64'
 ])
 
 # Support cygwin:
@@ -693,7 +670,6 @@ conf.check_libelf()
 conf.check_fiemap()
 conf.check_xattr()
 conf.check_lxattr()
-conf.check_bigfiles()
 conf.check_sha512()
 conf.check_gettext()
 conf.check_linux_limits()
@@ -886,9 +862,6 @@ if 'config' in COMMAND_LINE_TARGETS:
     Build manpage from docs/rmlint.1.rst                  : {sphinx}
     Support for caching checksums in file's xattr         : {xattr}
     Support for reading json caches (needs json-glib)     : {json_glib}
-    Checking for proper support of big files >= 4GB       : {bigfiles}
-        (needs either sizeof(off_t) >= 8 ...)             : {bigofft}
-        (... or presence of stat64)                       : {bigstat}
 
     Optimize non-rotational disks                         : {nonrotational}
         (needs libblkid for resolving dev_t to path)      : {blkid}
@@ -922,9 +895,6 @@ Type 'scons' to actually compile rmlint now. Good luck.
             blkid=yesno(env['HAVE_BLKID']),
             fiemap=yesno(env['HAVE_FIEMAP']),
             sha512=yesno(env['HAVE_SHA512']),
-            bigfiles=yesno(env['HAVE_BIGFILES']),
-            bigofft=yesno(env['HAVE_BIG_OFF_T']),
-            bigstat=yesno(env['HAVE_BIG_STAT']),
             sphinx=COLORS['green'] + 'yes, using ' + COLORS['end'] + sphinx_bin if sphinx_bin else yesno(sphinx_bin),
             compiler=env['CC'],
             prefix=GetOption('prefix'),

lib/SConscript

@@ -26,10 +26,7 @@ def build_config_template(target, source, env):
             HAVE_XATTR=env['HAVE_XATTR'],
             HAVE_LXATTR=env['HAVE_LXATTR'],
             HAVE_SHA512=env['HAVE_SHA512'],
-            HAVE_BIGFILES=env['HAVE_BIGFILES'],
-            HAVE_STAT64=env['HAVE_BIG_STAT'],
             HAVE_POSIX_FADVISE=env['HAVE_POSIX_FADVISE'],
-            HAVE_BIG_OFF_T=env['HAVE_BIG_OFF_T'],
             HAVE_BLKID=env['HAVE_BLKID'],
             HAVE_SYSBLOCK=env['HAVE_SYSBLOCK'],
             HAVE_LINUX_LIMITS=env['HAVE_LINUX_LIMITS'],

lib/cmdline.c

@@ -73,7 +73,6 @@ static void rm_cmd_show_version(void) {
                     {.name = "nonstripped",    .enabled = HAVE_LIBELF},
                     {.name = "fiemap",         .enabled = HAVE_FIEMAP},
                     {.name = "sha512",         .enabled = HAVE_SHA512},
-                    {.name = "bigfiles",       .enabled = HAVE_BIGFILES},
                     {.name = "intl",           .enabled = HAVE_LIBINTL},
                     {.name = "replay",         .enabled = HAVE_JSON_GLIB},
                     {.name = "xattr",          .enabled = HAVE_XATTR},

lib/config.h.in

@@ -12,9 +12,6 @@
 #define HAVE_XATTR         ({HAVE_XATTR})
 #define HAVE_LXATTR        ({HAVE_LXATTR})
 #define HAVE_SHA512        ({HAVE_SHA512})
-#define HAVE_BIGFILES      ({HAVE_BIGFILES})
-#define HAVE_STAT64        ({HAVE_STAT64})
-#define HAVE_BIG_OFF_T     ({HAVE_BIG_OFF_T})
 #define HAVE_SYSBLOCK      ({HAVE_SYSBLOCK})
 #define HAVE_LINUX_LIMITS  ({HAVE_LINUX_LIMITS})
 #define HAVE_POSIX_FADVISE ({HAVE_POSIX_FADVISE})

lib/utilities.h

@@ -53,12 +53,7 @@ typedef enum RmLinkType {
     RM_LINK_ERROR           = 11,
 } RmLinkType;
 
-
-#if HAVE_STAT64 && !RM_IS_APPLE
-typedef struct stat64 RmStat;
-#else
 typedef struct stat RmStat;
-#endif
 
 ////////////////////////
 //  MATHS SHORTCUTS   //
@@ -88,19 +83,11 @@ typedef struct stat RmStat;
 ////////////////////////////////////
 
 WARN_UNUSED_RESULT static inline int rm_sys_stat(const char *path, RmStat *buf)  {
-#if HAVE_STAT64 && !RM_IS_APPLE
-    return stat64(path, buf);
-#else
     return stat(path, buf);
-#endif
 }
 
 WARN_UNUSED_RESULT static inline int rm_sys_lstat(const char *path, RmStat *buf) {
-#if HAVE_STAT64 && !RM_IS_APPLE
-    return lstat64(path, buf);
-#else
     return lstat(path, buf);
-#endif
 }
 
 static inline gdouble rm_sys_stat_mtime_float(RmStat *stat) {
@@ -112,12 +99,6 @@ static inline gdouble rm_sys_stat_mtime_float(RmStat *stat) {
 }
 
 static inline int rm_sys_open(const char *path, int mode) {
-#if HAVE_STAT64
-#ifdef O_LARGEFILE
-    mode |= O_LARGEFILE;
-#endif
-#endif
-
     return open(path, mode, (S_IRUSR | S_IWUSR));
 }
 
@@ -135,12 +116,6 @@ static inline gint64 rm_sys_preadv(int fd, const struct iovec *iov, int iovcnt,
         return 0;
     }
     return readv(fd, iov, iovcnt);
-#elif RM_PLATFORM_32
-    if(lseek64(fd, offset, SEEK_SET) == -1) {
-        rm_log_perror("seek in emulated preadv failed");
-        return 0;
-    }
-    return readv(fd, iov, iovcnt);
 #else
     return preadv(fd, iov, iovcnt, offset);
 #endif