e2fsck, tune2fs: Fix Hurd compilation problem due to lack of PATH_MAX

Hurd doesn't define PATH_MAX, so calculate the exact size needed for
the tdb filename, and allocate it dynamically.

Addresses-Debian-Bug: #521602

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

diff --git a/misc/mke2fs.c b/misc/mke2fs.c
index 4f50ffa..a9b01cb 100644 (file)
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@ -1797,7 +1797,7 @@ open_err_out:
 static int mke2fs_setup_tdb(const char *name, io_manager *io_ptr)
 {
        errcode_t retval = 0;
-       char *tdb_dir, tdb_file[PATH_MAX];
+       char *tdb_dir, *tdb_file;
        char *device_name, *tmp_name;
 
        /*
@@ -1815,7 +1815,16 @@ static int mke2fs_setup_tdb(const char *name, io_manager *io_ptr)
                return 0;
 
        tmp_name = strdup(name);
+       if (!tmp_name) {
+       alloc_fn_fail:
+               com_err(program_name, ENOMEM, 
+                       _("Couldn't allocate memory for tdb filename\n"));
+               return ENOMEM;
+       }
        device_name = basename(tmp_name);
+       tdb_file = malloc(strlen(tdb_dir) + 8 + strlen(device_name) + 7 + 1);
+       if (!tdb_file)
+               goto alloc_fn_fail;
        sprintf(tdb_file, "%s/mke2fs-%s.e2undo", tdb_dir, device_name);
 
        if (!access(tdb_file, F_OK)) {
@@ -1824,6 +1833,7 @@ static int mke2fs_setup_tdb(const char *name, io_manager *io_ptr)
                        com_err(program_name, retval,
                                _("while trying to delete %s"),
                                tdb_file);
+                       free(tdb_file);
                        return retval;
                }
        }
@@ -1835,6 +1845,7 @@ static int mke2fs_setup_tdb(const char *name, io_manager *io_ptr)
                 "using the command:\n"
                 "    e2undo %s %s\n\n"), tdb_file, name);
 
+       free(tdb_file);
        free(tmp_name);
        return retval;
 }

diff --git a/misc/tune2fs.c b/misc/tune2fs.c
index 9692443..5808e49 100644 (file)
--- a/misc/tune2fs.c
+++ b/misc/tune2fs.c
@@ -1430,7 +1430,7 @@ static int tune2fs_setup_tdb(const char *name, io_manager *io_ptr)
 {
        errcode_t retval = 0;
        const char *tdb_dir;
-       char tdb_file[PATH_MAX];
+       char *tdb_file;
        char *dev_name, *tmp_name;
 
 #if 0 /* FIXME!! */
@@ -1443,6 +1443,12 @@ static int tune2fs_setup_tdb(const char *name, io_manager *io_ptr)
                                        &tdb_dir);
 #endif
        tmp_name = strdup(name);
+       if (!tmp_name) {
+       alloc_fn_fail:
+               com_err(program_name, ENOMEM, 
+                       _("Couldn't allocate memory for tdb filename\n"));
+               return ENOMEM;
+       }
        dev_name = basename(tmp_name);
 
        tdb_dir = getenv("E2FSPROGS_UNDO_DIR");
@@ -1453,6 +1459,9 @@ static int tune2fs_setup_tdb(const char *name, io_manager *io_ptr)
            access(tdb_dir, W_OK))
                return 0;
 
+       tdb_file = malloc(strlen(tdb_dir) + 9 + strlen(dev_name) + 7 + 1);
+       if (!tdb_file)
+               goto alloc_fn_fail;
        sprintf(tdb_file, "%s/tune2fs-%s.e2undo", tdb_dir, dev_name);
 
        if (!access(tdb_file, F_OK)) {
@@ -1461,6 +1470,7 @@ static int tune2fs_setup_tdb(const char *name, io_manager *io_ptr)
                        com_err(program_name, retval,
                                _("while trying to delete %s"),
                                tdb_file);
+                       free(tdb_file);
                        return retval;
                }
        }
@@ -1471,6 +1481,7 @@ static int tune2fs_setup_tdb(const char *name, io_manager *io_ptr)
        printf(_("To undo the tune2fs operation please run "
                 "the command\n    e2undo %s %s\n\n"),
                 tdb_file, name);
+       free(tdb_file);
        free(tmp_name);
        return retval;
 }