Merge branch 'maint' into next

[tools/e2fsprogs.git] / misc / mklost+found.c

diff --git a/misc/mklost+found.c b/misc/mklost+found.c
index a4d0f7d..1431187 100644 (file)
--- a/misc/mklost+found.c
+++ b/misc/mklost+found.c
@@ -13,50 +13,52 @@
  * 93/04/22    - Creation
  */
 
+#include "config.h"
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
+#include <stdlib.h>
 #include <sys/param.h>
 #include <sys/stat.h>
 
-#include <linux/ext2_fs.h>
-
+#include "ext2fs/ext2_fs.h"
 #include "../version.h"
-#include "nls-enable.h"
+#include "support/nls-enable.h"
 
 #define LPF "lost+found"
 
 int main (int argc, char ** argv)
 {
-       char name [EXT2_NAME_LEN];
-       char path [sizeof (LPF) + 1 + 256];
+       char name[EXT2_NAME_LEN + 2];
+       char path[sizeof (LPF) + 1 + 256];
        struct stat st;
        int i, j;
        int d;
 
 #ifdef ENABLE_NLS
        setlocale(LC_MESSAGES, "");
+       setlocale(LC_CTYPE, "");
        bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
        textdomain(NLS_CAT_NAME);
 #endif
-       fprintf (stderr, _("mklost+found %s, %s for EXT2 FS %s, %s\n"),
-                E2FSPROGS_VERSION, E2FSPROGS_DATE,
-                EXT2FS_VERSION, EXT2FS_DATE);
+       fprintf (stderr, "mklost+found %s (%s)\n", E2FSPROGS_VERSION,
+                E2FSPROGS_DATE);
        if (argc != 1) {
-               fprintf (stderr, _("Usage: mklost+found\n"));
+               (void)argv; /* avoid unused argument warning */
+               fprintf (stderr, "%s", _("Usage: mklost+found\n"));
                exit(1);
        }
-       if (mkdir (LPF, 0755) == -1) {
+       if (mkdir (LPF, 0700) == -1) {
                perror ("mkdir");
                exit(1);
        }
-       
+
        i = 0;
-       memset (name, 'x', 252);
+       memset (name, 'x', 246);
        do {
-               sprintf (name + 252, "%02d", i);
+               sprintf (name + 246, "%08d", i);
                strcpy (path, LPF);
                strcat (path, "/");
                strcat (path, name);
@@ -72,7 +74,7 @@ int main (int argc, char ** argv)
                }
        } while (st.st_size <= (EXT2_NDIR_BLOCKS - 1) * st.st_blksize);
        for (j = 0; j < i; j++) {
-               sprintf (name + 252, "%02d", j);
+               sprintf (name + 246, "%08d", j);
                strcpy (path, LPF);
                strcat (path, "/");
                strcat (path, name);