forked from opnsense/plugins
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
make: whitespace sweep target and execution
- Loading branch information
Showing
14 changed files
with
263 additions
and
28 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,185 @@ | ||
| #!/usr/bin/env perl | ||
| # | ||
| # Clean a text file -- or directory of text files -- of stealth whitespace. | ||
| # WARNING: this can be a highly destructive operation. Use with caution. | ||
| # | ||
|
|
||
| use bytes; | ||
| use File::Basename; | ||
|
|
||
| # Default options | ||
| $max_width = 119; | ||
|
|
||
| # Clean up space-tab sequences, either by removing spaces or | ||
| # replacing them with tabs. | ||
| sub clean_space_tabs($) | ||
| { | ||
| no bytes; # Tab alignment depends on characters | ||
|
|
||
| my($li) = @_; | ||
| my($lo) = ''; | ||
| my $pos = 0; | ||
| my $nsp = 0; | ||
| my($i, $c); | ||
|
|
||
| for ($i = 0; $i < length($li); $i++) { | ||
| $c = substr($li, $i, 1); | ||
| if ($c eq "\t") { | ||
| my $npos = ($pos+$nsp+8) & ~7; | ||
| my $ntab = ($npos >> 3) - ($pos >> 3); | ||
| $lo .= "\t" x $ntab; | ||
| $pos = $npos; | ||
| $nsp = 0; | ||
| } elsif ($c eq "\n" || $c eq "\r") { | ||
| $lo .= " " x $nsp; | ||
| $pos += $nsp; | ||
| $nsp = 0; | ||
| $lo .= $c; | ||
| $pos = 0; | ||
| } elsif ($c eq " ") { | ||
| $nsp++; | ||
| } else { | ||
| $lo .= " " x $nsp; | ||
| $pos += $nsp; | ||
| $nsp = 0; | ||
| $lo .= $c; | ||
| $pos++; | ||
| } | ||
| } | ||
| $lo .= " " x $nsp; | ||
| return $lo; | ||
| } | ||
|
|
||
| # Compute the visual width of a string | ||
| sub strwidth($) { | ||
| no bytes; # Tab alignment depends on characters | ||
|
|
||
| my($li) = @_; | ||
| my($c, $i); | ||
| my $pos = 0; | ||
| my $mlen = 0; | ||
|
|
||
| for ($i = 0; $i < length($li); $i++) { | ||
| $c = substr($li,$i,1); | ||
| if ($c eq "\t") { | ||
| $pos = ($pos+8) & ~7; | ||
| } elsif ($c eq "\n") { | ||
| $mlen = $pos if ($pos > $mlen); | ||
| $pos = 0; | ||
| } else { | ||
| $pos++; | ||
| } | ||
| } | ||
|
|
||
| $mlen = $pos if ($pos > $mlen); | ||
| return $mlen; | ||
| } | ||
|
|
||
| $name = basename($0); | ||
|
|
||
| @files = (); | ||
|
|
||
| while (defined($a = shift(@ARGV))) { | ||
| if ($a =~ /^-/) { | ||
| if ($a eq '-width' || $a eq '-w') { | ||
| $max_width = shift(@ARGV)+0; | ||
| } else { | ||
| print STDERR "Usage: $name [-width #] files...\n"; | ||
| exit 1; | ||
| } | ||
| } else { | ||
| push(@files, $a); | ||
| } | ||
| } | ||
|
|
||
| foreach $f ( @files ) { | ||
| print STDERR "$name: $f\n"; | ||
|
|
||
| if (! -f $f) { | ||
| print STDERR "$f: not a file\n"; | ||
| next; | ||
| } | ||
|
|
||
| if (!open(FILE, '+<', $f)) { | ||
| print STDERR "$name: Cannot open file: $f: $!\n"; | ||
| next; | ||
| } | ||
|
|
||
| binmode FILE; | ||
|
|
||
| # First, verify that it is not a binary file; consider any file | ||
| # with a zero byte to be a binary file. Is there any better, or | ||
| # additional, heuristic that should be applied? | ||
| $is_binary = 0; | ||
|
|
||
| while (read(FILE, $data, 65536) > 0) { | ||
| if ($data =~ /\0/) { | ||
| $is_binary = 1; | ||
| last; | ||
| } | ||
| } | ||
|
|
||
| if ($is_binary) { | ||
| print STDERR "$name: $f: binary file\n"; | ||
| next; | ||
| } | ||
|
|
||
| seek(FILE, 0, 0); | ||
|
|
||
| $in_bytes = 0; | ||
| $out_bytes = 0; | ||
| $blank_bytes = 0; | ||
|
|
||
| @blanks = (); | ||
| @lines = (); | ||
| $last = "\n"; | ||
| $lineno = 0; | ||
|
|
||
| while ( defined($line = <FILE>) ) { | ||
| $lineno++; | ||
| $in_bytes += length($line); | ||
| $line =~ s/[ \t\r]*$//; # Remove trailing spaces | ||
| $line = clean_space_tabs($line); | ||
| $last = $line; | ||
|
|
||
| if ( $line eq "\n" ) { | ||
| push(@blanks, $line); | ||
| $blank_bytes += length($line); | ||
| } else { | ||
| push(@lines, @blanks); | ||
| $out_bytes += $blank_bytes; | ||
| push(@lines, $line); | ||
| $out_bytes += length($line); | ||
| @blanks = (); | ||
| $blank_bytes = 0; | ||
| } | ||
|
|
||
| $l_width = strwidth($line); | ||
| if ($max_width && $l_width > $max_width) { | ||
| print STDERR | ||
| "$f:$lineno: line exceeds $max_width characters ($l_width)\n"; | ||
| } | ||
| } | ||
|
|
||
| if ( chop($last) ne "\n" ) { | ||
| # fix missing newline at EOF | ||
| push(@lines, "\n"); | ||
| # increment input bytes to signal character append | ||
| $in_bytes += 1; | ||
| } | ||
|
|
||
| # Any blanks at the end of the file are discarded | ||
|
|
||
| if ($in_bytes != $out_bytes) { | ||
| # Only write to the file if changed | ||
| seek(FILE, 0, 0); | ||
| print FILE @lines; | ||
|
|
||
| if ( !defined($where = tell(FILE)) || | ||
| !truncate(FILE, $where) ) { | ||
| die "$name: Failed to truncate modified file: $f: $!\n"; | ||
| } | ||
| } | ||
|
|
||
| close(FILE); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| #!/bin/sh | ||
|
|
||
| # Copyright (c) 2015 Franco Fichtner <[email protected]> | ||
| # | ||
| # Redistribution and use in source and binary forms, with or without | ||
| # modification, are permitted provided that the following conditions | ||
| # are met: | ||
| # | ||
| # 1. Redistributions of source code must retain the above copyright | ||
| # notice, this list of conditions and the following disclaimer. | ||
| # | ||
| # 2. Redistributions in binary form must reproduce the above copyright | ||
| # 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 AND CONTRIBUTORS ``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 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. | ||
|
|
||
| set -e | ||
|
|
||
| VERSION=$(git describe --abbrev=0 --always) | ||
| REVISION=$(git rev-list ${VERSION}.. --count) | ||
| COMMENT=$(git rev-list HEAD --max-count=1 | cut -c1-9) | ||
| if [ "${REVISION}" != "0" ]; then | ||
| # must construct full version string manually | ||
| VERSION=${VERSION}_${REVISION} | ||
| fi | ||
|
|
||
| echo ${VERSION}-${COMMENT} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -36,5 +36,5 @@ | |
| */ | ||
| class ItemController extends \OPNsense\Base\IndexController | ||
| { | ||
|
|
||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -71,4 +71,4 @@ | |
| <type>text</type> | ||
| <help><![CDATA[Briefly description of this ftp proxy]]></help> | ||
| </field> | ||
| </form> | ||
| </form> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,4 +7,4 @@ | |
| <pattern>api/ftpproxy/*</pattern> | ||
| </patterns> | ||
| </page-services-ftpproxy> | ||
| </acl> | ||
| </acl> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -75,4 +75,4 @@ | |
| </ftpproxy> | ||
| </ftpproxies> | ||
| </items> | ||
| </model> | ||
| </model> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.