- Fix build on 10.3. strncat() was not available in libkern. Actually,

there is no point of using strncat() here because the length of tail is len.
- Remove few empty lines while I am here.
This commit is contained in:
Jung-uk Kim 2017-07-18 22:11:18 +00:00
parent 6c83eea8a0
commit 705bd5961f
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=446177
3 changed files with 4 additions and 7 deletions

View file

@ -3,7 +3,7 @@
PORTNAME= virtualbox-ose
PORTVERSION= 5.1.22
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= emulators
MASTER_SITES= http://download.virtualbox.org/virtualbox/${PORTVERSION}/
PKGNAMESUFFIX?= -additions

View file

@ -1,6 +1,6 @@
--- src/VBox/Additions/freebsd/vboxvfs/vboxvfs_prov.c.orig 1970-01-01 01:00:00.000000000 +0100
+++ src/VBox/Additions/freebsd/vboxvfs/vboxvfs_prov.c 2017-07-12 19:24:26.109029000 +0200
@@ -0,0 +1,1021 @@
@@ -0,0 +1,1020 @@
+/*
+ * Copyright (C) 2008-2016 Oracle Corporation
+ *
@ -311,7 +311,6 @@
+ sfp_file_t **fp,
+ sffs_stat_t *stat)
+{
+
+ int rc;
+ SHFLCREATEPARMS parms;
+ SHFLSTRING *str;

View file

@ -12,7 +12,7 @@
*
* This file is part of VirtualBox Open Source Edition (OSE), as
* available from http://www.virtualbox.org. This file is free software;
@@ -14,228 +9,1336 @@
@@ -14,228 +9,1334 @@
* VirtualBox OSE distribution. VirtualBox OSE is distributed in the
* hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
*/
@ -521,7 +521,7 @@
+ p = malloc(strlen(node->sf_path) + 1 + len + 1, M_VBOXVFS, M_WAITOK);
+ strcpy(p, node->sf_path);
+ strcat(p, "/");
+ strncat(p, tail, len);
+ strcat(p, tail);
+ return (p);
+}
+
@ -610,7 +610,6 @@
+static int
+vboxfs_close(struct vop_close_args *ap)
+{
+
+ struct vnode *vp = ap->a_vp;
+ struct vboxfs_node *np;
+
@ -719,7 +718,6 @@
+static int
+vboxfs_setattr(struct vop_setattr_args *ap)
+{
+
+ struct vnode *vp = ap->a_vp;
+ struct vattr *vap = ap->a_vap;
+ struct vboxfs_node *np = VP_TO_VBOXFS_NODE(vp);