* src/c99-to-c89.diff: Adjust seq.c offsets. Accommodate a new C99-ism.

diff --git a/src/c99-to-c89.diff b/src/c99-to-c89.diff
index 9dfa1e8..79ac4e6 100644 (file)
--- a/src/c99-to-c89.diff
+++ b/src/c99-to-c89.diff
@@ -108,7 +108,7 @@ diff -upr src/seq.c src/seq.c
      }
 
    return ret;
-@@ -311,6 +313,7 @@ get_default_format (operand first, opera
+@@ -338,6 +340,7 @@ get_default_format (operand first, opera
          size_t last_width = last.width + (prec - last.precision);
          if (last.precision && prec == 0)
            last_width--;  /* don't include space for '.' */
@@ -116,7 +116,7 @@ diff -upr src/seq.c src/seq.c
          size_t width = MAX (first_width, last_width);
          if (width <= INT_MAX)
            {
-@@ -318,6 +321,7 @@ get_default_format (operand first, opera
+@@ -345,6 +348,7 @@ get_default_format (operand first, opera
              sprintf (format_buf, "%%0%d.%dLf", w, prec);
              return format_buf;
            }
@@ -124,6 +124,22 @@ diff -upr src/seq.c src/seq.c
        }
        else
        {
+@@ -433,6 +437,7 @@ main (int argc, char **argv)
+   if (format_str)
+     {
+       validate_format (format_str);
++      {
+       char const *f = long_double_format (format_str, &layout);
+       if (! f)
+       {
+@@ -440,6 +445,7 @@ main (int argc, char **argv)
+         usage (EXIT_FAILURE);
+       }
+       format_str = f;
++      }
+     }
+
+   last = scan_arg (argv[optind++]);
 diff -upr src/shred.c src/shred.c
 --- src/shred.c        2007-07-23 12:56:20.000000000 +0200
 +++ src/shred.c        2007-07-23 13:03:12.000000000 +0200
@@ -136,3 +152,5 @@ diff -upr src/shred.c src/shred.c
                  if (errnum == EIO && 0 <= size && (soff | SECTOR_MASK) < lim)
                    {
                      size_t soff1 = (soff | SECTOR_MASK) + 1;
+--- src/seq.c  2008-02-18 22:53:29.000000000 +0100
++++ src-c89/seq.c      2008-02-18 23:16:35.000000000 +0100