summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortravis%sedsystems.ca <>2005-01-28 05:08:33 +0100
committertravis%sedsystems.ca <>2005-01-28 05:08:33 +0100
commitf59ece67513bb56107a6a7d16cc4b1df9ab9aa9c (patch)
tree43175b0515d32618a7b795fb37fa440c34641abd
parentb61cb7207dea39ca70c2ffe3fbe3805506def34f (diff)
downloadbugzilla-f59ece67513bb56107a6a7d16cc4b1df9ab9aa9c.tar.gz
bugzilla-f59ece67513bb56107a6a7d16cc4b1df9ab9aa9c.tar.xz
Bug 278791 : Move ModTime() to Bugzilla::Util
Patch by Max K-A <mkanat@kerio.com> r=vladd a=justdave
-rw-r--r--Bugzilla/Util.pm21
-rw-r--r--globals.pl14
-rwxr-xr-xshowdependencygraph.cgi3
3 files changed, 23 insertions, 15 deletions
diff --git a/Bugzilla/Util.pm b/Bugzilla/Util.pm
index b832d1698..e5207af78 100644
--- a/Bugzilla/Util.pm
+++ b/Bugzilla/Util.pm
@@ -33,7 +33,8 @@ use base qw(Exporter);
css_class_quote
lsearch max min
trim diff_strings
- format_time format_time_decimal);
+ format_time format_time_decimal
+ file_mod_time);
use Bugzilla::Config;
use Bugzilla::Error;
@@ -223,6 +224,14 @@ sub format_time_decimal {
return $newtime;
}
+sub file_mod_time ($) {
+ my ($filename) = (@_);
+ my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,
+ $atime,$mtime,$ctime,$blksize,$blocks)
+ = stat($filename);
+ return $mtime;
+}
+
sub ValidateDate {
my ($date, $format) = @_;
@@ -272,6 +281,9 @@ Bugzilla::Util - Generic utility functions for bugzilla
# Functions for formatting time
format_time($time);
+ # Functions for dealing with files
+ $time = file_mod_time($filename);
+
=head1 DESCRIPTION
This package contains various utility functions which do not belong anywhere
@@ -408,6 +420,13 @@ shown in different formats.
Returns a number with 2 digit precision, unless the last digit is a 0. Then it
returns only 1 digit precision.
+=head2 Files
+
+=over 4
+
+=item C<file_mod_time($filename)>
+
+Takes a filename and returns the modification time. It returns it in the format of the "mtime" parameter of the perl "stat" function.
=back
diff --git a/globals.pl b/globals.pl
index 32dc64a6d..0c1ba852b 100644
--- a/globals.pl
+++ b/globals.pl
@@ -352,22 +352,10 @@ sub GetKeywordIdFromName {
}
-
-
-# Returns the modification time of a file.
-
-sub ModTime {
- my ($filename) = (@_);
- my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,
- $atime,$mtime,$ctime,$blksize,$blocks)
- = stat($filename);
- return $mtime;
-}
-
$::VersionTableLoaded = 0;
sub GetVersionTable {
return if $::VersionTableLoaded;
- my $mtime = ModTime("$datadir/versioncache");
+ my $mtime = file_mod_time("$datadir/versioncache");
if (!defined $mtime || $mtime eq "" || !-r "$datadir/versioncache") {
$mtime = 0;
}
diff --git a/showdependencygraph.cgi b/showdependencygraph.cgi
index 0d33d316d..da7f0d7b8 100755
--- a/showdependencygraph.cgi
+++ b/showdependencygraph.cgi
@@ -28,6 +28,7 @@ use lib qw(.);
use File::Temp;
use Bugzilla;
use Bugzilla::Config qw(:DEFAULT $webdotdir);
+use Bugzilla::Util;
require "CGI.pl";
@@ -271,7 +272,7 @@ foreach my $f (@files)
# symlinks), this can't escape to delete anything it shouldn't
# (unless someone moves the location of $webdotdir, of course)
trick_taint($f);
- if (ModTime($f) < $since) {
+ if (file_mod_time($f) < $since) {
unlink $f;
}
}