diff options
author | Markus Pfeiffer <markus.pfeiffer@morphism.de> | 2017-10-28 20:24:06 +0100 |
---|---|---|
committer | Markus Pfeiffer <markus.pfeiffer@morphism.de> | 2017-10-28 20:24:06 +0100 |
commit | 8b03461ebba4d0f3b8b9da4b5639a6f810b426ec (patch) | |
tree | 606dc9051c62fb21255e46096e0133b4d813bfd5 | |
parent | f9ef3506486be0fdef4264e02119c444b198d197 (diff) | |
download | ConsoleKit2-8b03461ebba4d0f3b8b9da4b5639a6f810b426ec.tar.gz |
Remove DragonFly specific code from FreeBSD sysdeps
-rw-r--r-- | src/ck-sysdeps-freebsd.c | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/src/ck-sysdeps-freebsd.c b/src/ck-sysdeps-freebsd.c index 66babdd..c71faa8 100644 --- a/src/ck-sysdeps-freebsd.c +++ b/src/ck-sysdeps-freebsd.c @@ -151,67 +151,6 @@ get_kinfo_proc (pid_t pid, return TRUE; } -#ifdef __DragonFly__ -/* return 1 if it works, or 0 for failure */ -static gboolean -stat2proc (pid_t pid, - CkProcessStat *P) -{ - struct kinfo_proc p; - char *ttname; - int num; - int tty_maj; - int tty_min; - - if (! get_kinfo_proc (pid, &p)) { - return FALSE; - } - - num = MAXCOMLEN; - if (num >= sizeof P->cmd) { - num = sizeof P->cmd - 1; - } - - memcpy (P->cmd, p.kp_comm, num); - - P->cmd[num] = '\0'; - P->pid = p.kp_pid; - P->ppid = p.kp_ppid; - P->pgrp = p.kp_pgid; - P->session = p.kp_sid; - P->rss = p.kp_vm_rssize; - P->vsize = p.kp_vm_map_size; - P->start_time = p.kp_start.tv_sec; - P->wchan = (unsigned long) p.kp_lwp.kl_wchan; - P->state = p.kp_stat; - P->nice = p.kp_nice; - P->flags = p.kp_flags; - P->tpgid = p.kp_tpgid; - P->processor = p.kp_lwp.kl_cpuid; - P->nlwp = p.kp_nthreads; - - /* we like it Linux-encoded :-) */ - tty_maj = major (p.kp_tdev); - tty_min = minor (p.kp_tdev); - P->tty = DEV_ENCODE (tty_maj,tty_min); - - snprintf (P->tty_text, sizeof P->tty_text, "%3d,%-3d", tty_maj, tty_min); - - if (p.kp_tdev != NODEV && (ttname = devname (p.kp_tdev, S_IFCHR)) != NULL) { - memcpy (P->tty_text, ttname, sizeof (P->tty_text)); - } - - if (p.kp_tdev == NODEV) { - memcpy (P->tty_text, " ? ", sizeof (P->tty_text)); - } - - if (P->pid != pid) { - return FALSE; - } - - return TRUE; -} -#else /* __DragonFly__ */ /* return 1 if it works, or 0 for failure */ static gboolean stat2proc (pid_t pid, @@ -271,7 +210,6 @@ stat2proc (pid_t pid, return TRUE; } -#endif /* __DragonFly__ */ gboolean ck_process_stat_new_for_unix_pid (pid_t pid, @@ -392,11 +330,7 @@ ck_unix_pid_get_uid (pid_t pid) res = get_kinfo_proc (pid, &p); if (res) { -#ifdef __DragonFly__ - uid = p.kp_uid; -#else uid = p.ki_uid; -#endif } return uid; |