NULL
};
-#ifdef DEV_DSK_DEVICES
-static const char *base_devices[] = {
- "/dev/dsk/hda",
- "/dev/dsk/hdb",
- "/dev/dsk/hdc",
- "/dev/dsk/hdd",
- "/dev/dsk/hde",
- "/dev/dsk/hdf",
- "/dev/dsk/hdg",
- "/dev/dsk/hdh",
- "/dev/dsk/hd1a",
- "/dev/dsk/hd1b",
- "/dev/dsk/hd1c",
- "/dev/dsk/hd1d",
- "/dev/dsk/sda",
- "/dev/dsk/sdb",
- "/dev/dsk/sdc",
- "/dev/dsk/sdd",
- "/dev/dsk/sde",
- "/dev/dsk/sdf",
- "/dev/dsk/sdg",
- NULL
-};
-#else
#define BASE_MD "/dev/md"
-static const char *base_devices[] = {
- "/dev/hda",
- "/dev/hdb",
- "/dev/hdc",
- "/dev/hdd",
- "/dev/hde",
- "/dev/hdf",
- "/dev/hdg",
- "/dev/hdh",
- "/dev/hd1a",
- "/dev/hd1b",
- "/dev/hd1c",
- "/dev/hd1d",
- "/dev/sda",
- "/dev/sdb",
- "/dev/sdc",
- "/dev/sdd",
- "/dev/sde",
- "/dev/sdf",
- "/dev/sdg",
- BASE_MD,
- NULL
-};
-#endif
/*
* Global variables for options
char *fsck_path = 0;
static int ignore(struct fs_info *);
-static char *string_copy(const char *s)
-{
- char *ret;
-
- ret = malloc(strlen(s)+1);
- if (ret)
- strcpy(ret, s);
- return ret;
-}
-
static char *skip_over_blank(char *cp)
{
while (*cp && isspace(*cp))
free(i->prog);
if (i->device)
free(i->device);
+ if (i->base_device)
+ free(i->base_device);
free(i);
return;
}
*/
static char *interpret_device(char *spec)
{
- char *dev = NULL;
-
- if (!strncmp(spec, "UUID=", 5))
- dev = get_spec_by_uuid(spec+5);
- else if (!strncmp(spec, "LABEL=", 6))
- dev = get_spec_by_volume_label(spec+6);
- else
- return spec;
- if (dev) {
- free(spec);
- return (dev);
- }
+ char *dev = interpret_spec(spec);
+
+ if (dev)
+ return dev;
+
/*
* Check to see if this was because /proc/partitions isn't
* found.
fprintf(stderr, "Couldn't open /proc/partitions: %s\n",
strerror(errno));
fprintf(stderr, "Is /proc mounted?\n");
- exit(1);
+ exit(EXIT_ERROR);
}
/*
* Check to see if this is because we're not running as root
*/
if (geteuid())
- fprintf(stderr, "Must be root to scan for matching "
- "filesystems: %s\n", spec);
+ fprintf(stderr,
+ "Must be root to scan for matching filesystems: %s\n",
+ spec);
else
- fprintf(stderr, "Couldn't find matching filesystem: %s\n",
+ fprintf(stderr, "Couldn't find matching filesystem: %s\n",
spec);
- exit(1);
+ exit(EXIT_ERROR);
}
/*
+ * Interpret filesystem auto type if necessary
+ */
+static void interpret_type(struct fs_info *fs)
+{
+ const char *type;
+
+ if (strcmp(fs->type, "auto") == 0) {
+ type = identify_fs(fs->device);
+ if (type) {
+ free(fs->type);
+ fs->type = string_copy(type);
+ } else
+ fprintf(stderr, _("Could not determine "
+ "filesystem type for %s\n"),
+ fs->device);
+ }
+}
+
+
+/*
* Load the filesystem database from /etc/fstab
*/
static void load_fs_info(const char *filename)
inst->prog = string_copy(prog);
inst->type = string_copy(type);
inst->device = string_copy(device);
+ inst->base_device = base_device(device);
inst->start_time = time(0);
inst->next = NULL;
struct fs_info *fsent;
int retval;
- if (fstype && strncmp(fstype, "no", 2) && !strchr(fstype, ','))
+ if (fstype && strncmp(fstype, "no", 2) &&
+ strncmp(fstype, "opts=", 5) && strncmp(fstype, "loop", 4) &&
+ !strchr(fstype, ','))
type = fstype;
if ((fsent = lookup(device))) {
device = fsent->device;
+ interpret_type(fsent);
if (!type)
type = fsent->type;
}
}
}
-/* See if filesystem type matches the list. */
-static int fs_match(char *type, char *fs_type)
+
+/*
+ * Deal with the fsck -t argument.
+ */
+struct fs_type_compile {
+ char **list;
+ int *type;
+ int negate;
+} fs_type_compiled;
+
+#define FS_TYPE_NORMAL 0
+#define FS_TYPE_OPT 1
+#define FS_TYPE_NEGOPT 2
+
+static const char *fs_type_syntax_error =
+N_("Either all or none of the filesystem types passed to -t must be prefixed\n"
+ "with 'no' or '!'.\n");
+
+static void compile_fs_type(char *fs_type, struct fs_type_compile *cmp)
{
- int ret = 0, negate = 0;
- char list[128];
- char *s;
+ char *cp, *list, *s;
+ int num = 2;
+ int negate, first_negate = 1;
+
+ if (fs_type) {
+ for (cp=fs_type; *cp; cp++) {
+ if (*cp == ',')
+ num++;
+ }
+ }
- if (!fs_type) return(1);
+ cmp->list = malloc(num * sizeof(char *));
+ cmp->type = malloc(num * sizeof(int));
+ if (!cmp->list || !cmp->type) {
+ fprintf(stderr, _("Couldn't allocate memory for "
+ "filesystem types\n"));
+ exit(EXIT_ERROR);
+ }
+ memset(cmp->list, 0, num * sizeof(char *));
+ memset(cmp->type, 0, num * sizeof(int));
+ cmp->negate = 0;
- if (strncmp(fs_type, "no", 2) == 0) {
- fs_type += 2;
- negate = 1;
- }
- strcpy(list, fs_type);
- s = strtok(list, ",");
- while(s) {
- if (strcmp(s, type) == 0) {
- ret = 1;
- break;
+ if (!fs_type)
+ return;
+
+ list = string_copy(fs_type);
+ num = 0;
+ s = strtok(list, ",");
+ while(s) {
+ negate = 0;
+ if (strncmp(s, "no", 2) == 0) {
+ s += 2;
+ negate = 1;
+ } else if (*s == '!') {
+ s++;
+ negate = 1;
+ }
+ if (strcmp(s, "loop") == 0)
+ /* loop is really short-hand for opts=loop */
+ goto loop_special_case;
+ else if (strncmp(s, "opts=", 5) == 0) {
+ s += 5;
+ loop_special_case:
+ cmp->type[num] = negate ? FS_TYPE_NEGOPT : FS_TYPE_OPT;
+ } else {
+ if (first_negate) {
+ cmp->negate = negate;
+ first_negate = 0;
+ }
+ if ((negate && !cmp->negate) ||
+ (!negate && cmp->negate)) {
+ fprintf(stderr, _(fs_type_syntax_error));
+ exit(EXIT_USAGE);
+ }
+ }
+#if 0
+ printf("Adding %s to list (type %d).\n", s, cmp->type[num]);
+#endif
+ cmp->list[num++] = string_copy(s);
+ s = strtok(NULL, ",");
}
- s = strtok(NULL, ",");
- }
- return(negate ? !ret : ret);
+ free(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)
+{
+ char *list, *s;
+
+ if (!optlist)
+ return 0;
+ list = string_copy(optlist);
+
+ s = strtok(list, ",");
+ while(s) {
+ if (strcmp(s, opt) == 0) {
+ free(list);
+ return 1;
+ }
+ s = strtok(NULL, ",");
+ }
+ free(list);
+ return 0;
}
+/* See if the filesystem matches the criteria given by the -t option */
+static int fs_match(struct fs_info *fs, struct fs_type_compile *cmp)
+{
+ int n, ret = 0, checked_type = 0;
+ char *cp;
+
+ if (cmp->list == 0 || cmp->list[0] == 0)
+ return 1;
+
+ for (n=0; cp = cmp->list[n]; n++) {
+ switch (cmp->type[n]) {
+ case FS_TYPE_NORMAL:
+ checked_type++;
+ if (strcmp(cp, fs->type) == 0) {
+ ret = 1;
+ }
+ break;
+ case FS_TYPE_NEGOPT:
+ if (opt_in_list(cp, fs->opts))
+ return 0;
+ break;
+ case FS_TYPE_OPT:
+ if (!opt_in_list(cp, fs->opts))
+ return 0;
+ break;
+ }
+ }
+ if (checked_type == 0)
+ return 1;
+ return (cmp->negate ? !ret : ret);
+}
/* Check if we should ignore this filesystem. */
static int ignore(struct fs_info *fs)
if (fs->passno == 0)
return 1;
+ interpret_type(fs);
+
/*
* If a specific fstype is specified, and it doesn't match,
* ignore it.
*/
- if (!fs_match(fs->type, fstype)) return 1;
+ 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 (strcmp(fs->type, *ip) == 0) return 1;
/* Do we really really want to check this fs? */
for(ip = really_wanted; *ip; ip++)
if (wanted)
fprintf(stderr, _("fsck: cannot check %s: fsck.%s not found\n"),
fs->device, fs->type);
- return(1);
+ return 1;
}
/* We can and want to check this file system type. */
}
/*
- * Return the "base device" given a particular device; this is used to
- * assure that we only fsck one partition on a particular drive at any
- * one time. Otherwise, the disk heads will be seeking all over the
- * place.
- */
-static const char *base_device(char *device)
-{
- const char **base;
-
- for (base = base_devices; *base; base++) {
- if (!strncmp(*base, device, strlen(*base)))
- return *base;
- }
- return device;
-}
-
-/*
* Returns TRUE if a partition on the same disk is already being
* checked.
*/
static int device_already_active(char *device)
{
struct fsck_instance *inst;
- const char *base = base_device(device);
+ char *base;
if (force_all_parallel)
return 0;
return 1;
#endif
+ base = base_device(device);
+ /*
+ * If we don't know the base device, assume that the device is
+ * already active if there are any fsck instances running.
+ */
+ if (!base)
+ return (instance_list != 0);
for (inst = instance_list; inst; inst = inst->next) {
- if (!strcmp(base, base_device(inst->device)))
+ if (!inst->base_device || !strcmp(base, inst->base_device)) {
+ free(base);
return 1;
+ }
}
+ free(base);
return 0;
}
printf(_("Checking all file systems.\n"));
/*
- * Find and check the root filesystem first.
+ * Do an initial scan over the filesystem; mark filesystems
+ * which should be ignored as done, and resolve LABEL= and
+ * UUID= specifications to the real device.
+ */
+ for (fs = filesys_info; fs; fs = fs->next) {
+ if (ignore(fs))
+ fs->flags |= FLAG_DONE;
+ else
+ fs->device = interpret_device(fs->device);
+ }
+
+ /*
+ * Find and check the root filesystem.
*/
if (!parallel_root) {
for (fs = filesys_info; fs; fs = fs->next) {
if (!strcmp(fs->mountpt, "/"))
break;
}
- if (fs && !skip_root && !ignore(fs)) {
- fs->device = interpret_device(fs->device);
- fsck_device(fs->device, 1);
+ if (fs) {
+ if (!skip_root && !ignore(fs)) {
+ fsck_device(fs->device, 1);
+ status |= wait_all();
+ if (status > EXIT_NONDESTRUCT)
+ return status;
+ }
fs->flags |= FLAG_DONE;
- status |= wait_all();
- if (status > EXIT_NONDESTRUCT)
- return status;
}
}
- if (fs) fs->flags |= FLAG_DONE;
- /*
- * Mark filesystems that should be ignored as done.
- */
- for (fs = filesys_info; fs; fs = fs->next) {
- if (ignore(fs))
- fs->flags |= FLAG_DONE;
- }
-
while (not_done_yet) {
not_done_yet = 0;
pass_done = 1;
/*
* Spawn off the fsck process
*/
- fs->device = interpret_device(fs->device);
fsck_device(fs->device, serialize);
fs->flags |= FLAG_DONE;
if (num_devices >= MAX_DEVICES) {
fprintf(stderr, _("%s: too many devices\n"),
progname);
- exit(1);
+ exit(EXIT_ERROR);
}
devices[num_devices++] =
interpret_device(string_copy(arg));
if (num_args >= MAX_ARGS) {
fprintf(stderr, _("%s: too many arguments\n"),
progname);
- exit(1);
+ exit(EXIT_ERROR);
}
args[num_args++] = string_copy(arg);
continue;
case 't':
if (arg[j+1]) {
fstype = string_copy(arg+j+1);
+ compile_fs_type(fstype, &fs_type_compiled);
goto next_arg;
}
if ((i+1) < argc) {
i++;
fstype = string_copy(argv[i]);
+ compile_fs_type(fstype, &fs_type_compiled);
goto next_arg;
}
usage();
case '-':
opts_for_fsck++;
break;
+ case '?':
+ usage();
+ break;
default:
options[++opt] = arg[j];
break;
fprintf(stderr,
_("%s: too many arguments\n"),
progname);
- exit(1);
+ exit(EXIT_ERROR);
}
args[num_args++] = string_copy(options);
opt = 0;
PRS(argc, argv);
if (!notitle)
- printf(_("Parallelizing fsck version %s (%s)\n"),
- E2FSPROGS_VERSION, E2FSPROGS_DATE);
+ printf("fsck %s (%s)\n", E2FSPROGS_VERSION, E2FSPROGS_DATE);
fstab = getenv("FSTAB_FILE");
if (!fstab)
if (doall)
return check_all();
+ if (num_devices == 0) {
+ fprintf(stderr, _("\nNo devices specified to be checked!\n"));
+ exit(EXIT_ERROR);
+ }
for (i = 0 ; i < num_devices; i++) {
fsck_device(devices[i], interactive);
if (serialize) {
git://git.whamcloud.com / tools / e2fsprogs.git / blobdiff