[prev in list] [next in list] [prev in thread] [next in thread] 

List:       ipcop-svn
Subject:    [Ipcop-svn] SF.net SVN: ipcop:[3501] ipcop/trunk/html/cgi-bin
From:       eoberlander () users ! sourceforge ! net
Date:       2009-08-27 17:13:14
Message-ID: E1MgiXC-0005m4-Av () c3vjzd1 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Revision: 3501
          http://ipcop.svn.sourceforge.net/ipcop/?rev=3501&view=rev
Author:   eoberlander
Date:     2009-08-27 17:13:08 +0000 (Thu, 27 Aug 2009)

Log Message:
-----------
Code improvement, suggested by John Edwards.

Modified Paths:
--------------
    ipcop/trunk/html/cgi-bin/status.cgi
    ipcop/trunk/html/cgi-bin/updates.cgi

Modified: ipcop/trunk/html/cgi-bin/status.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/status.cgi	2009-08-27 13:20:41 UTC (rev 3500)
+++ ipcop/trunk/html/cgi-bin/status.cgi	2009-08-27 17:13:08 UTC (rev 3501)
@@ -214,9 +214,7 @@
 while (@all_entries > 0) {
     my $device=shift(@all_entries);
     if ($device eq "/dev/disk/by-label/root") {
-        $device = `ls -l /dev/disk/by-label/root`;
-        $device =~ s/.*\///;
-        $device = "/dev/" . $device;
+        $device = `/bin/readlink -f /dev/disk/by-label/root`;
     }
     my $size=shift(@all_entries);
     my $used=shift(@all_entries);
@@ -280,9 +278,7 @@
 while (@all_entries > 0) {
     my $device=shift(@all_entries);
     if ($device eq "/dev/disk/by-label/root") {
-        $device = `ls -l /dev/disk/by-label/root`;
-        $device =~ s/.*\///;
-        $device = "/dev/" . $device;
+        $device = `/bin/readlink -f /dev/disk/by-label/root`;
     }
     my $size=shift(@all_entries);
     my $used=shift(@all_entries);

Modified: ipcop/trunk/html/cgi-bin/updates.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/updates.cgi	2009-08-27 13:20:41 UTC (rev 3500)
+++ ipcop/trunk/html/cgi-bin/updates.cgi	2009-08-27 17:13:08 UTC (rev 3501)
@@ -371,9 +371,7 @@
 
         my $dev     = shift(@all_entries);
         if ($dev eq "/dev/disk/by-label/root") {
-            $dev = `ls -l /dev/disk/by-label/root`;
-            $dev =~ s/.*\///;
-            $dev = "/dev/" . $dev;
+            $dev = `/bin/readlink -f /dev/disk/by-label/root`;
         }
         my $size    = shift(@all_entries);
         my $used    = shift(@all_entries);


This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with 
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn


[prev in list] [next in list] [prev in thread] [next in thread]