Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/procps/pgrep.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/procps/pgrep.c (modified) (2 diffs)

branches/3.3/mindi-busybox/procps/pgrep.c

@@ -66 +66 @@
     if (pgrep) {
         if (option_mask32 & (1 << OPTBIT_L)) /* OPT_LIST */
-            printf("%d %s\n", pid, cmd);
+            printf("%u %s\n", pid, cmd);
         else
-            printf("%d\n", pid);
+            printf("%u\n", pid);
     } else
         kill(pid, signo);
@@ -129 +129 @@
 
     if (argv[0])
-        xregcomp(&re_buffer, argv[0], REG_EXTENDED | REG_NOSUB);
+        xregcomp(&re_buffer, argv[0], OPT_ANCHOR ? REG_EXTENDED : (REG_EXTENDED|REG_NOSUB));
 
     matched_pid = 0;