sysutils/libgtop/patches/patch-de

   1 $NetBSD$
   2
   3 --- sysdeps/freebsd/proclist.c.orig     2009-07-10 23:21:10 +0300
   4 +++ sysdeps/freebsd/proclist.c  2009-07-10 23:30:28 +0300
   5 @@ -95,7 +95,11 @@ glibtop_get_proclist_p (glibtop *server,
   6         for (i = 0; i < len; i++) {
   7                 pid_t pid;
   8
   9 +#ifdef __DragonFly__
  10 +               pid = (pid_t) pinfo[i].kp_pid;
  11 +#else
  12                 pid = (pid_t) pinfo[i].ki_pid;
  13 +#endif
  14
  15                 switch (which & GLIBTOP_KERN_PROC_MASK) {
  16                         case GLIBTOP_KERN_PROC_ALL:
  17 @@ -105,29 +109,53 @@ glibtop_get_proclist_p (glibtop *server,
  18                                         continue;
  19                                 break;
  20                         case GLIBTOP_KERN_PROC_UID:
  21 +#ifdef __DragonFly__
  22 +                               if ((uid_t) arg != pinfo[i].kp_ruid)
  23 +#else
  24                                 if ((uid_t) arg != pinfo[i].ki_ruid)
  25 +#endif
  26                                         continue;
  27                                 break;
  28                         case GLIBTOP_KERN_PROC_PGRP:
  29 +#ifdef __DragonFly__
  30 +                               if ((pid_t) arg != pinfo[i].kp_pgid)
  31 +#else
  32                                 if ((pid_t) arg != pinfo[i].ki_pgid)
  33 +#endif
  34                                         continue;
  35                                 break;
  36                         case GLIBTOP_KERN_PROC_SESSION:
  37 +#ifdef __DragonFly__
  38 +                               if ((pid_t) arg != pinfo[i].kp_sid)
  39 +#else
  40                                 if ((pid_t) arg != pinfo[i].ki_sid)
  41 +#endif
  42                                         continue;
  43                                 break;
  44                         case GLIBTOP_KERN_PROC_TTY:
  45 +#ifdef __DragonFly__
  46 +                               if ((dev_t) arg != pinfo[i].kp_tdev)
  47 +#else
  48                                 if ((dev_t) arg != pinfo[i].ki_tdev)
  49 +#endif
  50                                         continue;
  51                                 break;
  52                         case GLIBTOP_KERN_PROC_RUID:
  53 +#ifdef __DragonFly__
  54 +                               if ((uid_t) arg != pinfo[i].kp_ruid)
  55 +#else
  56                                 if ((uid_t) arg != pinfo[i].ki_ruid)
  57 +#endif
  58                                         continue;
  59                                 break;
  60                         }
  61
  62                 if (which & GLIBTOP_EXCLUDE_NOTTY)
  63 +#ifdef __DragonFly__
  64 +                       if (pinfo[i].kp_tdev == (dev_t) -1) continue;
  65 +#else
  66                         if (pinfo[i].ki_tdev == (dev_t) -1) continue;
  67 +#endif
  68
  69                 if (which & GLIBTOP_EXCLUDE_IDLE) {
  70                         glibtop_get_proc_state_p (server, &procstate, pid);
  71 @@ -136,7 +164,11 @@ glibtop_get_proclist_p (glibtop *server,
  72                 }
  73
  74                 if (which & GLIBTOP_EXCLUDE_SYSTEM)
  75 +#ifdef __DragonFly__
  76 +                       if (pinfo[i].kp_ruid == (uid_t) 0) continue;
  77 +#else
  78                         if (pinfo[i].ki_ruid == (uid_t) 0) continue;
  79 +#endif
  80
  81                 g_array_append_val (pids, pid);
  82         }