Changeset 4477 for trunk/base

Timestamp:

Jan 6, 2004, 8:03:50 AM (20 years ago)

Author:

jkh

Message:

This is a basically rewritten port(1) contents target. Summary of changes:

• Read the file in one line at a time, rather than all at once.
• Use regexp to match each line on {^{contents \{(.*)\}$}, ensuring that only}

the actual contents information will be matched.

• Move file-close check to the end of the target.
• Formatting fixes - stupid tabs!

These changes should be entirely transparent - it behaves exactly as it did
before.

Bug: 1252
Submitted by: Toby Peterson <tp62@…>

File:

• trunk/base/src/port/port.tcl (modified) (7 diffs)

trunk/base/src/port/port.tcl

@@ -178 +178 @@
         # make sure a port was given on the command line
         if {![info exists portname]} {
-           puts "You must specify a port"
-           exit 1
+            puts "You must specify a port"
+            exit 1
         }
 
         # search for port
         if {[catch {dportsearch ^$portname$} result]} {
-           puts "port search failed: $result"
-           exit 1
+            puts "port search failed: $result"
+            exit 1
         }
 
@@ -236 +236 @@
         # make sure a port was given on the command line
         if {![info exists portname]} {
-           puts "You must specify a port"
-           exit 1
-        }
-
+            puts "You must specify a port"
+            exit 1
+        }
+        
         # search for port
         if {[catch {dportsearch ^$portname$} result]} {
-           puts "port search failed: $result"
-           exit 1
-        }
-
+            puts "port search failed: $result"
+            exit 1
+        }
+        
         if {$result == ""} {
             puts "No port $portname found."
         }
-
+        
         array set portinfo [lindex $result 1]
-
+        
         # if this fails the port doesn't have any variants
         if {![info exists portinfo(variants)]} {
             puts "$portname has no variants"
         } else {
-        # print out all the variants
+            # print out all the variants
             for {set i 0} {$i < [llength $portinfo(variants)]} {incr i} {
                 puts "[lindex $portinfo(variants) $i]"
@@ -265 +265 @@
         # make sure a port was given on the command line
         if {![info exists portname]} {
-           puts "You must specify a port"
-           exit 1
-        }
-
+            puts "You must specify a port"
+            exit 1
+        }
+        
         set rfile [dportregistry::exists $portname]
         if {$rfile != ""} {
@@ -278 +278 @@
                 set fd [open $rfile r]
             }
-            set entry [read $fd]
+            
+            while {-1 < [gets $fd line]} {
+                set match [regexp {^contents \{(.*)\}$} $line dummy contents]
+                if {$match == 1} {
+                    puts "Contents of $shortname"
+                    foreach f $contents {
+                        puts "\t[lindex $f 0]"
+                    }
+                    break
+                }
+            }
+            
+            if {$match == 0} {
+                puts "No contents list for $shortname"
+                exit 1
+            }
+            
             # kind of a corner case but I ran into it testing
             if {[catch {close $fd} result]} {
                 puts "Port failed: $rfile may be corrupted"
-                exit 1
-            }
-
-            # look for a contents list
-            set ix [lsearch $entry contents]
-            if {$ix >= 0} {
-                set contents [lindex $entry [incr ix]]
-                set uninst_err 0
-                puts "Contents of $shortname"
-                foreach f $contents {
-                    puts "\t[lindex $f 0]"
-                }
-            } else {
-                puts "No contents list for $shortname"
-                exit 1
+                exit 1
             }
         } else {
@@ -314 +316 @@
         foreach {name array} $res {
             array set portinfo $array
-
+            
             # XXX is this the right place to verify an entry?
             if {![info exists portinfo(name)]} {
@@ -351 +353 @@
         set target $action
         if {[info exists portname]} {
-                # Escape regex special characters
-                regsub -all "(\\(){1}|(\\)){1}|(\\{1}){1}|(\\+){1}|(\\{1}){1}|(\\{){1}|(\\}){1}|(\\^){1}|(\\$){1}|(\\.){1}|(\\\\){1}" $portname "\\\\&" search_string
+            # Escape regex special characters
+            regsub -all "(\\(){1}|(\\)){1}|(\\{1}){1}|(\\+){1}|(\\{1}){1}|(\\{){1}|(\\}){1}|(\\^){1}|(\\$){1}|(\\.){1}|(\\\\){1}" $portname "\\\\&" search_string
             if {[catch {set res [dportsearch ^$search_string\$]} result]} {
                 puts "port search failed: $result"
@@ -375 +377 @@
             exit 1
         }
-
+        
         dportclose $workername
         exit $result