Module: wine Branch: refs/heads/master Commit: ab2cdead77c0aa9c93462c4813c209a7f72a12fc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ab2cdead77c0aa9c93462c48...
Author: Colin Pitrat colin.pitrat@bull.net Date: Tue Aug 8 12:19:31 2006 +0200
tools: Check for open return code in Perl scripts.
---
tools/bug_report.pl | 6 +++--- tools/make_authors | 2 +- tools/winapi/config.pm | 2 +- tools/winapi/make_filter | 2 +- tools/winapi/msvcmaker | 4 ++-- tools/winapi/nativeapi.pm | 6 +++--- tools/winapi/winapi_check | 2 +- tools/winapi/winapi_extract | 8 ++++---- tools/winapi/winapi_fixup | 2 +- tools/winapi/winapi_module_user.pm | 2 +- tools/winapi/winapi_test | 4 ++-- tools/winedump/function_grep.pl | 2 +- 12 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/tools/bug_report.pl b/tools/bug_report.pl index 48afda7..18f180c 100755 --- a/tools/bug_report.pl +++ b/tools/bug_report.pl @@ -45,7 +45,7 @@ sub do_var($) { $var =~ s/\t//g; return $var; } -open STDERR, ">&SAVEERR"; open STDERR, ">&STDOUT"; +open(STDERR, ">&SAVEERR"); open(STDERR, ">&STDOUT"); $ENV{'SHELL'}="/bin/bash"; my $var0 = qq{ What is your level of Wine expertise? 1-newbie 2-intermediate 3-advanced @@ -530,7 +530,7 @@ elsif ($outfile ne "no file" and $dbgout } } unlink($tmpoutfile); - open(OUTFILE, "$outfile"); + open(OUTFILE, "$outfile") || die "Error: Can't open $outfile: $!\n"; while (<OUTFILE>) { $lastlines .= $_; } @@ -550,7 +550,7 @@ else { system("$wineloc WINEDEBUG=$debugopts $extraops "$program""); } sub generate_outfile() { -open(OUTFILE,">$outfile"); +open(OUTFILE,">$outfile") || die "Error: Can't open $outfile: $!\n"; print OUTFILE <<EOM; Auto-generated debug report by Wine Quick Debug Report Maker Tool: WINE Version: $winever diff --git a/tools/make_authors b/tools/make_authors index 806b207..eeaba02 100755 --- a/tools/make_authors +++ b/tools/make_authors @@ -22,7 +22,7 @@ use strict;
my @authors; open(AUTHORS,"<AUTHORS") or die "Can't open AUTHORS"; -open(NEWAUTHORS,">AUTHORS.new"); +open(NEWAUTHORS,">AUTHORS.new") or die "Can't open AUTHORS.new"; while(<AUTHORS>) { print NEWAUTHORS; diff --git a/tools/winapi/config.pm b/tools/winapi/config.pm index 58636df..b652e49 100644 --- a/tools/winapi/config.pm +++ b/tools/winapi/config.pm @@ -155,7 +155,7 @@ sub _get_files($$;$) {
my @dirs = ($dir); while(defined(my $dir = shift @dirs)) { - opendir(DIR, $dir); + opendir(DIR, $dir) || die "Can't open directory $dir: $!\n"; my @entries= readdir(DIR); closedir(DIR); foreach (@entries) { diff --git a/tools/winapi/make_filter b/tools/winapi/make_filter index e427f8d..45665de 100755 --- a/tools/winapi/make_filter +++ b/tools/winapi/make_filter @@ -44,7 +44,7 @@ # main ########################################################################
my $command = $options->make . " " . join(" ", $options->arguments); -open(IN, "($command) 2>&1 |"); +open(IN, "($command) 2>&1 |") || die "Cannot execute command $command: $!";
while(<IN>) { chomp; diff --git a/tools/winapi/msvcmaker b/tools/winapi/msvcmaker index 53c37fb..31bdc93 100755 --- a/tools/winapi/msvcmaker +++ b/tools/winapi/msvcmaker @@ -45,7 +45,7 @@ sub read_spec_file($) {
my $type = "win32";
- open(IN, "< $wine_dir/$spec_file"); + open(IN, "< $wine_dir/$spec_file") || die "Error: Can't open $wine_dir/$spec_file: $!\n";
my $header = 1; my $lookahead = 0; @@ -115,7 +115,7 @@ sub filter_files($$) { my %wine_test_dsp_files;
MAKEFILE_IN: foreach my $makefile_in_file (@makefile_in_files) { - open(IN, "< $wine_dir/$makefile_in_file"); + open(IN, "< $wine_dir/$makefile_in_file") || die "Error: Can't open $wine_dir/$makefile_in_file: $!\n";
my $topobjdir; my $module; diff --git a/tools/winapi/nativeapi.pm b/tools/winapi/nativeapi.pm index 9f6a354..78b6ec9 100644 --- a/tools/winapi/nativeapi.pm +++ b/tools/winapi/nativeapi.pm @@ -59,7 +59,7 @@ sub new($) {
$output->progress("$api_file");
- open(IN, "< $api_file"); + open(IN, "< $api_file") || die "Error: Can't open $api_file: $!\n"; local $/ = "\n"; while(<IN>) { s/^\s*(.*?)\s*$/$1/; # remove whitespace at begin and end of line @@ -73,7 +73,7 @@ sub new($) { $output->progress("$configure_ac_file");
my $again = 0; - open(IN, "< $configure_ac_file"); + open(IN, "< $configure_ac_file") || die "Error: Can't open $configure_ac_file: $!\n"; local $/ = "\n"; while($again || (defined($_ = <IN>))) { $again = 0; @@ -141,7 +141,7 @@ sub new($) {
$output->progress("$config_h_in_file");
- open(IN, "< $config_h_in_file"); + open(IN, "< $config_h_in_file") || die "Error: Can't open $config_h_in_file: $!\n"; local $/ = "\n"; while(<IN>) { # remove leading and trailing whitespace diff --git a/tools/winapi/winapi_check b/tools/winapi/winapi_check index 89534d1..61a0635 100755 --- a/tools/winapi/winapi_check +++ b/tools/winapi/winapi_check @@ -82,7 +82,7 @@ if ($options->global) {
$include2info{$file} = { name => $file };
- open(IN, "< $wine_dir/$file"); + open(IN, "< $wine_dir/$file") || die "Error: Can't open $wine_dir/$file: $!\n"; while(<IN>) { if(/^\s*#\s*include\s*"(.*?)"/) { my $header = $1; diff --git a/tools/winapi/winapi_extract b/tools/winapi/winapi_extract index a11a91b..7c4a394 100755 --- a/tools/winapi/winapi_extract +++ b/tools/winapi/winapi_extract @@ -63,7 +63,7 @@ if($options->spec_files || $options->win
my $type = "win32";
- open(IN, "< $wine_dir/$spec_file"); + open(IN, "< $wine_dir/$spec_file") || die "Error: Can't open $wine_dir/$spec_file: $!\n";
my $header = 1; my $lookahead = 0; @@ -210,7 +210,7 @@ foreach my $file (@h_files, @c_files) { $progress_current++;
{ - open(IN, "< $file"); + open(IN, "< $file") || die "Error: Can't open $file: $!\n"; local $/ = undef; $_ = <IN>; close(IN); @@ -463,7 +463,7 @@ if($options->spec_files) { $spec_file .= "2";
$output->progress("$spec_file"); - open(OUT, "> $wine_dir/$spec_file"); + open(OUT, "> $wine_dir/$spec_file") || die "Error: Can't open $wine_dir/$spec_file: $!\n";
if(exists($specifications{$module}{init})) { my $function = $specifications{$module}{init}{function}; @@ -666,7 +666,7 @@ if($options->winetest) { next if $external_name eq "@";
if($n == 0) { - open(OUT, "> $wine_dir/programs/winetest/include/${package}.pm"); + open(OUT, "> $wine_dir/programs/winetest/include/${package}.pm") || die "Error: Can't open $wine_dir/programs/winetest/include/${package}.pm: $!\n";
print OUT "package ${package};\n"; print OUT "\n"; diff --git a/tools/winapi/winapi_fixup b/tools/winapi/winapi_fixup index 2354723..334aa52 100755 --- a/tools/winapi/winapi_fixup +++ b/tools/winapi/winapi_fixup @@ -61,7 +61,7 @@ foreach my $file (@c_files) { $output->prefix("$file:");
{ - open(IN, "< $file"); + open(IN, "< $file") || die "Error: Can't open $file: $!\n"; local $/ = undef; $_ = <IN>; close(IN); diff --git a/tools/winapi/winapi_module_user.pm b/tools/winapi/winapi_module_user.pm index 0980085..ef14453 100644 --- a/tools/winapi/winapi_module_user.pm +++ b/tools/winapi/winapi_module_user.pm @@ -626,7 +626,7 @@ sub _parse_file($$$) { my $found_comment = shift;
{ - open(IN, "< $file"); + open(IN, "< $file") || die "Error: Can't open $file: $!\n"; local $/ = undef; $_ = <IN>; close(IN); diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index 3e4b97e..db95c36 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -81,7 +81,7 @@ if (0) {
$file .= "2"; # FIXME: For tests
- open(OUT, "> $winapi_dir/$file") || die "$winapi_dir/$file: $!\n"; + open(OUT, "> $winapi_dir/$file") || die "Error: Can't open $winapi_dir/$file: $!\n";
my $x = 0; my @test_dirs = $tests->get_test_dirs(); @@ -337,7 +337,7 @@ foreach my $file (@files) { $progress_current++;
{ - open(IN, "< $wine_dir/$file"); + open(IN, "< $wine_dir/$file") || die "Error: Can't open $wine_dir/$file: $!\n"; local $/ = undef; $_ = <IN>; close(IN); diff --git a/tools/winedump/function_grep.pl b/tools/winedump/function_grep.pl index 5a34526..60e5677 100755 --- a/tools/winedump/function_grep.pl +++ b/tools/winedump/function_grep.pl @@ -54,7 +54,7 @@ if (defined $usage) }
foreach my $file (@files) { - open(IN, "< $file"); + open(IN, "< $file") || die "Error: Can't open $file: $!\n";
my $level = 0; my $extern_c = 0;
-
Alexandre Julliard