*/
#define _LARGEFILE64_SOURCE
-#define _FILE_OFFSET_BITS 64
#include <sys/types.h>
#include <dirent.h>
#include <string.h>
#include <sys/param.h>
#include <sys/stat.h>
-#include <linux/ext2_fs.h>
+#include "ext2fs/ext2_fs.h"
#include "et/com_err.h"
#include "e2p/e2p.h"
#include "../version.h"
#include "nls-enable.h"
+#ifdef __GNUC__
+#define EXT2FS_ATTR(x) __attribute__(x)
+#else
+#define EXT2FS_ATTR(x)
+#endif
+
static const char * program_name = "lsattr";
static int all;
static int verbose;
static int generation_opt;
+#ifdef _LFS64_LARGEFILE
+#define LSTAT lstat64
+#define STRUCT_STAT struct stat64
+#else
+#define LSTAT lstat
+#define STRUCT_STAT struct stat
+#endif
+
static void usage(void)
{
fprintf(stderr, _("Usage: %s [-RVadlv] [files...]\n"), program_name);
static void lsattr_args (const char * name)
{
- struct stat st;
+ STRUCT_STAT st;
- if (lstat (name, &st) == -1)
+ if (LSTAT (name, &st) == -1)
com_err (program_name, errno, _("while trying to stat %s"),
name);
else {
}
}
-static int lsattr_dir_proc (const char * dir_name, struct dirent * de, void * private)
+static int lsattr_dir_proc (const char * dir_name, struct dirent * de,
+ void * private EXT2FS_ATTR((unused)))
{
- struct stat st;
+ STRUCT_STAT st;
char *path;
+ int dir_len = strlen(dir_name);
- path = malloc(strlen (dir_name) + 1 + strlen (de->d_name) + 1);
+ path = malloc(dir_len + strlen (de->d_name) + 2);
- sprintf (path, "%s/%s", dir_name, de->d_name);
- if (lstat (path, &st) == -1)
+ if (dir_len && dir_name[dir_len-1] == '/')
+ sprintf (path, "%s%s", dir_name, de->d_name);
+ else
+ sprintf (path, "%s/%s", dir_name, de->d_name);
+ if (LSTAT (path, &st) == -1)
perror (path);
else {
if (de->d_name[0] != '.' || all) {
#ifdef ENABLE_NLS
setlocale(LC_MESSAGES, "");
+ setlocale(LC_CTYPE, "");
bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
textdomain(NLS_CAT_NAME);
#endif
}
if (verbose)
- fprintf (stderr, _("lsattr %s, %s for EXT2 FS %s, %s\n"),
- E2FSPROGS_VERSION, E2FSPROGS_DATE,
- EXT2FS_VERSION, EXT2FS_DATE);
+ fprintf (stderr, "lsattr %s (%s)\n",
+ E2FSPROGS_VERSION, E2FSPROGS_DATE);
if (optind > argc - 1)
lsattr_args (".");
else