Merge pull request #328 from dezgeg/pid_match_bugfix

process_matcher: Fix accidentally matching against pid

Author: cakebaker

src/uu/pgrep/src/process_matcher.rs

@@ -160,18 +160,12 @@ fn collect_matched_pids(settings: &Settings) -> Vec<ProcessInformation> {
                 name.into()
             };
             let pattern_matched = {
-                let want = if settings.exact {
-                    // Equals `Name` in /proc/<pid>/status
-                    // The `unwrap` operation must succeed
-                    // because the REGEX has been verified as correct in `uumain`.
-                    &name
-                } else if settings.full {
+                let want = if settings.full {
                     // Equals `cmdline` in /proc/<pid>/cmdline
                     &pid.cmdline
                 } else {
-                    // From manpage:
-                    // The process name used for matching is limited to the 15 characters present in the output of /proc/pid/stat.
-                    &pid.proc_stat()[..15]
+                    // Equals `Name` in /proc/<pid>/status
+                    &name
                 };
 
                 settings.regex.is_match(want)

tests/by-util/test_pgrep.rs

@@ -369,6 +369,13 @@ fn test_invalid_signal() {
         .stderr_contains("Unknown signal 'foo'");
 }
 
+#[test]
+#[cfg(target_os = "linux")]
+fn test_does_not_match_pid() {
+    let our_pid = std::process::id();
+    new_ucmd!().arg(our_pid.to_string()).fails();
+}
+
 #[test]
 #[cfg(target_os = "linux")]
 fn test_too_long_pattern() {