 @@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 13:40:56 agc Exp $
+$NetBSD: distinfo,v 1.5 2013/12/13 09:58:58 jperkin Exp $
 SHA1 (psmisc-20.1.tar.gz) = e969a2f539b181c372b0f82bbbd430c4d57d5d6b
 RMD160 (psmisc-20.1.tar.gz) = 48698ad9f431c881bcb42394f5c912ef91b84d2b
 Size (psmisc-20.1.tar.gz) = 57767 bytes
 SHA1 (patch-aa) = 97b586e06444b9aa2a6ba95c10eaabc93f89c833
 SHA1 (patch-ab) = 4aadacec85e2234c010aad2db5fa9fe469562f4f
 SHA1 (patch-ac) = 9f9a7c7c5155345a1045aee70a2dd65a25ec7219
-SHA1 (patch-ad) = 73ae9467e783957ce7ff638d8637e7398f75c5fe
+SHA1 (patch-ad) = 6e2886ca59160d161d334e276675f187f138db7c
 SHA1 (patch-ae) = 484305118582c575f8c4827783aa3d5f57b25b5d
-SHA1 (patch-af) = 3c5ba3cf27a422943f984b8414ac29da0b8934da
+SHA1 (patch-af) = 28a9417dda852ad5b76ad44774f1aeb3d66e2791
 SHA1 (patch-ag) = a03a4a0c0dbf065e2b2785cee8f23579a11ae13f

 @@ -1,71 +1,79 @@
-$NetBSD: patch-ad,v 1.6 2001/04/24 16:59:35 jlam Exp $
+$NetBSD: patch-ad,v 1.7 2013/12/13 09:58:58 jperkin Exp $
---- src/killall.c.orig	Sat Mar 31 05:26:47 2001
+Need limits.h for PATH_MAX
 --- src/killall.c.orig	2001-03-31 10:26:47.000000000 +0000
 +++ src/killall.c
-@@ -18,10 +18,10 @@
+@@ -13,15 +13,16 @@
  #include <dirent.h>
  #include <signal.h>
  #include <errno.h>
 +#include <limits.h>
  #include <sys/types.h>
  #include <sys/stat.h>
  #include <getopt.h>
  #include "comm.h"
 +#include "procfs.h"
  #include "signals.h"
 -#define PROC_BASE "/proc"
  #define MAX_NAMES (sizeof(unsigned long)*8)
-@@ -138,11 +138,15 @@
+@@ -138,11 +139,15 @@ kill_all (int signal, int names, char **
+     }
    for (i = 0; i < pids; i++)
+     {
 -      sprintf (path, PROC_BASE "/%d/stat", pid_table[i]);
 +      sprintf (path, "%s/%d/%s", PROC_BASE, pid_table[i], STATUS_FILE);
        if (!(file = fopen (path, "r")))
  	continue;
        empty = 0;
 +#ifdef BSD_44_PROCFS
 +      okay = fscanf (file, "%s", comm) == 1;
 +#else
        okay = fscanf (file, "%*d (%[^)]", comm) == 1;
 +#endif
        (void) fclose (file);
        if (!okay)
  	continue;
-@@ -151,7 +155,10 @@
+@@ -151,7 +156,10 @@ kill_all (int signal, int names, char **
        length = strlen (comm);
        if (length == COMM_LEN - 1)
+ 	{
 -	  sprintf (path, PROC_BASE "/%d/cmdline", pid_table[i]);
 +#if defined(BSD_44_PROCFS) && !defined(BSD_PROCFS_CMDLINE)
 +	  okay = 0;
 +#else
 +	  sprintf (path, "%s/%d/%s", PROC_BASE, pid_table[i], CMDLINE_FILE);
  	  if (!(file = fopen (path, "r")))
  	    continue;
            while (1) {
-@@ -180,6 +187,7 @@
+@@ -180,6 +188,7 @@ kill_all (int signal, int names, char **
+             }
+           }
            (void) fclose(file);
 +#endif
  	  if (exact && !okay)
+ 	    {
  	      if (verbose)
-@@ -206,7 +214,7 @@
+@@ -206,7 +215,7 @@ kill_all (int signal, int names, char **
+ 	    }
  	  else
+ 	    {
 -	      sprintf (path, PROC_BASE "/%d/exe", pid_table[i]);
 +	      sprintf (path, "%s/%d/%s", PROC_BASE, pid_table[i], EXE_FILE);
  	      if (stat (path, &st) < 0)
  		continue;
  	      if (sts[j].st_dev != st.st_dev || sts[j].st_ino != st.st_ino)
-@@ -369,7 +377,7 @@
+@@ -369,7 +378,7 @@ main (int argc, char **argv)
    sig_num = SIGTERM;
    opterr = 0;
 -  while ( (optc = getopt_long_only(argc,argv,"egilqs:vwV",options,NULL)) != EOF) {
 +  while ( (optc = getopt_long(argc,argv,"egilqs:vwV",options,NULL)) != EOF) {
      switch (optc) {
        case 'e':
          exact = 1;

 @@ -1,92 +1,102 @@
-$NetBSD: patch-af,v 1.4 2001/04/24 16:59:35 jlam Exp $
+$NetBSD: patch-af,v 1.5 2013/12/13 09:58:58 jperkin Exp $
---- src/pstree.c.orig	Mon Dec 18 00:59:23 2000
+Need limits.h for PATH_MAX
 --- src/pstree.c.orig	2000-12-18 05:59:23.000000000 +0000
 +++ src/pstree.c
-@@ -22,12 +22,12 @@
+@@ -15,6 +15,7 @@
  #include <getopt.h>
  #include <pwd.h>
  #include <dirent.h>
 +#include <limits.h>
  #include <termios.h>
  #include <termcap.h>
  #include <sys/types.h>
@@ -22,12 +23,12 @@
  #include <sys/ioctl.h>
  #include "comm.h"
 +#include "procfs.h"
  #ifndef MAX_DEPTH
  #define MAX_DEPTH    100
  #endif
 -#define PROC_BASE    "/proc"
  /* UTF-8 defines by Johan Myreen */
  #define UTF_V	"\342\224\202\277"	/* Vertical line drawing char */
-@@ -303,6 +303,7 @@
+@@ -303,6 +304,7 @@ dump_tree (PROC * current, int level, in
    const struct passwd *pw;
    int lvl, i, add, offset, len, swapped, info, count, comm_len, first;
    const char *tmp, *here;
 +  char tbuf[1024], *pbuf;
    char comm_tmp[5];
    if (!current)
-@@ -327,7 +328,8 @@
+@@ -327,7 +329,8 @@ dump_tree (PROC * current, int level, in
        add = out_int (rep) + 2;
        out_string ("*[");
+     }
 -  if (current->highlight && (tmp = tgetstr ("md", NULL)))
 +  pbuf = tbuf;
 +  if (current->highlight && (tmp = tgetstr ("md", &pbuf)))
      tputs (tmp, 1, putchar);
    if ((swapped = print_args) && current->argc < 0)
      out_char ('(');
-@@ -366,7 +368,8 @@
+@@ -366,7 +369,8 @@ dump_tree (PROC * current, int level, in
+     }
    if (info || swapped)
      out_char (')');
 -  if (current->highlight && (tmp = tgetstr ("me", NULL)))
 +  pbuf = tbuf;
 +  if (current->highlight && (tmp = tgetstr ("me", &pbuf)))
      tputs (tmp, 1, putchar);
    if (print_args)
+     {
-@@ -504,7 +507,7 @@
+@@ -504,7 +508,7 @@ read_proc (void)
    while ((de = readdir (dir)) != NULL)
      if ((pid = atoi (de->d_name)) != 0)
+       {
 -	sprintf (path, "%s/%d/stat", PROC_BASE, pid);
 +	sprintf (path, "%s/%d/%s", PROC_BASE, pid, STATUS_FILE);
  	if ((file = fopen (path, "r")) != NULL)
+ 	  {
  	    empty = 0;
-@@ -513,6 +516,10 @@
+@@ -513,6 +517,10 @@ read_proc (void)
  		perror (path);
  		exit (1);
+ 	      }
 +#ifdef BSD_44_PROCFS
 +	    if (fscanf(file, "%s %*d %d", comm, &ppid) == 2)
 +	    { { {
 +#else
              fread(readbuf, BUFSIZ, 1, file) ;
              if (ferror(file) == 0)
+             {
-@@ -532,11 +539,12 @@
+@@ -532,11 +540,12 @@ read_proc (void)
  		(file, "%d (%s) %c %d", &dummy, comm, (char *) &dummy,
  		 &ppid) == 4)
  	      */
 +#endif
  		if (!print_args)
  		  add_proc (comm, pid, ppid, st.st_uid, NULL, 0);
  		else
+ 		  {
 -		    sprintf (path, "%s/%d/cmdline", PROC_BASE, pid);
 +		    sprintf (path, "%s/%d/%s", PROC_BASE, pid, CMDLINE_FILE);
  		    if ((fd = open (path, O_RDONLY)) < 0)
+ 		      {
  			perror (path);
-@@ -641,7 +649,11 @@
+@@ -641,7 +650,11 @@ main (int argc, char **argv)
      switch (c)
+       {
        case 'a':
 +#if defined(BSD_44_PROCFS) && !defined(BSD_PROCFS_CMDLINE)
 +	print_args = 0;
 +#else
  	print_args = 1;
 +#endif
  	break;
        case 'c':
  	compact = 0;