Make use of the new FDOPT_NORETRY facility. It does not make sense to

[unix-history] / usr.sbin / fdformat / fdformat.c

diff --git a/usr.sbin/fdformat/fdformat.c b/usr.sbin/fdformat/fdformat.c
index dc8fba8..6ab7d94 100644 (file)
--- a/usr.sbin/fdformat/fdformat.c
+++ b/usr.sbin/fdformat/fdformat.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 1992-1993 by Joerg Wunsch, Dresden
+ * Copyright (C) 1992-1994 by Joerg Wunsch, Dresden

  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without


@@ -11,17 +11,17 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *

- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.

  */
 
 /*
  */
 
 /*


@@ -55,7 +55,7 @@ format_track(int fd, int cyl, int secs, int head, int rate,
 {
        struct fd_formb f;
        register int i,j;
 {
        struct fd_formb f;
        register int i,j;

-       int il[FD_MAX_NSEC];
+       int il[FD_MAX_NSEC + 1];

 
        memset(il,0,sizeof il);
        for(j = 0, i = 1; i <= secs; i++) {
 
        memset(il,0,sizeof il);
        for(j = 0, i = 1; i <= secs; i++) {


@@ -90,7 +90,16 @@ verify_track(int fd, int track, int tracksize)
 {
        static char *buf = 0;
        static int bufsz = 0;
 {
        static char *buf = 0;
        static int bufsz = 0;

-
+       int fdopts = -1, ofdopts, rv = 0;
+
+       if (ioctl(fd, FD_GOPTS, &fdopts) < 0)
+               perror("warning: ioctl(FD_GOPTS)");
+       else {
+               ofdopts = fdopts;
+               fdopts |= FDOPT_NORETRY;
+               (void)ioctl(fd, FD_SOPTS, &fdopts);
+       }
+       

        if (bufsz < tracksize) {
                if (buf)
                        free (buf);
        if (bufsz < tracksize) {
                if (buf)
                        free (buf);


@@ -104,10 +113,14 @@ verify_track(int fd, int track, int tracksize)
                exit (2);
        }
        if (lseek (fd, (long) track*tracksize, 0) < 0)
                exit (2);
        }
        if (lseek (fd, (long) track*tracksize, 0) < 0)

-               return (-1);
-       if (read (fd, buf, tracksize) != tracksize)
-               return (-1);
-       return (0);
+               rv = -1;
+       /* try twice reading it, without using the normal retrier */
+       else if (read (fd, buf, tracksize) != tracksize
+                && read (fd, buf, tracksize) != tracksize)
+               rv = -1;
+       if(fdopts != -1)
+               (void)ioctl(fd, FD_SOPTS, &ofdopts);
+       return (rv);

 }
 
 static const char *
 }
 
 static const char *


@@ -127,7 +140,7 @@ makename(const char *arg, const char *suffix)
 }
 
 static void
 }
 
 static void

-usage ()
+usage (void)

 {
        printf("Usage:\n\tfdformat [-q] [-n | -v] [-f #] [-c #] [-s #] [-h #]\n");
        printf("\t\t [-r #] [-g #] [-i #] [-S #] [-F #] [-t #] devname\n");
 {
        printf("Usage:\n\tfdformat [-q] [-n | -v] [-f #] [-c #] [-s #] [-h #]\n");
        printf("\t\t [-r #] [-g #] [-i #] [-S #] [-F #] [-t #] devname\n");


@@ -152,7 +165,7 @@ usage ()
 }
 
 static int
 }
 
 static int

-yes ()
+yes (void)

 {
        char reply [256], *p;
 
 {
        char reply [256], *p;
 


@@ -324,9 +337,9 @@ main(int argc, char **argv)
 
        for (track = 0; track < fdt.tracks * fdt.heads; track++) {
                if (!verify_only) {
 
        for (track = 0; track < fdt.tracks * fdt.heads; track++) {
                if (!verify_only) {

-                       format_track(fd, track / 2, fdt.sectrac, track & 1,
-                               fdt.trans, fdt.f_gap, fdt.secsize, fill,
-                               fdt.f_inter);
+                       format_track(fd, track / fdt.heads, fdt.sectrac,
+                               track % fdt.heads, fdt.trans, fdt.f_gap,
+                               fdt.secsize, fill, fdt.f_inter);

                        if(!quiet && !((track + 1) % tracks_per_dot)) {
                                putchar('F');
                                fflush(stdout);
                        if(!quiet && !((track + 1) % tracks_per_dot)) {
                                putchar('F');
                                fflush(stdout);


@@ -353,3 +366,18 @@ main(int argc, char **argv)
 
        return errs;
 }
 
        return errs;
 }

+/*
+ * Local Variables:
+ *  c-indent-level:               8
+ *  c-continued-statement-offset: 8
+ *  c-continued-brace-offset:     0
+ *  c-brace-offset:              -8
+ *  c-brace-imaginary-offset:     0
+ *  c-argdecl-indent:             8
+ *  c-label-offset:              -8
+ *  c++-hanging-braces:           1
+ *  c++-access-specifier-offset: -8
+ *  c++-empty-arglist-indent:     8
+ *  c++-friend-offset:            0
+ * End:
+ */