Update x11-toolkits/ocaml-lablgtk2, unison to 2.51.3, fix depdent ports
ClosedPublic
Actions

Authored by madpilot on Oct 23 2020, 10:03 PM.

Details

Reviewers

danfe
mandree

Commits

rP555474: - Update x11-toolkits/ocaml-lablgtk2 to 2.18.11 [1]

Summary

Latest unison requires a newer ocaml-lablgtk2. I updated the port.

I also backported fixes to older unison releases to make them compile against the newer ocaml-lablgtk2.

I'd like to commit this in one single atomic commit.

Test Plan

Build fine here in all supported realeses and run fine with unison.

Diff Detail

Repository

rP FreeBSD ports repository

Lint

No Lint Coverage

Unit

No Test Coverage

Build Status

Buildable 34344
Build 31467: arc lint + arc unit

Event Timeline

madpilot created this revision.Oct 23 2020, 10:03 PM

Herald added a subscriber: mat. · View Herald TranscriptOct 23 2020, 10:03 PM

madpilot requested review of this revision.Oct 23 2020, 10:03 PM

Harbormaster completed remote builds in B34344: Diff 78662.Oct 23 2020, 10:03 PM

Ho-hum, generally this looks good but now my point is I can't get unison232 to function (run-time), it tries to read its ~/.unison/default.prf, closes it, then prints 15 bytes of garbage to stderr and then SIGSEGV and the kernel disposes of it. FreeBSD 12.1-amd64.

No matter if I use current "latest" packages on 12.1, or if I rebuild lablgtk2 and unison232. unison232-text also crashes. I admit I haven't touched this code in years (minor edits to code in 2011 and 2013, and I no longer use it (or not 2.32 anyways). I made that port way back then because the new version had an incompatible net protocol. I don't know how to debug ML code... can't read it, don't know the tools. @madpilot would you have a look? Would you also be willing to maintain unison232? If so I'd be happy to transfer maintainership on this occasion.

In D26924#600587, @mandree wrote:

Ho-hum, generally this looks good but now my point is I can't get unison232 to function (run-time), it tries to read its ~/.unison/default.prf, closes it, then prints 15 bytes of garbage to stderr and then SIGSEGV and the kernel disposes of it. FreeBSD 12.1-amd64.

Looking at the upstream repository I found a commit talking about fixes for ocaml 4.01. I'm posting it here for the record:

https://github.com/bcpierce00/unison/commit/891c081690ae4605c9bf818ee89fbdf2416b3dd7

Could be helpful in this case.

mandree mentioned this in rP553182: Backport upstream fix for OCaml 4 to avoid SIGSEGV.Oct 24 2020, 11:20 AM

mandree mentioned this in rP553183: MFH: r553182.

@madpilot for unison232, approved. Be sure to keep the changes from https://reviews.freebsd.org/rP553182 in your tree (i. e. update) before committing your patch.

This revision is now accepted and ready to land.Oct 24 2020, 11:32 AM

Going to update patch to cater for mandree changes and maybe import some improvements from mandree commit.

Update diff to include refinements to the ports inspired by commit
from mandree:

Add a self test in post-build
remove MAKE_JOBS_UNSAFE

Also bumpe PORTREVISION on unison ports, I'm not sure they can
keep working if lablgtk is updated below them without being rebuilt.

Harbormaster completed remote builds in B34353: Diff 78689.Oct 24 2020, 3:19 PM

In D26924#600684, @madpilot wrote:

Also bumpe PORTREVISION on unison ports, I'm not sure they can
keep working if lablgtk is updated below them without being rebuilt.

For unison 2.32, not required, I checked that explicitly, but I don't mind if you still do it for consistency, so feel free to leave it as proposed.

Approved of for net/unison232.

This revision is now accepted and ready to land.Oct 24 2020, 4:45 PM

Closed by commit rP555474: - Update x11-toolkits/ocaml-lablgtk2 to 2.18.11 [1] (authored by madpilot). · Explain WhyNov 16 2020, 12:34 PM

This revision was automatically updated to reflect the committed changes.

madpilot added a commit: rP555474: - Update x11-toolkits/ocaml-lablgtk2 to 2.18.11 [1].

Revision Contents
Changeset List

Path

Size

net/

unison/

Makefile

2 lines

distinfo

6 lines

unison232/

files/

patch-uigtk2.ml

17 lines

unison240/

files/

patch-uigtk2.ml

17 lines

unison248/

files/

patch-uigtk2.ml

17 lines

x11-toolkits/

ocaml-lablgtk2/

Makefile

8 lines

distinfo

6 lines

files/

patch-fno-common

Diff 78662

View Options

net/unison/Makefile

Show All 24 Lines
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF		* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.		* SUCH DAMAGE.
*/		*/

#include <sys/cdefs.h>		#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");		__FBSDID("$FreeBSD$");

#include <sys/zfs_context.h>		#include <sys/zfs_context.h>
		#include <libzfsbootenv.h>

#include "be.h"		#include "be.h"
#include "be_impl.h"		#include "be_impl.h"

static int snapshot_proplist_update(zfs_handle_t hdl, prop_data_t data);		static int snapshot_proplist_update(zfs_handle_t hdl, prop_data_t data);

/*		/*
* Returns the name of the active boot environment		* Returns the name of the active boot environment
▲ Show 20 Lines • Show All 62 Lines • ▼ Show 20 Lines
int		int
be_get_bootenv_props(libbe_handle_t lbh, nvlist_t dsnvl)		be_get_bootenv_props(libbe_handle_t lbh, nvlist_t dsnvl)
{		{
prop_data_t data;		prop_data_t data;

data.lbh = lbh;		data.lbh = lbh;
data.list = dsnvl;		data.list = dsnvl;
data.single_object = false;		data.single_object = false;
		data.bootonce = NULL;
return (be_proplist_update(&data));		return (be_proplist_update(&data));
}		}

int		int
be_get_dataset_props(libbe_handle_t lbh, const char name, nvlist_t *props)		be_get_dataset_props(libbe_handle_t lbh, const char name, nvlist_t *props)
{		{
zfs_handle_t *snap_hdl;		zfs_handle_t *snap_hdl;
prop_data_t data;		prop_data_t data;
int ret;		int ret;

data.lbh = lbh;		data.lbh = lbh;
data.list = props;		data.list = props;
data.single_object = true;		data.single_object = true;
		data.bootonce = NULL;
if ((snap_hdl = zfs_open(lbh->lzh, name,		if ((snap_hdl = zfs_open(lbh->lzh, name,
ZFS_TYPE_FILESYSTEM \| ZFS_TYPE_SNAPSHOT)) == NULL)		ZFS_TYPE_FILESYSTEM \| ZFS_TYPE_SNAPSHOT)) == NULL)
return (BE_ERR_ZFSOPEN);		return (BE_ERR_ZFSOPEN);

ret = prop_list_builder_cb(snap_hdl, &data);		ret = prop_list_builder_cb(snap_hdl, &data);
zfs_close(snap_hdl);		zfs_close(snap_hdl);
return (ret);		return (ret);
}		}

int		int
be_get_dataset_snapshots(libbe_handle_t lbh, const char name, nvlist_t *props)		be_get_dataset_snapshots(libbe_handle_t lbh, const char name, nvlist_t *props)
{		{
zfs_handle_t *ds_hdl;		zfs_handle_t *ds_hdl;
prop_data_t data;		prop_data_t data;
int ret;		int ret;

data.lbh = lbh;		data.lbh = lbh;
data.list = props;		data.list = props;
data.single_object = false;		data.single_object = false;
		data.bootonce = NULL;
if ((ds_hdl = zfs_open(lbh->lzh, name,		if ((ds_hdl = zfs_open(lbh->lzh, name,
ZFS_TYPE_FILESYSTEM)) == NULL)		ZFS_TYPE_FILESYSTEM)) == NULL)
return (BE_ERR_ZFSOPEN);		return (BE_ERR_ZFSOPEN);

ret = snapshot_proplist_update(ds_hdl, &data);		ret = snapshot_proplist_update(ds_hdl, &data);
zfs_close(ds_hdl);		zfs_close(ds_hdl);
return (ret);		return (ret);
}		}
Show All 23 Lines	prop_list_builder_cb(zfs_handle_t zfs_hdl, void data_p)
if (data->single_object)		if (data->single_object)
props = data->list;		props = data->list;
else		else
nvlist_alloc(&props, NV_UNIQUE_NAME, KM_SLEEP);		nvlist_alloc(&props, NV_UNIQUE_NAME, KM_SLEEP);

dataset = zfs_get_name(zfs_hdl);		dataset = zfs_get_name(zfs_hdl);
nvlist_add_string(props, "dataset", dataset);		nvlist_add_string(props, "dataset", dataset);

		if (data->bootonce != NULL &&
		strcmp(dataset, data->bootonce) == 0)
		nvlist_add_boolean_value(props, "bootonce", true);

name = strrchr(dataset, '/') + 1;		name = strrchr(dataset, '/') + 1;
nvlist_add_string(props, "name", name);		nvlist_add_string(props, "name", name);

mounted = zfs_is_mounted(zfs_hdl, &mountpoint);		mounted = zfs_is_mounted(zfs_hdl, &mountpoint);

if (mounted)		if (mounted)
nvlist_add_string(props, "mounted", mountpoint);		nvlist_add_string(props, "mounted", mountpoint);

▲ Show 20 Lines • Show All 50 Lines • ▼ Show 20 Lines
int		int
be_proplist_update(prop_data_t *data)		be_proplist_update(prop_data_t *data)
{		{
zfs_handle_t *root_hdl;		zfs_handle_t *root_hdl;

if ((root_hdl = zfs_open(data->lbh->lzh, data->lbh->root,		if ((root_hdl = zfs_open(data->lbh->lzh, data->lbh->root,
ZFS_TYPE_FILESYSTEM)) == NULL)		ZFS_TYPE_FILESYSTEM)) == NULL)
return (BE_ERR_ZFSOPEN);		return (BE_ERR_ZFSOPEN);

		(void) lzbe_get_boot_device(zpool_get_name(data->lbh->active_phandle),
		&data->bootonce);

/* XXX TODO: some error checking here */		/* XXX TODO: some error checking here */
zfs_iter_filesystems(root_hdl, prop_list_builder_cb, data);		zfs_iter_filesystems(root_hdl, prop_list_builder_cb, data);

zfs_close(root_hdl);		zfs_close(root_hdl);

return (0);		return (0);
}		}
▲ Show 20 Lines • Show All 52 Lines • Show Last 20 Lines

View Options

net/unison/distinfo

Show All 24 Lines
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF		* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.		* SUCH DAMAGE.
*/		*/

#include <sys/cdefs.h>		#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");		__FBSDID("$FreeBSD$");

#include <sys/zfs_context.h>		#include <sys/zfs_context.h>
		#include <libzfsbootenv.h>

#include "be.h"		#include "be.h"
#include "be_impl.h"		#include "be_impl.h"

static int snapshot_proplist_update(zfs_handle_t hdl, prop_data_t data);		static int snapshot_proplist_update(zfs_handle_t hdl, prop_data_t data);

/*		/*
* Returns the name of the active boot environment		* Returns the name of the active boot environment
▲ Show 20 Lines • Show All 62 Lines • ▼ Show 20 Lines
int		int
be_get_bootenv_props(libbe_handle_t lbh, nvlist_t dsnvl)		be_get_bootenv_props(libbe_handle_t lbh, nvlist_t dsnvl)
{		{
prop_data_t data;		prop_data_t data;

data.lbh = lbh;		data.lbh = lbh;
data.list = dsnvl;		data.list = dsnvl;
data.single_object = false;		data.single_object = false;
		data.bootonce = NULL;
return (be_proplist_update(&data));		return (be_proplist_update(&data));
}		}

int		int
be_get_dataset_props(libbe_handle_t lbh, const char name, nvlist_t *props)		be_get_dataset_props(libbe_handle_t lbh, const char name, nvlist_t *props)
{		{
zfs_handle_t *snap_hdl;		zfs_handle_t *snap_hdl;
prop_data_t data;		prop_data_t data;
int ret;		int ret;

data.lbh = lbh;		data.lbh = lbh;
data.list = props;		data.list = props;
data.single_object = true;		data.single_object = true;
		data.bootonce = NULL;
if ((snap_hdl = zfs_open(lbh->lzh, name,		if ((snap_hdl = zfs_open(lbh->lzh, name,
ZFS_TYPE_FILESYSTEM \| ZFS_TYPE_SNAPSHOT)) == NULL)		ZFS_TYPE_FILESYSTEM \| ZFS_TYPE_SNAPSHOT)) == NULL)
return (BE_ERR_ZFSOPEN);		return (BE_ERR_ZFSOPEN);

ret = prop_list_builder_cb(snap_hdl, &data);		ret = prop_list_builder_cb(snap_hdl, &data);
zfs_close(snap_hdl);		zfs_close(snap_hdl);
return (ret);		return (ret);
}		}

int		int
be_get_dataset_snapshots(libbe_handle_t lbh, const char name, nvlist_t *props)		be_get_dataset_snapshots(libbe_handle_t lbh, const char name, nvlist_t *props)
{		{
zfs_handle_t *ds_hdl;		zfs_handle_t *ds_hdl;
prop_data_t data;		prop_data_t data;
int ret;		int ret;

data.lbh = lbh;		data.lbh = lbh;
data.list = props;		data.list = props;
data.single_object = false;		data.single_object = false;
		data.bootonce = NULL;
if ((ds_hdl = zfs_open(lbh->lzh, name,		if ((ds_hdl = zfs_open(lbh->lzh, name,
ZFS_TYPE_FILESYSTEM)) == NULL)		ZFS_TYPE_FILESYSTEM)) == NULL)
return (BE_ERR_ZFSOPEN);		return (BE_ERR_ZFSOPEN);

ret = snapshot_proplist_update(ds_hdl, &data);		ret = snapshot_proplist_update(ds_hdl, &data);
zfs_close(ds_hdl);		zfs_close(ds_hdl);
return (ret);		return (ret);
}		}
Show All 23 Lines	prop_list_builder_cb(zfs_handle_t zfs_hdl, void data_p)
if (data->single_object)		if (data->single_object)
props = data->list;		props = data->list;
else		else
nvlist_alloc(&props, NV_UNIQUE_NAME, KM_SLEEP);		nvlist_alloc(&props, NV_UNIQUE_NAME, KM_SLEEP);

dataset = zfs_get_name(zfs_hdl);		dataset = zfs_get_name(zfs_hdl);
nvlist_add_string(props, "dataset", dataset);		nvlist_add_string(props, "dataset", dataset);

		if (data->bootonce != NULL &&
		strcmp(dataset, data->bootonce) == 0)
		nvlist_add_boolean_value(props, "bootonce", true);

name = strrchr(dataset, '/') + 1;		name = strrchr(dataset, '/') + 1;
nvlist_add_string(props, "name", name);		nvlist_add_string(props, "name", name);

mounted = zfs_is_mounted(zfs_hdl, &mountpoint);		mounted = zfs_is_mounted(zfs_hdl, &mountpoint);

if (mounted)		if (mounted)
nvlist_add_string(props, "mounted", mountpoint);		nvlist_add_string(props, "mounted", mountpoint);

▲ Show 20 Lines • Show All 50 Lines • ▼ Show 20 Lines
int		int
be_proplist_update(prop_data_t *data)		be_proplist_update(prop_data_t *data)
{		{
zfs_handle_t *root_hdl;		zfs_handle_t *root_hdl;

if ((root_hdl = zfs_open(data->lbh->lzh, data->lbh->root,		if ((root_hdl = zfs_open(data->lbh->lzh, data->lbh->root,
ZFS_TYPE_FILESYSTEM)) == NULL)		ZFS_TYPE_FILESYSTEM)) == NULL)
return (BE_ERR_ZFSOPEN);		return (BE_ERR_ZFSOPEN);

		(void) lzbe_get_boot_device(zpool_get_name(data->lbh->active_phandle),
		&data->bootonce);

/* XXX TODO: some error checking here */		/* XXX TODO: some error checking here */
zfs_iter_filesystems(root_hdl, prop_list_builder_cb, data);		zfs_iter_filesystems(root_hdl, prop_list_builder_cb, data);

zfs_close(root_hdl);		zfs_close(root_hdl);

return (0);		return (0);
}		}
▲ Show 20 Lines • Show All 52 Lines • Show Last 20 Lines

View Options

net/unison232/files/patch-uigtk2.ml

Show All 24 Lines
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF		* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.		* SUCH DAMAGE.
*/		*/

#include <sys/cdefs.h>		#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");		__FBSDID("$FreeBSD$");

#include <sys/zfs_context.h>		#include <sys/zfs_context.h>
		#include <libzfsbootenv.h>

#include "be.h"		#include "be.h"
#include "be_impl.h"		#include "be_impl.h"

static int snapshot_proplist_update(zfs_handle_t hdl, prop_data_t data);		static int snapshot_proplist_update(zfs_handle_t hdl, prop_data_t data);

/*		/*
* Returns the name of the active boot environment		* Returns the name of the active boot environment
▲ Show 20 Lines • Show All 62 Lines • ▼ Show 20 Lines
int		int
be_get_bootenv_props(libbe_handle_t lbh, nvlist_t dsnvl)		be_get_bootenv_props(libbe_handle_t lbh, nvlist_t dsnvl)
{		{
prop_data_t data;		prop_data_t data;

data.lbh = lbh;		data.lbh = lbh;
data.list = dsnvl;		data.list = dsnvl;
data.single_object = false;		data.single_object = false;
		data.bootonce = NULL;
return (be_proplist_update(&data));		return (be_proplist_update(&data));
}		}

int		int
be_get_dataset_props(libbe_handle_t lbh, const char name, nvlist_t *props)		be_get_dataset_props(libbe_handle_t lbh, const char name, nvlist_t *props)
{		{
zfs_handle_t *snap_hdl;		zfs_handle_t *snap_hdl;
prop_data_t data;		prop_data_t data;
int ret;		int ret;

data.lbh = lbh;		data.lbh = lbh;
data.list = props;		data.list = props;
data.single_object = true;		data.single_object = true;
		data.bootonce = NULL;
if ((snap_hdl = zfs_open(lbh->lzh, name,		if ((snap_hdl = zfs_open(lbh->lzh, name,
ZFS_TYPE_FILESYSTEM \| ZFS_TYPE_SNAPSHOT)) == NULL)		ZFS_TYPE_FILESYSTEM \| ZFS_TYPE_SNAPSHOT)) == NULL)
return (BE_ERR_ZFSOPEN);		return (BE_ERR_ZFSOPEN);

ret = prop_list_builder_cb(snap_hdl, &data);		ret = prop_list_builder_cb(snap_hdl, &data);
zfs_close(snap_hdl);		zfs_close(snap_hdl);
return (ret);		return (ret);
}		}

int		int
be_get_dataset_snapshots(libbe_handle_t lbh, const char name, nvlist_t *props)		be_get_dataset_snapshots(libbe_handle_t lbh, const char name, nvlist_t *props)
{		{
zfs_handle_t *ds_hdl;		zfs_handle_t *ds_hdl;
prop_data_t data;		prop_data_t data;
int ret;		int ret;

data.lbh = lbh;		data.lbh = lbh;
data.list = props;		data.list = props;
data.single_object = false;		data.single_object = false;
		data.bootonce = NULL;
if ((ds_hdl = zfs_open(lbh->lzh, name,		if ((ds_hdl = zfs_open(lbh->lzh, name,
ZFS_TYPE_FILESYSTEM)) == NULL)		ZFS_TYPE_FILESYSTEM)) == NULL)
return (BE_ERR_ZFSOPEN);		return (BE_ERR_ZFSOPEN);

ret = snapshot_proplist_update(ds_hdl, &data);		ret = snapshot_proplist_update(ds_hdl, &data);
zfs_close(ds_hdl);		zfs_close(ds_hdl);
return (ret);		return (ret);
}		}
Show All 23 Lines	prop_list_builder_cb(zfs_handle_t zfs_hdl, void data_p)
if (data->single_object)		if (data->single_object)
props = data->list;		props = data->list;
else		else
nvlist_alloc(&props, NV_UNIQUE_NAME, KM_SLEEP);		nvlist_alloc(&props, NV_UNIQUE_NAME, KM_SLEEP);

dataset = zfs_get_name(zfs_hdl);		dataset = zfs_get_name(zfs_hdl);
nvlist_add_string(props, "dataset", dataset);		nvlist_add_string(props, "dataset", dataset);

		if (data->bootonce != NULL &&
		strcmp(dataset, data->bootonce) == 0)
		nvlist_add_boolean_value(props, "bootonce", true);

name = strrchr(dataset, '/') + 1;		name = strrchr(dataset, '/') + 1;
nvlist_add_string(props, "name", name);		nvlist_add_string(props, "name", name);

mounted = zfs_is_mounted(zfs_hdl, &mountpoint);		mounted = zfs_is_mounted(zfs_hdl, &mountpoint);

if (mounted)		if (mounted)
nvlist_add_string(props, "mounted", mountpoint);		nvlist_add_string(props, "mounted", mountpoint);

▲ Show 20 Lines • Show All 50 Lines • ▼ Show 20 Lines
int		int
be_proplist_update(prop_data_t *data)		be_proplist_update(prop_data_t *data)
{		{
zfs_handle_t *root_hdl;		zfs_handle_t *root_hdl;

if ((root_hdl = zfs_open(data->lbh->lzh, data->lbh->root,		if ((root_hdl = zfs_open(data->lbh->lzh, data->lbh->root,
ZFS_TYPE_FILESYSTEM)) == NULL)		ZFS_TYPE_FILESYSTEM)) == NULL)
return (BE_ERR_ZFSOPEN);		return (BE_ERR_ZFSOPEN);

		(void) lzbe_get_boot_device(zpool_get_name(data->lbh->active_phandle),
		&data->bootonce);

/* XXX TODO: some error checking here */		/* XXX TODO: some error checking here */
zfs_iter_filesystems(root_hdl, prop_list_builder_cb, data);		zfs_iter_filesystems(root_hdl, prop_list_builder_cb, data);

zfs_close(root_hdl);		zfs_close(root_hdl);

return (0);		return (0);
}		}
▲ Show 20 Lines • Show All 52 Lines • Show Last 20 Lines

View Options

net/unison240/files/patch-uigtk2.ml

Show All 24 Lines
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF		* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.		* SUCH DAMAGE.
*/		*/

#include <sys/cdefs.h>		#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");		__FBSDID("$FreeBSD$");

#include <sys/zfs_context.h>		#include <sys/zfs_context.h>
		#include <libzfsbootenv.h>

#include "be.h"		#include "be.h"
#include "be_impl.h"		#include "be_impl.h"

static int snapshot_proplist_update(zfs_handle_t hdl, prop_data_t data);		static int snapshot_proplist_update(zfs_handle_t hdl, prop_data_t data);

/*		/*
* Returns the name of the active boot environment		* Returns the name of the active boot environment
▲ Show 20 Lines • Show All 62 Lines • ▼ Show 20 Lines
int		int
be_get_bootenv_props(libbe_handle_t lbh, nvlist_t dsnvl)		be_get_bootenv_props(libbe_handle_t lbh, nvlist_t dsnvl)
{		{
prop_data_t data;		prop_data_t data;

data.lbh = lbh;		data.lbh = lbh;
data.list = dsnvl;		data.list = dsnvl;
data.single_object = false;		data.single_object = false;
		data.bootonce = NULL;
return (be_proplist_update(&data));		return (be_proplist_update(&data));
}		}

int		int
be_get_dataset_props(libbe_handle_t lbh, const char name, nvlist_t *props)		be_get_dataset_props(libbe_handle_t lbh, const char name, nvlist_t *props)
{		{
zfs_handle_t *snap_hdl;		zfs_handle_t *snap_hdl;
prop_data_t data;		prop_data_t data;
int ret;		int ret;

data.lbh = lbh;		data.lbh = lbh;
data.list = props;		data.list = props;
data.single_object = true;		data.single_object = true;
		data.bootonce = NULL;
if ((snap_hdl = zfs_open(lbh->lzh, name,		if ((snap_hdl = zfs_open(lbh->lzh, name,
ZFS_TYPE_FILESYSTEM \| ZFS_TYPE_SNAPSHOT)) == NULL)		ZFS_TYPE_FILESYSTEM \| ZFS_TYPE_SNAPSHOT)) == NULL)
return (BE_ERR_ZFSOPEN);		return (BE_ERR_ZFSOPEN);

ret = prop_list_builder_cb(snap_hdl, &data);		ret = prop_list_builder_cb(snap_hdl, &data);
zfs_close(snap_hdl);		zfs_close(snap_hdl);
return (ret);		return (ret);
}		}

int		int
be_get_dataset_snapshots(libbe_handle_t lbh, const char name, nvlist_t *props)		be_get_dataset_snapshots(libbe_handle_t lbh, const char name, nvlist_t *props)
{		{
zfs_handle_t *ds_hdl;		zfs_handle_t *ds_hdl;
prop_data_t data;		prop_data_t data;
int ret;		int ret;

data.lbh = lbh;		data.lbh = lbh;
data.list = props;		data.list = props;
data.single_object = false;		data.single_object = false;
		data.bootonce = NULL;
if ((ds_hdl = zfs_open(lbh->lzh, name,		if ((ds_hdl = zfs_open(lbh->lzh, name,
ZFS_TYPE_FILESYSTEM)) == NULL)		ZFS_TYPE_FILESYSTEM)) == NULL)
return (BE_ERR_ZFSOPEN);		return (BE_ERR_ZFSOPEN);

ret = snapshot_proplist_update(ds_hdl, &data);		ret = snapshot_proplist_update(ds_hdl, &data);
zfs_close(ds_hdl);		zfs_close(ds_hdl);
return (ret);		return (ret);
}		}
Show All 23 Lines	prop_list_builder_cb(zfs_handle_t zfs_hdl, void data_p)
if (data->single_object)		if (data->single_object)
props = data->list;		props = data->list;
else		else
nvlist_alloc(&props, NV_UNIQUE_NAME, KM_SLEEP);		nvlist_alloc(&props, NV_UNIQUE_NAME, KM_SLEEP);

dataset = zfs_get_name(zfs_hdl);		dataset = zfs_get_name(zfs_hdl);
nvlist_add_string(props, "dataset", dataset);		nvlist_add_string(props, "dataset", dataset);

		if (data->bootonce != NULL &&
		strcmp(dataset, data->bootonce) == 0)
		nvlist_add_boolean_value(props, "bootonce", true);

name = strrchr(dataset, '/') + 1;		name = strrchr(dataset, '/') + 1;
nvlist_add_string(props, "name", name);		nvlist_add_string(props, "name", name);

mounted = zfs_is_mounted(zfs_hdl, &mountpoint);		mounted = zfs_is_mounted(zfs_hdl, &mountpoint);

if (mounted)		if (mounted)
nvlist_add_string(props, "mounted", mountpoint);		nvlist_add_string(props, "mounted", mountpoint);

▲ Show 20 Lines • Show All 50 Lines • ▼ Show 20 Lines
int		int
be_proplist_update(prop_data_t *data)		be_proplist_update(prop_data_t *data)
{		{
zfs_handle_t *root_hdl;		zfs_handle_t *root_hdl;

if ((root_hdl = zfs_open(data->lbh->lzh, data->lbh->root,		if ((root_hdl = zfs_open(data->lbh->lzh, data->lbh->root,
ZFS_TYPE_FILESYSTEM)) == NULL)		ZFS_TYPE_FILESYSTEM)) == NULL)
return (BE_ERR_ZFSOPEN);		return (BE_ERR_ZFSOPEN);

		(void) lzbe_get_boot_device(zpool_get_name(data->lbh->active_phandle),
		&data->bootonce);

/* XXX TODO: some error checking here */		/* XXX TODO: some error checking here */
zfs_iter_filesystems(root_hdl, prop_list_builder_cb, data);		zfs_iter_filesystems(root_hdl, prop_list_builder_cb, data);

zfs_close(root_hdl);		zfs_close(root_hdl);

return (0);		return (0);
}		}
▲ Show 20 Lines • Show All 52 Lines • Show Last 20 Lines