aboutsummaryrefslogtreecommitdiff
path: root/x11/xscreensaver/files/patch-driver_xscreensaver-getimage-file
diff options
context:
space:
mode:
Diffstat (limited to 'x11/xscreensaver/files/patch-driver_xscreensaver-getimage-file')
-rw-r--r--x11/xscreensaver/files/patch-driver_xscreensaver-getimage-file16
1 files changed, 8 insertions, 8 deletions
diff --git a/x11/xscreensaver/files/patch-driver_xscreensaver-getimage-file b/x11/xscreensaver/files/patch-driver_xscreensaver-getimage-file
index 5a9ed975f5ff..db5f51c2d293 100644
--- a/x11/xscreensaver/files/patch-driver_xscreensaver-getimage-file
+++ b/x11/xscreensaver/files/patch-driver_xscreensaver-getimage-file
@@ -1,6 +1,6 @@
---- driver/xscreensaver-getimage-file.orig Sun Jan 19 21:27:38 2003
-+++ driver/xscreensaver-getimage-file Fri Apr 18 23:02:37 2003
-@@ -42,7 +42,7 @@
+--- driver/xscreensaver-getimage-file.orig Sat Jun 28 19:01:43 2003
++++ driver/xscreensaver-getimage-file Fri Aug 15 02:46:20 2003
+@@ -43,7 +43,7 @@
# So we do it like this instead:
#
BEGIN {
@@ -9,12 +9,12 @@
require Fcntl;
import Fcntl ':mode'; # if not, look for it in "Fcntl".
}
-@@ -139,7 +139,7 @@
- if (S_ISDIR($mode)) {
+@@ -149,7 +149,7 @@
push @dirs, $file;
+ $dir_count++;
print STDERR "$progname: found dir $file\n" if ($verbose > 2);
- } elsif (S_ISREG($mode) || S_ISLNK($mode)) {
+ } elsif (S_ISREG($mode) || (-l "$file")) {
- push @all_files, $file;
- print STDERR "$progname: found file $file\n" if ($verbose > 2);
- } elsif ($verbose > 2) {
+
+ if ($file =~ m/[~%\#]$/ || # backup file, or
+ ! ($file =~ m/$good_file_re/io)) { # no image extension