lgcosta
d3925f1521
The autotools setup could not bootstrap with modern autoconf/libtool:
`autoreconf -fi` failed with "possibly undefined macro: AC_PROG_LIBTOOL",
and several other macros used here were removed or deprecated long ago.
configure.ac:
- AC_PROG_LIBTOOL -> LT_INIT (with AC_CONFIG_MACRO_DIRS/AC_CONFIG_AUX_DIR);
add AM_PROG_AR required by newer libtool/automake.
- AM_CONFIG_HEADER -> AC_CONFIG_HEADERS; AC_OUTPUT(files...) -> AC_OUTPUT
with an explicit AC_CONFIG_FILES list.
- AC_TRY_COMPILE -> AC_COMPILE_IFELSE; drop AC_HEADER_STDC,
AC_PROG_GCC_TRADITIONAL, AC_STRUCT_ST_RDEV, AC_C_CONST and AC_C_INLINE
(all obsolete or unconditionally available).
- Drop AC_FUNC_MEMCMP/STRFTIME/VPRINTF; the corresponding HAVE_* macros
were never referenced. Keep the register_printf_* check but test the
ac_cv_func_* names that AC_CHECK_FUNCS actually sets.
- Pin -std=gnu11 (the sources predate C99 and rely on implicit-int-era
behaviour that newer C standards reject) and fix the -Wuninitialized
probe, which never set its cache variable.
- off_t/blkcnt_t sizeof fallbacks 64 -> 8 (bytes, not bits).
reiserfscore.pc.in: substitute @PACKAGE_VERSION@; REISERFSPROGS_VERSION was
never defined, so the generated .pc always carried an empty Version.
lib/parse_time.c: define _GNU_SOURCE, not _XOPEN_SOURCE. The valueless
_XOPEN_SOURCE disables _DEFAULT_SOURCE, which hides loff_t in <sys/types.h>
and broke the build. Every other translation unit already uses _GNU_SOURCE.
reiserfscore/xattr.c: drop the unused <sys/acl.h> include; no libacl symbol
is used (the reiserfs_acl_* structs come from reiserfs_fs.h), and the header
is not a declared build dependency.
Add autogen.sh to regenerate the build system after a fresh clone, and
update .gitignore for the build-aux/m4 layout and generated artifacts.
Verified: ./autogen.sh && ./configure && make completes on gcc 16 /
automake 1.18 / autoconf 2.72. mkreiserfs, reiserfsck --check,
debugreiserfs -S and reiserfstune all run against a freshly formatted
64 MiB image.
116 lines
2.4 KiB
C
116 lines
2.4 KiB
C
#include <sys/types.h>
|
|
#include <stdio.h>
|
|
#include <errno.h>
|
|
#include "reiserfs_lib.h"
|
|
|
|
static inline unsigned short from32to16(unsigned int x)
|
|
{
|
|
/* add up 16-bit and 16-bit for 16+c bit */
|
|
x = (x & 0xffff) + (x >> 16);
|
|
/* add up carry.. */
|
|
x = (x & 0xffff) + (x >> 16);
|
|
return x;
|
|
}
|
|
|
|
static unsigned int do_csum(const unsigned char *buff, int len)
|
|
{
|
|
int odd;
|
|
unsigned int result = 0;
|
|
|
|
if (len <= 0)
|
|
goto out;
|
|
odd = 1 & (unsigned long) buff;
|
|
if (odd) {
|
|
#ifdef __LITTLE_ENDIAN
|
|
result += (*buff << 8);
|
|
#else
|
|
result = *buff;
|
|
#endif
|
|
len--;
|
|
buff++;
|
|
}
|
|
if (len >= 2) {
|
|
if (2 & (unsigned long) buff) {
|
|
result += *(unsigned short *) buff;
|
|
len -= 2;
|
|
buff += 2;
|
|
}
|
|
if (len >= 4) {
|
|
const unsigned char *end = buff + ((unsigned)len & ~3);
|
|
unsigned int carry = 0;
|
|
do {
|
|
unsigned int w = *(unsigned int *) buff;
|
|
buff += 4;
|
|
result += carry;
|
|
result += w;
|
|
carry = (w > result);
|
|
} while (buff < end);
|
|
result += carry;
|
|
result = (result & 0xffff) + (result >> 16);
|
|
}
|
|
if (len & 2) {
|
|
result += *(unsigned short *) buff;
|
|
buff += 2;
|
|
}
|
|
}
|
|
if (len & 1)
|
|
#ifdef __LITTLE_ENDIAN
|
|
result += *buff;
|
|
#else
|
|
result += (*buff << 8);
|
|
#endif
|
|
result = from32to16(result);
|
|
if (odd)
|
|
result = ((result >> 8) & 0xff) | ((result & 0xff) << 8);
|
|
out:
|
|
return result;
|
|
}
|
|
|
|
__wsum csum_partial(const void *buff, int len, __wsum wsum)
|
|
{
|
|
unsigned int sum = (__force unsigned int)wsum;
|
|
unsigned int result = do_csum(buff, len);
|
|
|
|
/* add in old sum, and carry.. */
|
|
result += sum;
|
|
if (sum > result)
|
|
result += 1;
|
|
return (__force __wsum)result;
|
|
}
|
|
|
|
inline __u32 reiserfs_xattr_hash(const char *msg, int len)
|
|
{
|
|
return csum_partial(msg, len, 0);
|
|
}
|
|
|
|
|
|
int reiserfs_check_xattr(const void *body, int len)
|
|
{
|
|
const struct reiserfs_xattr_header *xah = body;
|
|
int hdrsz = sizeof(struct reiserfs_xattr_header);
|
|
__u32 hash;
|
|
|
|
if (len < hdrsz)
|
|
return -EINVAL;
|
|
|
|
hash = reiserfs_xattr_hash(body + hdrsz, len - hdrsz);
|
|
return xah->h_magic == cpu_to_le32(REISERFS_XATTR_MAGIC) &&
|
|
le32_to_cpu(xah->h_hash) == hash;
|
|
}
|
|
|
|
int reiserfs_acl_count(size_t size)
|
|
{
|
|
ssize_t s;
|
|
size -= sizeof(struct reiserfs_acl_header);
|
|
s = size - 4 * sizeof(struct reiserfs_acl_entry_short);
|
|
if (s < 0) {
|
|
if (size % sizeof(struct reiserfs_acl_entry_short))
|
|
return -1;
|
|
return size / sizeof(struct reiserfs_acl_entry_short);
|
|
} else {
|
|
if (s % sizeof(struct reiserfs_acl_entry))
|
|
return -1;
|
|
return s / sizeof(struct reiserfs_acl_entry) + 4;
|
|
}
|
|
}
|