* %End-Header%
*/
+#include "config.h"
#include <stdio.h>
#include <unistd.h>
+#ifdef HAVE_STDLIB_H
#include <stdlib.h>
+#endif
#include <ctype.h>
#include <string.h>
#include <time.h>
#include "ext2fs/ext2_fs.h"
#include "ext2fs/ext2fs.h"
-#include "e2p/e2p.h"
#include "blkid/blkid.h"
#include "../version.h"
#include "nls-enable.h"
-const char * program_name = "get_fstab";
-char * device_name;
+static const char * program_name = "e2initrd_helper";
+static char * device_name;
static int open_flag;
static int root_type;
static blkid_cache cache = NULL;
{
errcode_t retval;
char *buf;
- ext2_file_t e2_file;
+ ext2_file_t e2_file = NULL;
unsigned int got;
struct ext2_inode inode;
ext2_ino_t ino;
retval = ext2fs_file_open(fs, ino, 0, &e2_file);
if (retval)
- return retval;
+ goto errout;
retval = ext2fs_file_read(e2_file, buf, inode.i_size, &got);
if (retval)
retval = ext2fs_file_close(e2_file);
if (retval)
- return retval;
+ goto errout;
ret_file->buf = buf;
ret_file->size = (int) got;
+ return 0;
errout:
- ext2fs_file_close(e2_file);
+ free(buf);
+ if (e2_file)
+ ext2fs_file_close(e2_file);
return retval;
}
fs->flags = 0;
fs->next = NULL;
- if (dev)
- free(dev);
+ free(dev);
return 0;
}
setlocale(LC_CTYPE, "");
bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
textdomain(NLS_CAT_NAME);
+ set_com_err_gettext(gettext);
#endif
while ((c = getopt(argc, argv, "rv")) != EOF) {
usage();
device_name = blkid_get_devname(NULL, argv[optind], NULL);
if (!device_name) {
- com_err("tune2fs", 0, _("Unable to resolve '%s'"),
+ com_err(program_name, 0, _("Unable to resolve '%s'"),
argv[optind]);
exit(1);
}
int ret;
retval = get_file(fs, "/etc/fstab", &file);
+ if (retval) {
+ com_err(program_name, retval, "couldn't open /etc/fstab");
+ exit(1);
+ }
while (!mem_file_eof(&file)) {
buf = get_line(&file);
PRS(argc, argv);
#ifdef CONFIG_TESTIO_DEBUG
- io_ptr = test_io_manager;
- test_io_backing_manager = unix_io_manager;
-#else
- io_ptr = unix_io_manager;
+ if (getenv("TEST_IO_FLAGS") || getenv("TEST_IO_BLOCK")) {
+ io_ptr = test_io_manager;
+ test_io_backing_manager = unix_io_manager;
+ } else
#endif
+ io_ptr = unix_io_manager;
retval = ext2fs_open (device_name, open_flag, 0, 0, io_ptr, &fs);
if (retval)
exit(1);