Release 1.3.1.

[misc] / space.c

diff --git a/space.c b/space.c
index 73fb3a770b492c85c9a91d01661fc61e4404e548..07ea82acb5eadb4e981e49af7e377575c23c3ee9 100644 (file)
--- a/space.c
+++ b/space.c
@@ -29,9 +29,10 @@ static unsigned flags = 0;
 #define F_UNTABIFY 16u
 #define F_TABIFY 32u
 #define F_VERBOSE 64u
 #define F_UNTABIFY 16u
 #define F_TABIFY 32u
 #define F_VERBOSE 64u

+#define F_TBLANK 128u

 
 static void usage(FILE *fp)
 
 static void usage(FILE *fp)

-  { fprintf(fp, "Usage: %s [-cmtuv] [-i[BKP]] [FILE...]\n\n", ego); }
+  { fprintf(fp, "Usage: %s [-clmtuv] [-i[BKP]] [FILE...]\n\n", ego); }

 
 static char *augment(const char *name, const char *suffix)
 {
 
 static char *augment(const char *name, const char *suffix)
 {


@@ -135,7 +136,8 @@ static int space(const char *name)
   char *newname = 0, *oldname = 0;
   int rc = TROUBLE, status = OK;
   int last = '\n';
   char *newname = 0, *oldname = 0;
   int rc = TROUBLE, status = OK;
   int last = '\n';

-  unsigned nsp = 0, nwsp = 0, hpos = 0, ohpos = 0, nhpos = 0, nl = 1;
+  unsigned nsp = 0, nwsp = 0, nnl = 0;
+  unsigned hpos = 0, ohpos = 0, nhpos = 0, nl = 1;

   unsigned i;
 #define f_newline 1u
 #define f_warnspacetab 2u
   unsigned i;
 #define f_newline 1u
 #define f_warnspacetab 2u


@@ -145,7 +147,8 @@ static int space(const char *name)
 #define f_tab 32u
 #define f_bad 64u
 #define f_forced 128u
 #define f_tab 32u
 #define f_bad 64u
 #define f_forced 128u

-  unsigned f = f_newline | (flags & F_TABIFY ? f_tabify : 0);
+#define f_begin 256u
+  unsigned f = f_newline | f_begin | (flags & F_TABIFY ? f_tabify : 0);

   int ch;
 
   if (strcmp(name, "-") == 0) {
   int ch;
 
   if (strcmp(name, "-") == 0) {


@@ -201,11 +204,23 @@ static int space(const char *name)
        if (put(&b, '\t')) goto done_2;
        break;
       case EOF:
        if (put(&b, '\t')) goto done_2;
        break;
       case EOF:

-       if (nwsp || !(f & f_newline)) {
-         if (flags & F_VERBOSE)
-           fprintf(stderr, "%s:%u: file ends in mid-line\n", name, nl);
-         status = BADNESS;
-         if (fout) putc('\n', fout);
+       if (!(f & f_begin)) {
+         if (!(f & f_newline)) {
+           if (flags & F_VERBOSE)
+             fprintf(stderr, "%s:%u: file ends in mid-line\n", name, nl);
+           status = BADNESS;
+           nnl = 1;
+         } else if (nnl > 1) {
+           if (flags & F_TBLANK) {
+             if (flags & F_VERBOSE) {
+               fprintf(stderr, "%s:%u: file has trailing blank lines\n",
+                       name, nl - nnl + 1);
+             }
+             status = BADNESS;
+             nnl = 1;
+           }
+         }
+         if (fout) while (nnl--) putc('\n', fout); else nnl = 0;

        }
        goto end;
       case '\n':
        }
        goto end;
       case '\n':


@@ -215,9 +230,15 @@ static int space(const char *name)
            fprintf(stderr, "%s:%u: trailing whitespace\n", name, nl);
          status = BADNESS;
        }
            fprintf(stderr, "%s:%u: trailing whitespace\n", name, nl);
          status = BADNESS;
        }

-       if (fout) putc('\n', fout);

        reset(&b);
        nsp = nwsp = hpos = ohpos = 0; nl++;
        reset(&b);
        nsp = nwsp = hpos = ohpos = 0; nl++;

+       if (ch == '\n')
+         nnl++;
+       else if (fout) {
+         while (nnl) { putc('\n', fout); nnl--; }
+         putc(ch, fout);
+       } else
+         nnl = 0;

        f |= f_newline;
        f &= ~(f_tab | f_warnspacetab | f_warntabs | f_warnspaces);
        if (flags & F_TABIFY)
        f |= f_newline;
        f &= ~(f_tab | f_warnspacetab | f_warntabs | f_warnspaces);
        if (flags & F_TABIFY)


@@ -227,6 +248,7 @@ static int space(const char *name)
        last = '\n';
        break;
       default:
        last = '\n';
        break;
       default:

+       if (fout) while (nnl) { putc('\n', fout); nnl--; } else nnl = 0;

        if (nwsp) {
          if (flags & F_UNTABIFY) {
            if (fout) for (; ohpos < hpos; ohpos++) putc(' ', fout);
        if (nwsp) {
          if (flags & F_UNTABIFY) {
            if (fout) for (; ohpos < hpos; ohpos++) putc(' ', fout);


@@ -264,6 +286,7 @@ static int space(const char *name)
          last = ch;
        break;
     }
          last = ch;
        break;
     }

+    f &= ~f_begin;

   }
 end:;
 
   }
 end:;
 


@@ -330,7 +353,7 @@ int main(int argc, char *argv[])
     ego++;
 
   for (;;) {
     ego++;
 
   for (;;) {

-    if ((i = getopt(argc, argv, "h" "cmtuv" "i::")) < 0)
+    if ((i = getopt(argc, argv, "h" "clmtuv" "i::")) < 0)

       break;
     switch (i) {
       case 'h':
       break;
     switch (i) {
       case 'h':


@@ -339,9 +362,11 @@ int main(int argc, char *argv[])
        fputs("Options:\n\
   -h           Print this help text\n\
   -c           Check files for badness, but don't produce other output\n\
        fputs("Options:\n\
   -h           Print this help text\n\
   -c           Check files for badness, but don't produce other output\n\

+  -l           Check for, and/or remove, trailing blank lines\n\

   -m           Fix spaces followed by tabs in mid-line\n\
   -t           Tabify file completely\n\
   -u           Untabify file completely\n\
   -m           Fix spaces followed by tabs in mid-line\n\
   -t           Tabify file completely\n\
   -u           Untabify file completely\n\

+  -v           Report verbose messages\n\

   -i[BKP]      Modify files in place; leave FILEBKP as copy of old FILE\n\
 ", stdout);
        exit(0);
   -i[BKP]      Modify files in place; leave FILEBKP as copy of old FILE\n\
 ", stdout);
        exit(0);


@@ -355,6 +380,9 @@ int main(int argc, char *argv[])
       case 'c':
        flags |= F_CHECK;
        break;
       case 'c':
        flags |= F_CHECK;
        break;

+      case 'l':
+       flags |= F_TBLANK;
+       break;

       case 't':
        flags |= F_TABIFY;
        break;
       case 't':
        flags |= F_TABIFY;
        break;