Changeset 1938 for branches/fc15-dev/server/common

Timestamp:

Jul 31, 2011, 12:32:31 AM (13 years ago)

Author:

achernya

Message:

Merge r1878-r1937 from trunk to branches/fc15-dev

Location:

branches/fc15-dev

Files:

• . (modified) (1 prop)
• server/common/oursrc/execsys/execsys-binfmt (modified) (1 prop)
• server/common/oursrc/logview/logview.pl (modified) (1 diff)
• server/common/oursrc/php_scripts/php_scripts-config.m4 (modified) (1 prop)
• server/common/patches/openafs-localcsdb.patch (modified) (1 prop)

branches/fc15-dev/server/common/oursrc/logview/logview.pl

@@ -1 +1 @@
 #!/usr/bin/perl -T -w
 
-%ENV = ();
-$ENV{'PATH'} = '/bin:/usr/bin';
 my $elogsrc = '/home/logview/error_log';
 # get by uid the caller's name to find the corresponding locker name
-my $caller = (getpwuid $<)[0];
-$\ = "\n";
+my ($caller, $home) = (getpwuid($<))[0, 7];
+my $search = "$home/";
 
-print "--- Error logs for $caller ---";
-open FOO, $elogsrc;
+print "--- Error logs for $caller ---\n";
+open FOO, '<', $elogsrc or die $!;
 while (<FOO>) {
-    # Prevent deviousness, like web_scripts directories within web_scripts
-    if (m|/afs/athena.mit.edu/| &&
-        m|/([^/]+)/web_scripts/| && $caller eq $1) {
-        print;
-    }
+    print if index($_, $search) != -1;
 }