@@ -45,10 +48,36 @@

- - - - + +

@@ -62,13 +91,15 @@

.+$(.+)$\<\/td>/iu', $lines[4], $sect); $url = "$root/?query=". urlencode($query) ."&section=". urlencode($sect[1]) - ."&action=lmmtfy"; + ."&arch=". urlencode($arch) ."&action=lmmtfy"; /* HACK: fucking mandoc just generates tons of useless
s that make

 stuff
              * look horrible. So I just remove it here.
@@ -105,7 +136,7 @@
 
     if(($action === "apropos") || !$found_man)
     {
-        $res = exec("man -M $manpath -k " . escapeshellarg($query), $lines, $ret);
+        $res = exec("man -M $manpath $arg_section -k " . escapeshellarg($query), $lines, $ret);
         if($ret === 0)
         {
             $n = count($lines);
@@ -114,19 +145,22 @@
 
             foreach($lines as $line)
             {
-                preg_match('/^((.+)(?:,.+)*)\(((.+)(?:,.+)*)\)\s?-\s?(.*)$/Uu', $line, $matches);
+                preg_match('/^((.+)(?:,.+)*)\((.+)\)\s?-\s?(.*)$/Uu', $line, $matches);
                 $fname = $matches[1];
                 $name  = $matches[2];
                 $fsect = $matches[3];
-                $sect  = $matches[4];
-                $desc  = $matches[5];
+                $desc  = $matches[4];
+                $sect  = explode(',', $fsect);
+                $arch  = explode('/', end($sect));
+                $sect  = trim($arch[0]);
+                $arch  = trim(end($arch));
 
                 $descl = strlen($desc);
                 if($descl > 320) $desc = substr($desc, 0, 320) . "...";
                 elseif($descl === 0) $desc = "No synopsis.";
 
                 $url = "$root/search.php?query=". urlencode($name) ."§ion=". urlencode($sect)
-                       ."&action=man";
+                       ."&arch=". urlencode($arch) ."&action=man";
 
                 echo '';
                 echo "  $fname($fsect)";
@@ -147,5 +181,7 @@