* parallel execution.
*
* Written by Theodore Ts'o, <tytso@mit.edu>
- *
+ *
* Miquel van Smoorenburg (miquels@drinkel.ow.org) 20-Oct-1994:
* o Changed -t fstype to behave like with mount when -A (all file
* systems) or -M (like mount) is specified.
* can be added without changing this front-end.
* o -R flag skip root file system.
*
- * Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+ * Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
* 2001, 2002, 2003, 2004, 2005 by Theodore Ts'o.
*
* %Begin-Header%
* %End-Header%
*/
+#define _XOPEN_SOURCE 600 /* for inclusion of sa_handler in Solaris */
+
+#include "config.h"
#include <sys/types.h>
#include <sys/wait.h>
#include <sys/signal.h>
"minix",
"ext2",
"ext3",
+ "ext4",
+ "ext4dev",
"jfs",
"reiserfs",
"xiafs",
static void free_instance(struct fsck_instance *i)
{
- if (i->prog)
- free(i->prog);
- if (i->device)
- free(i->device);
- if (i->base_device)
- free(i->base_device);
+ free(i->prog);
+ free(i->device);
+ free(i->base_device);
free(i);
return;
}
static struct fs_info *create_fs_device(const char *device, const char *mntpnt,
- const char *type, const char *opts,
+ const char *type, const char *opts,
int freq, int passno)
{
struct fs_info *fs;
fs = create_fs_device(device, mntpnt, type ? type : "auto", opts,
freq ? atoi(freq) : -1,
passno ? atoi(passno) : -1);
- if (dev)
- free(dev);
-
+ free(dev);
+
if (!fs)
return -1;
*ret_fs = fs;
static void interpret_type(struct fs_info *fs)
{
char *t;
-
+
if (strcmp(fs->type, "auto") != 0)
return;
t = blkid_get_tag_value(cache, "TYPE", fs->device);
else
old_fstab = 0;
}
-
+
fclose(f);
-
- if (old_fstab) {
- fputs(_("\007\007\007"
+
+ if (old_fstab && filesys_info) {
+ fputs("\007\007\007", stderr);
+ fputs(_(
"WARNING: Your /etc/fstab does not contain the fsck passno\n"
" field. I will kludge around things for you, but you\n"
" should fix your /etc/fstab file as soon as you can.\n\n"), stderr);
-
+
for (fs = filesys_info; fs; fs = fs->next) {
fs->passno = 1;
}
}
}
-
+
/* Lookup filesys in /etc/fstab and return the corresponding entry. */
static struct fs_info *lookup(char *filesys)
{
sprintf(prog, "fsck.%s", type);
argv[0] = string_copy(prog);
argc = 1;
-
+
for (i=0; i <num_args; i++)
argv[argc++] = string_copy(args[i]);
- if (progress && !progress_active()) {
+ if (progress) {
if ((strcmp(type, "ext2") == 0) ||
- (strcmp(type, "ext3") == 0)) {
+ (strcmp(type, "ext3") == 0) ||
+ (strcmp(type, "ext4") == 0) ||
+ (strcmp(type, "ext4dev") == 0)) {
char tmp[80];
- snprintf(tmp, 80, "-C%d", progress_fd);
- argv[argc++] = string_copy(tmp);
- inst->flags |= FLAG_PROGRESS;
+
+ tmp[0] = 0;
+ if (!progress_active()) {
+ snprintf(tmp, 80, "-C%d", progress_fd);
+ inst->flags |= FLAG_PROGRESS;
+ } else if (progress_fd)
+ snprintf(tmp, 80, "-C%d", progress_fd * -1);
+ if (tmp[0])
+ argv[argc++] = string_copy(tmp);
}
}
printf("%s ", argv[i]);
printf("\n");
}
-
+
/* Fork and execute the correct program. */
if (noexecute)
pid = -1;
for (i=0; i < argc; i++)
free(argv[i]);
-
+
inst->pid = pid;
inst->prog = string_copy(prog);
inst->type = string_copy(type);
p->next = inst;
else
instance_list = inst;
-
+
return 0;
}
* (inst and prev are thought to be uninitialized variables)
*/
inst = prev = NULL;
-
+
do {
pid = waitpid(-1, &status, flags);
if (cancel_requested && !kill_sent) {
}
} while (!inst);
- if (WIFEXITED(status))
+ if (WIFEXITED(status))
status = WEXITSTATUS(status);
else if (WIFSIGNALED(status)) {
sig = WTERMSIG(status);
status = EXIT_ERROR;
}
inst->exit_status = status;
+ inst->flags |= FLAG_DONE;
if (progress && (inst->flags & FLAG_PROGRESS) &&
!progress_active()) {
for (inst2 = instance_list; inst2; inst2 = inst2->next) {
if (inst2->flags & FLAG_DONE)
continue;
if (strcmp(inst2->type, "ext2") &&
- strcmp(inst2->type, "ext3"))
+ strcmp(inst2->type, "ext3") &&
+ strcmp(inst2->type, "ext4") &&
+ strcmp(inst2->type, "ext4dev"))
continue;
/*
* If we've just started the fsck, wait a tiny
/*
* Run the fsck program on a particular device
- *
+ *
* If the type is specified using -t, and it isn't prefixed with "no"
* (as in "noext2") and only one filesystem type is specified, then
* use that type regardless of what is specified in /etc/fstab.
- *
+ *
* If the type isn't specified by the user, then use either the type
* specified in /etc/fstab, or DEFAULT_FSTYPE.
*/
if (strcmp(fs->type, "auto") != 0)
type = fs->type;
else if (fstype && strncmp(fstype, "no", 2) &&
- strncmp(fstype, "opts=", 5) && strncmp(fstype, "loop", 4) &&
+ strncmp(fstype, "opts=", 5) && strncmp(fstype, "loop", 4) &&
!strchr(fstype, ','))
type = fstype;
else
cmp->list = malloc(num * sizeof(char *));
cmp->type = malloc(num * sizeof(int));
if (!cmp->list || !cmp->type) {
- fputs(_("Couldn't allocate memory for filesystem types\n"),
+ fputs(_("Couldn't allocate memory for filesystem types\n"),
stderr);
exit(EXIT_ERROR);
}
if (!fs_type)
return;
-
+
list = string_copy(fs_type);
num = 0;
s = strtok(list, ",");
* This function returns true if a particular option appears in a
* comma-delimited options list
*/
-static int opt_in_list(char *opt, char *optlist)
+static int opt_in_list(const char *opt, char *optlist)
{
char *list, *s;
if (!optlist)
return 0;
list = string_copy(optlist);
-
+
s = strtok(list, ",");
while(s) {
if (strcmp(s, opt) == 0) {
* ignore it.
*/
if (!fs_match(fs, &fs_type_compiled)) return 1;
-
+
/* Are we ignoring this type? */
for(ip = ignored_types; *ip; ip++)
if (strcmp(fs->type, *ip) == 0) return 1;
* If we don't know the base device, assume that the device is
* already active if there are any fsck instances running.
*/
- if (!base)
+ if (!base)
return (instance_list != 0);
for (inst = instance_list; inst; inst = inst->next) {
if (!inst->base_device || !strcmp(base, inst->base_device)) {
if (ignore(fs))
fs->flags |= FLAG_DONE;
}
-
+
/*
* Find and check the root filesystem.
*/
status |= wait_many(pass_done ? FLAG_WAIT_ALL :
FLAG_WAIT_ATLEAST_ONE);
if (pass_done) {
- if (verbose > 1)
+ if (verbose > 1)
printf("----------------------------------\n");
passno++;
} else
sigaction(SIGINT, &sa, 0);
sigaction(SIGTERM, &sa, 0);
#endif
-
+
num_devices = 0;
num_args = 0;
instance_list = 0;
progress_fd = 0;
else
goto next_arg;
- } else if ((i+1) < argc &&
+ } else if ((i+1) < argc &&
!strncmp(argv[i+1], "-", 1) == 0) {
progress_fd = string_to_int(argv[i]);
if (progress_fd < 0)
progress_fd = 0;
else {
+ ++i;
goto next_arg;
- i++;
}
}
break;
} else {
fsck_path = string_copy(fsck_prefix_path);
}
-
+
if ((num_devices == 1) || (serialize))
interactive = 1;
status |= inst->exit_status;
free_instance(inst);
}
- if (verbose > 1)
+ if (verbose > 1)
printf("----------------------------------\n");
}
}
git://git.whamcloud.com / tools / e2fsprogs.git / blobdiff