Skip to content

Instantly share code, notes, and snippets.

diff --git a/usr.sbin/installer/installer/installer.sh b/usr.sbin/installer/installer/installer.sh
index 51af9aa..3e44c7a 100644
--- a/usr.sbin/installer/installer/installer.sh
+++ b/usr.sbin/installer/installer/installer.sh
@@ -71,7 +71,11 @@ installer_start()
pfi_frontend="cursesvty"
fi
else
- pfi_frontend="cursesx11"
+ if [ "X$TTY_INST" = "X" ]; then
diff --git a/sys/kern/kern_slaballoc.c b/sys/kern/kern_slaballoc.c
index 77386dd..31dc409 100644
--- a/sys/kern/kern_slaballoc.c
+++ b/sys/kern/kern_slaballoc.c
@@ -586,14 +586,28 @@ powerof2_size(unsigned long size)
*
* MPSAFE
*/
-
#ifdef SLAB_DEBUG
#! /bin/sh
#
# Copyright (c) 2014 The DragonFly Project. All rights reserved.
#
# This code is derived from software contributed to The DragonFly Project
# by Antonio Huete <tuxillo@quantumachine.net>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
diff --git a/usr.bin/pkill/pkill.c b/usr.bin/pkill/pkill.c
index d102fab..a185db3 100644
--- a/usr.bin/pkill/pkill.c
+++ b/usr.bin/pkill/pkill.c
@@ -68,8 +68,10 @@
#define MAX_PID PID_MAX
/* Ignore system-processes (if '-S' flag is not specified) and myself. */
-#define PSKIP(kp) ((kp)->kp_pid == mypid || \
- (!kthreads && ((kp)->kp_flags & P_KTHREADP) != 0))
diff --git a/usr.bin/pkill/pkill.c b/usr.bin/pkill/pkill.c
index d102fab..02f3159 100644
--- a/usr.bin/pkill/pkill.c
+++ b/usr.bin/pkill/pkill.c
@@ -69,7 +69,8 @@
/* Ignore system-processes (if '-S' flag is not specified) and myself. */
#define PSKIP(kp) ((kp)->kp_pid == mypid || \
- (!kthreads && ((kp)->kp_flags & P_KTHREADP) != 0))
+ (!kthreads && ((kp)->kp_flags & P_KTHREADP) != 0) || \
diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c
index ef371ce..004bb02 100644
--- a/usr.bin/vmstat/vmstat.c
+++ b/usr.bin/vmstat/vmstat.c
@@ -380,13 +380,31 @@ getuptime(void)
int hdrcnt;
static void
+do_sysctl(struct vmmeter *vmmp, struct vmstats *vmsp, struct vmtotal *totalp)
+{
diff --git a/share/man/man9/VOP_FSYNC.9 b/share/man/man9/VOP_FSYNC.9
index def80e7..5e6ddf7 100644
--- a/share/man/man9/VOP_FSYNC.9
+++ b/share/man/man9/VOP_FSYNC.9
@@ -26,7 +26,7 @@
.\"
.\" $FreeBSD: src/share/man/man9/VOP_FSYNC.9,v 1.6.2.2 2001/12/17 11:30:18 ru Exp $
.\"
-.Dd July 24, 1996
+.Dd October 8, 2014
From 2b8b1b0c9e13615015f611ff351e816e9b52aa23 Mon Sep 17 00:00:00 2001
From: Antonio Huete Jimenez <tuxillo@quantumachine.net>
Date: Thu, 3 Jul 2014 17:19:48 +0200
Subject: [PATCH] build - Add missing includes
- According to POSIX htonl() requires <arpa/inet.h> included
so explicitly include it to avoid build errors due to
-Wimplicit-function-declaration.
Signed-off-by: Antonio Huete Jimenez <tuxillo@quantumachine.net>
diff --git a/src/gssapi.c b/src/gssapi.c
index da35899..30510bd 100644
--- a/src/gssapi.c
+++ b/src/gssapi.c
@@ -27,6 +27,7 @@
#include <unistd.h>
#endif
+#include <arpa/inet.h>
#include <gssapi/gssapi.h>
diff --git a/usr.bin/systat/vmstat.c b/usr.bin/systat/vmstat.c
index 147d743..e6eb301 100644
--- a/usr.bin/systat/vmstat.c
+++ b/usr.bin/systat/vmstat.c
@@ -144,8 +144,6 @@ static struct nlist namelist[] = {
{ .n_name = "_inactivevnodes" },
#define X_ACTIVEVNODES 5
{ .n_name = "_activevnodes" },
-#define X_NUMDIRTYBUFFERS 6
- { .n_name = "_dirtybufspace" },