42c42
< __FBSDID("$FreeBSD: stable/10/sbin/fsck_ffs/main.c 253822 2013-07-30 22:57:12Z scottl $");
---
> __FBSDID("$FreeBSD: stable/10/sbin/fsck_ffs/main.c 260178 2014-01-02 01:44:14Z scottl $");
67a68,69
> int restarts;
>
85c87
< while ((ch = getopt(argc, argv, "b:Bc:CdEfFm:nprSyZ")) != -1) {
---
> while ((ch = getopt(argc, argv, "b:Bc:CdEfFm:npRrSyZ")) != -1) {
140a143,145
> case 'R':
> wantrestart = 1;
> break;
189,190c194,199
< while (argc-- > 0)
< (void)checkfilesys(*argv++);
---
> while (argc > 0) {
> if (checkfilesys(*argv) == ERESTART)
> continue;
> argc--;
> argv++;
> }
230a240,241
> fsutilinit();
> fsckinit();
553c564,567
< if (rerun)
---
> if (rerun) {
> if (wantrestart && (restarts++ < 10) &&
> (preen || reply("RESTART")))
> return (ERESTART);
554a569
> }
656a672,683
>
> void
> infohandler(int sig __unused)
> {
> got_siginfo = 1;
> }
>
> void
> alarmhandler(int sig __unused)
> {
> got_sigalarm = 1;
> }
< __FBSDID("$FreeBSD: stable/10/sbin/fsck_ffs/main.c 253822 2013-07-30 22:57:12Z scottl $");
---
> __FBSDID("$FreeBSD: stable/10/sbin/fsck_ffs/main.c 260178 2014-01-02 01:44:14Z scottl $");
67a68,69
> int restarts;
>
85c87
< while ((ch = getopt(argc, argv, "b:Bc:CdEfFm:nprSyZ")) != -1) {
---
> while ((ch = getopt(argc, argv, "b:Bc:CdEfFm:npRrSyZ")) != -1) {
140a143,145
> case 'R':
> wantrestart = 1;
> break;
189,190c194,199
< while (argc-- > 0)
< (void)checkfilesys(*argv++);
---
> while (argc > 0) {
> if (checkfilesys(*argv) == ERESTART)
> continue;
> argc--;
> argv++;
> }
230a240,241
> fsutilinit();
> fsckinit();
553c564,567
< if (rerun)
---
> if (rerun) {
> if (wantrestart && (restarts++ < 10) &&
> (preen || reply("RESTART")))
> return (ERESTART);
554a569
> }
656a672,683
>
> void
> infohandler(int sig __unused)
> {
> got_siginfo = 1;
> }
>
> void
> alarmhandler(int sig __unused)
> {
> got_sigalarm = 1;
> }