summaryrefslogtreecommitdiff
path: root/build-aux
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2009-08-22 18:56:06 +0200
committerJim Meyering <meyering@redhat.com>2009-08-25 09:21:00 +0200
commit5e778f7c8d1ecf3d8f11385db013af2ba026e2a5 (patch)
treee460d471f37f0dce1ba06f60f88114d1a65326c4 /build-aux
parent2bc0f3caaafeb240cdcfd050b7ad1fe0ad14addf (diff)
downloadcoreutils-5e778f7c8d1ecf3d8f11385db013af2ba026e2a5.tar.xz
global: convert indentation-TABs to spaces
Transformed via this shell code: t=$'\t' git ls-files \ | grep -vE '(^|/)((GNU)?[Mm]akefile|ChangeLog)|\.(am|mk)$' \ | grep -vE 'tests/pr/|help2man' \ | xargs grep -lE "^ *$t" \ | xargs perl -MText::Tabs -ni -le \ '$m=/^( *\t[ \t]*)(.*)/; print $m ? expand($1) . $2 : $_'
Diffstat (limited to 'build-aux')
-rwxr-xr-xbuild-aux/cvsu450
1 files changed, 225 insertions, 225 deletions
diff --git a/build-aux/cvsu b/build-aux/cvsu
index 49be49650..741f6b238 100755
--- a/build-aux/cvsu
+++ b/build-aux/cvsu
@@ -27,20 +27,20 @@ use Time::Local;
use strict;
use vars qw($list_types %messages %options @batch_list $batch_cmd
- $no_recurse $explain_type $find_mode $short_print
- $no_cvsignore $nolinks $file $single_filename $curr_dir
- @common_ignores $ignore_rx %entries %subdirs %removed);
+ $no_recurse $explain_type $find_mode $short_print
+ $no_cvsignore $nolinks $file $single_filename $curr_dir
+ @common_ignores $ignore_rx %entries %subdirs %removed);
use constant SUBDIR_FOUND => 1;
use constant SUBDIR_CVS => 2;
# This list comes from the CVS manual.
use constant STANDARD_IGNORES =>
- ('RCS', 'SCCS', 'CVS', 'CVS.adm', 'RCSLOG', 'cvslog.*', 'tags',
- 'TAGS', '.make.state', '.nse_depinfo', '*~', '#*', '.#*', ',*',
- "_\$*", "*\$", '*.old', '*.bak', '*.BAK', '*.orig', '*.rej',
- '.del-*', '*.a', '*.olb', '*.o', '*.obj', '*.so', '*.exe',
- '*.Z', '*.elc', '*.ln', 'core');
+ ('RCS', 'SCCS', 'CVS', 'CVS.adm', 'RCSLOG', 'cvslog.*', 'tags',
+ 'TAGS', '.make.state', '.nse_depinfo', '*~', '#*', '.#*', ',*',
+ "_\$*", "*\$", '*.old', '*.bak', '*.BAK', '*.orig', '*.rej',
+ '.del-*', '*.a', '*.olb', '*.o', '*.obj', '*.so', '*.exe',
+ '*.Z', '*.elc', '*.ln', 'core');
# 3-letter month names in POSIX locale, for fast date decoding
my %months = (
@@ -62,20 +62,20 @@ my %months = (
sub usage ()
{
print "Usage:\n" .
- " cvsu [OPTIONS] [FILE] ...\n" .
- "Options:\n" .
- " --local Disable recursion\n" .
- " --explain Verbosely print status of files\n" .
- " --find Emulate find - filenames only\n" .
- " --short Don't print paths\n" .
- " --ignore Don't read .cvsignore\n" .
- " --messages List known file types and long messages\n" .
- " --nolinks Disable recognizing hard and soft links\n" .
- " --types=[^]LIST Print only file types [not] from LIST\n" .
- " --batch=COMMAND Execute this command on files\n" .
- " --help Print this usage information\n" .
- " --version Print version number\n" .
- "Abbreviations and short options are supported\n";
+ " cvsu [OPTIONS] [FILE] ...\n" .
+ "Options:\n" .
+ " --local Disable recursion\n" .
+ " --explain Verbosely print status of files\n" .
+ " --find Emulate find - filenames only\n" .
+ " --short Don't print paths\n" .
+ " --ignore Don't read .cvsignore\n" .
+ " --messages List known file types and long messages\n" .
+ " --nolinks Disable recognizing hard and soft links\n" .
+ " --types=[^]LIST Print only file types [not] from LIST\n" .
+ " --batch=COMMAND Execute this command on files\n" .
+ " --help Print this usage information\n" .
+ " --version Print version number\n" .
+ "Abbreviations and short options are supported\n";
exit 0;
}
@@ -90,11 +90,11 @@ sub version ()
sub adjust_types ()
{
if ($list_types =~ m{^\^(.*)$}) {
- $list_types = "";
- foreach (keys %messages) {
- $list_types .= $_
- if (index ($1, $_) < 0);
- }
+ $list_types = "";
+ foreach (keys %messages) {
+ $list_types .= $_
+ if (index ($1, $_) < 0);
+ }
}
}
@@ -104,12 +104,12 @@ sub list_messages ()
my $default_mark;
print "Recognizable file types are:\n";
foreach (sort keys %messages) {
- if (index($list_types, $_) >= 0) {
- $default_mark = "*";
- } else {
- $default_mark = " ";
- }
- print " $default_mark $_ $messages{$_}\n";
+ if (index($list_types, $_) >= 0) {
+ $default_mark = "*";
+ } else {
+ $default_mark = " ";
+ }
+ print " $default_mark $_ $messages{$_}\n";
}
print "* indicates file types listed by default\n";
exit 0;
@@ -124,28 +124,28 @@ sub init_ignores ()
push @common_ignores, STANDARD_IGNORES;
unless (defined($HOME)) {
- return;
+ return;
}
my $home_cvsignore = "${HOME}/.cvsignore";
if (-f "$home_cvsignore") {
- unless (open (CVSIGNORE, "< $home_cvsignore")) {
- error ("couldn't open $home_cvsignore: $!");
- }
+ unless (open (CVSIGNORE, "< $home_cvsignore")) {
+ error ("couldn't open $home_cvsignore: $!");
+ }
- while (<CVSIGNORE>) {
- push (@common_ignores, split);
- }
+ while (<CVSIGNORE>) {
+ push (@common_ignores, split);
+ }
- close (CVSIGNORE);
+ close (CVSIGNORE);
}
my $CVSIGNOREENV = $ENV{"CVSIGNORE"};
unless (defined($CVSIGNOREENV)) {
- return;
+ return;
}
my @ignores_var = split (/ /, $CVSIGNOREENV);
@@ -157,15 +157,15 @@ sub init_ignores ()
# Newline is added at the end.
sub error ($)
{
- print STDERR "cvsu: ERROR: " . shift(@_) . "\n";
- exit 1;
+ print STDERR "cvsu: ERROR: " . shift(@_) . "\n";
+ exit 1;
}
# execute commands from @exec_list with $exec_cmd
sub do_batch ()
{
- my @cmd_list = split (' ', $batch_cmd);
- system (@cmd_list, @batch_list);
+ my @cmd_list = split (' ', $batch_cmd);
+ system (@cmd_list, @batch_list);
}
# print files status
@@ -177,34 +177,34 @@ sub file_status ($)
my $pathfile;
return
- if $ignore_rx ne '' && $type =~ /[?SLD]/ && $file =~ /$ignore_rx/;
+ if $ignore_rx ne '' && $type =~ /[?SLD]/ && $file =~ /$ignore_rx/;
return
- if (index($list_types, $type) < 0);
+ if (index($list_types, $type) < 0);
$pathfile = $curr_dir . $file;
if (defined($batch_cmd)) {
- push (@batch_list, $pathfile);
- # 1000 items in the command line might be too much for HP-UX
- if ($#batch_list > 1000) {
- do_batch();
- undef @batch_list;
- }
+ push (@batch_list, $pathfile);
+ # 1000 items in the command line might be too much for HP-UX
+ if ($#batch_list > 1000) {
+ do_batch();
+ undef @batch_list;
+ }
}
if ($short_print) {
- $item = $file;
+ $item = $file;
} else {
- $item = $pathfile;
+ $item = $pathfile;
}
if ($find_mode) {
- print "$item\n";
+ print "$item\n";
} else {
- $type = $messages{$type}
- if ($explain_type);
- print "$type $item\n";
+ $type = $messages{$type}
+ if ($explain_type);
+ print "$type $item\n";
}
}
@@ -219,28 +219,28 @@ sub load_entries ($)
my %ent = ();
unless (open (ENTRIES, "< $entries_file")) {
- error ("couldn't open $entries_file: $!");
+ error ("couldn't open $entries_file: $!");
}
while (<ENTRIES>) {
- chomp;
- $ent{$_} = 1;
+ chomp;
+ $ent{$_} = 1;
}
close (ENTRIES);
if (open (ENTRIES, "< $entries_log_file")) {
- while (<ENTRIES>) {
- chomp;
- if ( m{^A (.+)} ) {
- $ent{$1} = 1;
- } elsif ( m{^R (.+)} ) {
- delete $ent{$1};
- } else {
- # Note: "cvs commit" helps even when you are offline
- error ("$entries_log_file:$.: unrecognizable line, " .
- "try \"cvs commit\"");
- }
- }
- close (ENTRIES);
+ while (<ENTRIES>) {
+ chomp;
+ if ( m{^A (.+)} ) {
+ $ent{$1} = 1;
+ } elsif ( m{^R (.+)} ) {
+ delete $ent{$1};
+ } else {
+ # Note: "cvs commit" helps even when you are offline
+ error ("$entries_log_file:$.: unrecognizable line, " .
+ "try \"cvs commit\"");
+ }
+ }
+ close (ENTRIES);
}
return keys %ent;
@@ -260,28 +260,28 @@ sub process_arg ($)
local $single_filename = 0;
if ( $arg eq "" or -d $arg ) {
- $curr_dir = $arg;
- my $real_curr_dir = $curr_dir eq "" ? "." : $curr_dir;
-
- error ("$real_curr_dir is not a directory")
- unless ( -d $real_curr_dir );
-
- # Scan present files.
- file_status (".");
- opendir (DIR, $real_curr_dir) ||
- error ("couldn't open directory $real_curr_dir: $!");
- foreach (readdir (DIR)) {
- $found_files {$_} = 1;
- }
- closedir (DIR);
+ $curr_dir = $arg;
+ my $real_curr_dir = $curr_dir eq "" ? "." : $curr_dir;
+
+ error ("$real_curr_dir is not a directory")
+ unless ( -d $real_curr_dir );
+
+ # Scan present files.
+ file_status (".");
+ opendir (DIR, $real_curr_dir) ||
+ error ("couldn't open directory $real_curr_dir: $!");
+ foreach (readdir (DIR)) {
+ $found_files {$_} = 1;
+ }
+ closedir (DIR);
} else {
- $single_filename = basename $arg;
- $curr_dir = dirname $arg;
- $found_files{$single_filename} = 1 if lstat $arg;
+ $single_filename = basename $arg;
+ $curr_dir = dirname $arg;
+ $found_files{$single_filename} = 1 if lstat $arg;
}
$curr_dir .= "/"
- unless ( $curr_dir eq "" || $curr_dir =~ m{/$} );
+ unless ( $curr_dir eq "" || $curr_dir =~ m{/$} );
# Scan CVS/Entries.
my %entries = ();
@@ -289,118 +289,118 @@ sub process_arg ($)
my %removed = ();
foreach ( load_entries ("${curr_dir}CVS/Entries") ) {
- if ( m{^D/([^/]+)/} ) {
- $subdirs{$1} = SUBDIR_FOUND if !$single_filename;
- } elsif ( m{^/([^/]+)/([^/])[^/]*/([^/]*)/} ) {
- if ( !$single_filename or $single_filename eq $1 ) {
- $entries{$1} = $3;
- $removed{$1} = 1
- if $2 eq '-';
- }
- } elsif ( m{^D$} ) {
- next;
- } else {
- error ("${curr_dir}CVS/Entries: unrecognizable line");
- }
+ if ( m{^D/([^/]+)/} ) {
+ $subdirs{$1} = SUBDIR_FOUND if !$single_filename;
+ } elsif ( m{^/([^/]+)/([^/])[^/]*/([^/]*)/} ) {
+ if ( !$single_filename or $single_filename eq $1 ) {
+ $entries{$1} = $3;
+ $removed{$1} = 1
+ if $2 eq '-';
+ }
+ } elsif ( m{^D$} ) {
+ next;
+ } else {
+ error ("${curr_dir}CVS/Entries: unrecognizable line");
+ }
}
if ( $single_filename && !$entries{$single_filename} &&
- !$found_files{$single_filename} ) {
- error ("nothing known about $arg");
+ !$found_files{$single_filename} ) {
+ error ("nothing known about $arg");
}
# Scan .cvsignore if any
unless ($no_cvsignore) {
- my (@ignore_list) = ();
-
- if (-f "${curr_dir}.cvsignore") {
- open (CVSIGNORE, "< ${curr_dir}.cvsignore")
- || error ("couldn't open ${curr_dir}.cvsignore: $!");
- while (<CVSIGNORE>) {
- push (@ignore_list, split);
- }
- close (CVSIGNORE);
- }
-
- my ($iter);
- foreach $iter (@ignore_list, @common_ignores) {
- if ($iter eq '!') {
- $ignore_rx = ''
- } else {
- if ($ignore_rx eq '') {
- $ignore_rx = '^(';
- } else {
- $ignore_rx .= '|';
- }
- $ignore_rx .= glob_to_rx ($iter);
- }
- }
- $ignore_rx .= ')$'
- if $ignore_rx ne '';
+ my (@ignore_list) = ();
+
+ if (-f "${curr_dir}.cvsignore") {
+ open (CVSIGNORE, "< ${curr_dir}.cvsignore")
+ || error ("couldn't open ${curr_dir}.cvsignore: $!");
+ while (<CVSIGNORE>) {
+ push (@ignore_list, split);
+ }
+ close (CVSIGNORE);
+ }
+
+ my ($iter);
+ foreach $iter (@ignore_list, @common_ignores) {
+ if ($iter eq '!') {
+ $ignore_rx = ''
+ } else {
+ if ($ignore_rx eq '') {
+ $ignore_rx = '^(';
+ } else {
+ $ignore_rx .= '|';
+ }
+ $ignore_rx .= glob_to_rx ($iter);
+ }
+ }
+ $ignore_rx .= ')$'
+ if $ignore_rx ne '';
}
# File is missing
foreach $file (sort keys %entries) {
- unless ($found_files{$file}) {
- if ($removed{$file}) {
- file_status("R");
- } else {
- file_status("U");
- }
- }
+ unless ($found_files{$file}) {
+ if ($removed{$file}) {
+ file_status("R");
+ } else {
+ file_status("U");
+ }
+ }
}
foreach $file (sort keys %found_files) {
- next if ($file eq '.' || $file eq '..');
- lstat ($curr_dir . $file) ||
- error ("lstat() failed on $curr_dir . $file");
- if (! $nolinks && -l _) {
- file_status ("L");
- } elsif (-d _) {
- if ($file eq 'CVS') {
- file_status ("C");
- } elsif ($subdirs{$file}) {
- $subdirs{$file} = SUBDIR_CVS;
- } else {
- file_status ("D"); # Unknown directory
- }
- } elsif (! (-f _) && ! (-l _)) {
- file_status ("S"); # This must be something very special
- } elsif (! $nolinks && (stat _) [3] > 1 ) {
- file_status ("H"); # Hard link
- } elsif (! $entries{$file}) {
- file_status ("?");
- } elsif ($entries{$file} =~ /^Initial |^dummy /) {
- file_status ("A");
- } elsif ($entries{$file} =~ /^Result of merge/) {
- file_status ("G");
- } elsif ($entries{$file} !~
- /^(...) (...) (..) (..):(..):(..) (....)$/) {
- error ("Invalid timestamp for $curr_dir$file: $entries{$file}");
- } else {
- my $cvtime = timegm($6, $5, $4, $3, $months{$2}, $7 - 1900);
- my $mtime = (stat _) [9];
- if ($cvtime == $mtime) {
- file_status ("F");
- } elsif ($cvtime < $mtime) {
- file_status ("M");
- } else {
- file_status ("O");
- }
- }
+ next if ($file eq '.' || $file eq '..');
+ lstat ($curr_dir . $file) ||
+ error ("lstat() failed on $curr_dir . $file");
+ if (! $nolinks && -l _) {
+ file_status ("L");
+ } elsif (-d _) {
+ if ($file eq 'CVS') {
+ file_status ("C");
+ } elsif ($subdirs{$file}) {
+ $subdirs{$file} = SUBDIR_CVS;
+ } else {
+ file_status ("D"); # Unknown directory
+ }
+ } elsif (! (-f _) && ! (-l _)) {
+ file_status ("S"); # This must be something very special
+ } elsif (! $nolinks && (stat _) [3] > 1 ) {
+ file_status ("H"); # Hard link
+ } elsif (! $entries{$file}) {
+ file_status ("?");
+ } elsif ($entries{$file} =~ /^Initial |^dummy /) {
+ file_status ("A");
+ } elsif ($entries{$file} =~ /^Result of merge/) {
+ file_status ("G");
+ } elsif ($entries{$file} !~
+ /^(...) (...) (..) (..):(..):(..) (....)$/) {
+ error ("Invalid timestamp for $curr_dir$file: $entries{$file}");
+ } else {
+ my $cvtime = timegm($6, $5, $4, $3, $months{$2}, $7 - 1900);
+ my $mtime = (stat _) [9];
+ if ($cvtime == $mtime) {
+ file_status ("F");
+ } elsif ($cvtime < $mtime) {
+ file_status ("M");
+ } else {
+ file_status ("O");
+ }
+ }
}
# Now do directories.
unless ($no_recurse) {
- my $save_curr_dir = $curr_dir;
- foreach $file (sort keys %subdirs) {
- if ($subdirs{$file} == SUBDIR_FOUND) {
- $curr_dir = $save_curr_dir;
- file_status ("X");
- } elsif ($subdirs{$file} == SUBDIR_CVS) {
- process_arg ($save_curr_dir . $file)
- }
- }
+ my $save_curr_dir = $curr_dir;
+ foreach $file (sort keys %subdirs) {
+ if ($subdirs{$file} == SUBDIR_FOUND) {
+ $curr_dir = $save_curr_dir;
+ file_status ("X");
+ } elsif ($subdirs{$file} == SUBDIR_CVS) {
+ process_arg ($save_curr_dir . $file)
+ }
+ }
}
}
@@ -423,13 +423,13 @@ sub glob_to_rx ($)
# Find parts in square brackets and copy them literally
# Text outside brackets is processed by glob_to_rx_simple()
while ($expr ne '') {
- if ($expr =~ /^(.*?)(\[.*?\])(.*)/) {
- $expr = $3;
- $result .= glob_to_rx_simple ($1) . $2;
- } else {
- $result .= glob_to_rx_simple ($expr);
- last;
- }
+ if ($expr =~ /^(.*?)(\[.*?\])(.*)/) {
+ $expr = $3;
+ $result .= glob_to_rx_simple ($1) . $2;
+ } else {
+ $result .= glob_to_rx_simple ($expr);
+ last;
+ }
}
return $result;
}
@@ -441,21 +441,21 @@ sub Main ()
# long status messages
%messages = (
- "?" => "Unlisted file",
- "." => "Known directory",
- "F" => "Up-to-date file",
- "C" => "CVS admin directory",
- "M" => "Modified file",
- "S" => "Special file",
- "D" => "Unlisted directory",
- "L" => "Symbolic link",
- "H" => "Hard link",
- "U" => "Lost file",
- "X" => "Lost directory",
- "A" => "Newly added",
- "O" => "Older copy",
- "G" => "Result of merge",
- "R" => "Removed file"
+ "?" => "Unlisted file",
+ "." => "Known directory",
+ "F" => "Up-to-date file",
+ "C" => "CVS admin directory",
+ "M" => "Modified file",
+ "S" => "Special file",
+ "D" => "Unlisted directory",
+ "L" => "Symbolic link",
+ "H" => "Hard link",
+ "U" => "Lost file",
+ "X" => "Lost directory",
+ "A" => "Newly added",
+ "O" => "Older copy",
+ "G" => "Result of merge",
+ "R" => "Removed file"
);
undef @batch_list; # List of files for batch processing
@@ -471,17 +471,17 @@ sub Main ()
my $want_ver = 0; # Print version and exit
my %options = (
- "types=s" => \$list_types,
- "batch=s" => \$batch_cmd,
- "local" => \$no_recurse,
- "explain" => \$explain_type,
- "find" => \$find_mode,
- "short" => \$short_print,
- "ignore" => \$no_cvsignore,
- "messages" => \$want_msg,
- "nolinks" => \$nolinks,
- "help" => \$want_help,
- "version" => \$want_ver
+ "types=s" => \$list_types,
+ "batch=s" => \$batch_cmd,
+ "local" => \$no_recurse,
+ "explain" => \$explain_type,
+ "find" => \$find_mode,
+ "short" => \$short_print,
+ "ignore" => \$no_cvsignore,
+ "messages" => \$want_msg,
+ "nolinks" => \$nolinks,
+ "help" => \$want_help,
+ "version" => \$want_ver
);
GetOptions(%options);
@@ -493,19 +493,19 @@ sub Main ()
version() if $want_ver;
unless ($no_cvsignore) {
- init_ignores();
+ init_ignores();
}
if ($#ARGV < 0) {
- @ARGV = ("");
+ @ARGV = ("");
}
foreach (@ARGV) {
- process_arg ($_);
+ process_arg ($_);
}
if ($#batch_list >= 0) {
- do_batch();
+ do_batch();
}
}