* %End-Header%
*/
+#ifndef _LARGEFILE_SOURCE
#define _LARGEFILE_SOURCE
+#endif
+#ifndef _LARGEFILE64_SOURCE
#define _LARGEFILE64_SOURCE
+#endif
#include "config.h"
#include <fcntl.h>
#ifdef HAVE_ERRNO_H
#include <errno.h>
#endif
+#if HAVE_UNISTD_H
+#include <unistd.h>
+#endif
#ifdef HAVE_LINUX_MAJOR_H
#include <linux/major.h>
#endif
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
#include <time.h>
#include "et/com_err.h"
#include "e2p/e2p.h"
#include "ext2fs/ext2_fs.h"
#include "ext2fs/ext2fs.h"
-#include "nls-enable.h"
+#include "support/nls-enable.h"
#include "blkid/blkid.h"
#include "util.h"
static jmp_buf alarm_env;
-static void alarm_signal(int signal)
+static void alarm_signal(int signal EXT2FS_ATTR((unused)))
{
longjmp(alarm_env, 1);
}
{
char buf[256];
const char *short_yes = _("yY");
+ const char *english_yes = "yY";
fflush(stdout);
fflush(stderr);
if (delay > 0) {
if (setjmp(alarm_env)) {
signal(SIGALRM, SIG_IGN);
- printf(_("<proceeding>\n"));
+ printf("%s", _("<proceeding>\n"));
return;
}
signal(SIGALRM, alarm_signal);
- printf(_("Proceed anyway (or wait %d seconds) ? (y,n) "),
+ printf(_("Proceed anyway (or wait %d seconds to proceed) ? (y,N) "),
delay);
alarm(delay);
} else
- fputs(_("Proceed anyway? (y,n) "), stdout);
+ fputs(_("Proceed anyway? (y,N) "), stdout);
buf[0] = 0;
if (!fgets(buf, sizeof(buf), stdin) ||
- strchr(short_yes, buf[0]) == 0) {
+ strchr(_("nN"), buf[0]) ||
+ !(strchr(short_yes, buf[0]) ||
+ strchr(english_yes, buf[0]))) {
putc('\n', stdout);
exit(1);
}
signal(SIGALRM, SIG_IGN);
}
-/*
- * return 1 if the device looks plausible
- */
-int check_plausibility(const char *device, int flags, int *ret_is_dev)
-{
- int fd, is_dev = 0;
- ext2fs_struct_stat s;
- int fl = O_RDONLY;
- blkid_cache cache = NULL;
- char *fs_type = NULL;
- char *fs_label = NULL;
-
- if (flags & CREATE_FILE)
- fl |= O_CREAT;
-
- fd = open(device, fl, 0666);
- if (fd < 0) {
- fprintf(stderr, _("Could not open %s: %s\n"),
- device, error_message(errno));
- if (errno == ENOENT)
- fputs(_("\nThe device apparently does not exist; "
- "did you specify it correctly?\n"), stderr);
- exit(1);
- }
-
- if (ext2fs_fstat(fd, &s) < 0) {
- perror("stat");
- exit(1);
- }
- close(fd);
-
- if (S_ISBLK(s.st_mode))
- is_dev = 1;
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- /* On FreeBSD, all disk devices are character specials */
- if (S_ISCHR(s.st_mode))
- is_dev = 1;
-#endif
- if (ret_is_dev)
- *ret_is_dev = is_dev;
-
- if ((flags & CHECK_BLOCK_DEV) && !is_dev) {
- printf(_("%s is not a block special device.\n"), device);
- return 0;
- }
-
- if ((flags & CHECK_FS_EXIST) && blkid_get_cache(&cache, NULL) >= 0) {
- fs_type = blkid_get_tag_value(cache, "TYPE", device);
- if (fs_type)
- fs_label = blkid_get_tag_value(cache, "LABEL", device);
- blkid_put_cache(cache);
- }
-
- if (fs_type) {
- if (fs_label)
- printf(_("%s contains a %s file system "
- "labelled '%s'\n"), device, fs_type, fs_label);
- else
- printf(_("%s contains a %s file system\n"), device,
- fs_type);
- free(fs_type);
- free(fs_label);
- return 0;
- }
-
- /*
- * We should eventually replace this with a test for the
- * presence of a partition table. Unfortunately the blkid
- * library doesn't test for partition tabels, and checking for
- * valid GPT and MBR and possibly others isn't quite trivial.
- */
-
-#ifdef HAVE_LINUX_MAJOR_H
-#ifndef MAJOR
-#define MAJOR(dev) ((dev)>>8)
-#define MINOR(dev) ((dev) & 0xff)
-#endif
-#ifndef SCSI_BLK_MAJOR
-#ifdef SCSI_DISK0_MAJOR
-#ifdef SCSI_DISK8_MAJOR
-#define SCSI_DISK_MAJOR(M) ((M) == SCSI_DISK0_MAJOR || \
- ((M) >= SCSI_DISK1_MAJOR && (M) <= SCSI_DISK7_MAJOR) || \
- ((M) >= SCSI_DISK8_MAJOR && (M) <= SCSI_DISK15_MAJOR))
-#else
-#define SCSI_DISK_MAJOR(M) ((M) == SCSI_DISK0_MAJOR || \
- ((M) >= SCSI_DISK1_MAJOR && (M) <= SCSI_DISK7_MAJOR))
-#endif /* defined(SCSI_DISK8_MAJOR) */
-#define SCSI_BLK_MAJOR(M) (SCSI_DISK_MAJOR((M)) || (M) == SCSI_CDROM_MAJOR)
-#else
-#define SCSI_BLK_MAJOR(M) ((M) == SCSI_DISK_MAJOR || (M) == SCSI_CDROM_MAJOR)
-#endif /* defined(SCSI_DISK0_MAJOR) */
-#endif /* defined(SCSI_BLK_MAJOR) */
- if (((MAJOR(s.st_rdev) == HD_MAJOR &&
- MINOR(s.st_rdev)%64 == 0) ||
- (SCSI_BLK_MAJOR(MAJOR(s.st_rdev)) &&
- MINOR(s.st_rdev)%16 == 0))) {
- printf(_("%s is entire device, not just one partition!\n"),
- device);
- return 0;
- }
-#endif
- return 1;
-}
-
void check_mount(const char *device, int force, const char *type)
{
errcode_t retval;
if (mmp) {
time_t t = mmp->mmp_time;
- printf("MMP error info: last update: %s node: %s device: %s\n",
- ctime(&t), mmp->mmp_nodename, mmp->mmp_bdevname);
+ printf("MMP error info: node: %.*s, device: %.*s, updated: %s",
+ EXT2_LEN_STR(mmp->mmp_nodename),
+ EXT2_LEN_STR(mmp->mmp_bdevname), ctime(&t));
}
}