]> granicus.if.org Git - curl/commitdiff
Fix warning "Use of uninitialized value in ...".
authorYang Tse <yangsita@gmail.com>
Sat, 18 Nov 2006 04:05:42 +0000 (04:05 +0000)
committerYang Tse <yangsita@gmail.com>
Sat, 18 Nov 2006 04:05:42 +0000 (04:05 +0000)
If the list has only one item avoid sort subroutine.

tests/ftp.pm

index 32c6779e3a47362b82f807d2356d2e9746a7a808..66374454555aed2adbff7fe48ab2d4bbbc3bb4ef 100644 (file)
@@ -55,12 +55,14 @@ sub pidfromfile {
         if(open(PIDF, "<$pidfile")) {
             my $pidline = <PIDF>;
             close(PIDF);
-            chomp $pidline;
-            $pidline =~ s/^\s+//;
-            $pidline =~ s/\s+$//;
-            $pidline =~ s/^[+-]?0+//;
-            if($pidline =~ $pidpattern) {
-                $pid = $1;
+            if($pidline) {
+                chomp $pidline;
+                $pidline =~ s/^\s+//;
+                $pidline =~ s/\s+$//;
+                $pidline =~ s/^[+-]?0+//;
+                if($pidline =~ $pidpattern) {
+                    $pid = $1;
+                }
             }
         }
     }
@@ -150,6 +152,13 @@ sub signalpids {
     if((not defined $signal) || (not defined $pids)) {
         return;
     }
+    if($pids !~ /\s+/) {
+        # avoid sorting if only one pid
+        if(checkalivepid($pids) > 0) {
+            kill($signal, $pids);
+        }
+        return;
+    }
     my $prev = 0;
     for(sort({$a <=> $b} split(" ", $pids))) {
         if($_ =~ $pidpattern) {