1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-03 06:04:53 +00:00

sysutils/parkverbot: update the port to version 1.4

Reported by:	portscout
This commit is contained in:
Alexey Dokuchaev 2021-10-20 06:21:48 +00:00
parent 59a11060dd
commit b8fadbfc1c
3 changed files with 13 additions and 33 deletions

View File

@ -1,7 +1,7 @@
# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
PORTNAME= parkverbot
PORTVERSION= 1.3
PORTVERSION= 1.4
CATEGORIES= sysutils
MASTER_SITES= https://inai.de/files/parkverbot/

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1599224321
SHA256 (parkverbot-1.3.tar.xz) = 721b4e8c87b3751db4d7adf33f24e4b4af88491626e20b5f5e2f42addd45d848
SIZE (parkverbot-1.3.tar.xz) = 74356
TIMESTAMP = 1634490016
SHA256 (parkverbot-1.4.tar.xz) = f8a1c2bbcf5821e677e50e59ad8cf281c6750f9410fd87939c7235f045b3afea
SIZE (parkverbot-1.4.tar.xz) = 75460

View File

@ -1,4 +1,4 @@
--- src/parkverbot.c.orig 2013-01-28 15:01:56 UTC
--- src/parkverbot.c.orig 2021-10-17 16:58:59 UTC
+++ src/parkverbot.c
@@ -18,6 +18,7 @@
#include <string.h>
@ -8,35 +8,15 @@
#include <sys/mount.h>
#include <libHX/init.h>
#include <libHX/list.h>
@@ -34,7 +35,8 @@
struct pv_bdev_entry {
@@ -36,6 +37,7 @@ struct pv_bdev_entry {
struct HXlist_head anchor;
const char *path;
- loff_t size, prev_pos;
+ off_t size, prev_pos;
off_t size, prev_pos;
+ unsigned sector_size;
int fd;
};
@@ -43,7 +45,7 @@ static struct timespec pv_req_interval = {4, 0};
static unsigned long long pv_disk_window = 16384;
static unsigned long long pv_buffer_size = 64;
-static const char *pv_readable_size(char *buf, size_t bufsize, loff_t size)
+static const char *pv_readable_size(char *buf, size_t bufsize, off_t size)
{
static const char unit_names[][2] =
{"", "K", "M", "G", "T", "P", "E", "Y", "Z"};
@@ -73,7 +75,7 @@ static bool pv_in_window(size_t prev_pos, size_t new_p
static int pv_mainloop(void)
{
struct pv_bdev_entry *e;
- loff_t new_pos;
+ off_t new_pos;
ssize_t read_ret;
char *buffer;
@@ -86,6 +88,12 @@ static int pv_mainloop(void)
@@ -72,6 +74,12 @@ static int pv_mainloop(void)
while (true) {
HXlist_for_each_entry(e, &pv_bdev_list, anchor) {
new_pos = HX_drand(0, e->size);
@ -49,7 +29,7 @@
if (pv_in_window(e->prev_pos, new_pos, e)) {
printf("%s: %llu (in guard window)\n", e->path,
static_cast(unsigned long long, new_pos));
@@ -118,6 +126,7 @@ static bool pv_open_device(const char *path)
@@ -104,6 +112,7 @@ static bool pv_open_device(const char *path)
struct pv_bdev_entry *e;
char buf[32];
uint64_t size;
@ -57,7 +37,7 @@
int fd;
fd = open(path, O_RDONLY | O_BINARY);
@@ -125,10 +134,14 @@ static bool pv_open_device(const char *path)
@@ -111,10 +120,14 @@ static bool pv_open_device(const char *path)
fprintf(stderr, "%s: %s\n", path, strerror(errno));
return false;
}
@ -74,16 +54,16 @@
e = malloc(sizeof(*e));
if (e == NULL) {
fprintf(stderr, "%s: %s\n", __func__, strerror(errno));
@@ -138,9 +151,10 @@ static bool pv_open_device(const char *path)
@@ -124,9 +137,10 @@ static bool pv_open_device(const char *path)
HXlist_init(&e->anchor);
e->path = path;
e->size = size;
+ e->sector_size = sector_size;
e->fd = fd;
- printf("Added %s (size %s)\n", e->path,
- pv_readable_size(buf, sizeof(buf), e->size));
- HX_unit_size(buf, sizeof(buf), e->size, 1024, 0));
+ printf("Added %s (size %s, sector size %d bytes)\n", e->path,
+ pv_readable_size(buf, sizeof(buf), e->size), sector_size);
+ HX_unit_size(buf, sizeof(buf), e->size, 1024, 0), sector_size);
HXlist_add_tail(&pv_bdev_list, &e->anchor);
return true;
}