TapTap
84827ca617
#291: - Compile --exclude/--include/--exclude-from/--include-from into the SAME ordered rule list as --filter/-f (first match wins), so the common `--include='*.txt' --exclude='*'` idiom and include-alone semantics match rsync. The legacy per-kind scanner arrays are no longer applied. - -x/--one-file-system emits the cross-device mount-point directory entry (empty) instead of dropping it, in both the sequential and parallel scanners. - Stop passing the legacy arrays to the scanner; document -f is --filter. #292: - New src/shared/format.c/.h: rsync "big_num" (comma-grouped integers) and decimal -h human sizes, %M/%t timestamp, and the STATUS_DEST_INFO codec. - Receiver answers each STATUS_CHECK with a pre-transfer destination snapshot (new report_dest_info wire field + STATUS_DEST_INFO, PROTOCOL_VERSION 2.23.0) so the sender can render true itemize columns. - Itemize now emits rsync-correct update/type chars and c/s/t/p/o/g columns for files, dirs, symlinks and hard links, comparing size/time/perms/owner/ group against the reported destination. - --out-format gains %i %n %f %l %b %M %t %o %p %B %U %G %L; %f is the relative display path, %M the YYYY/MM/DD-HH:MM:SS form, %b the literal bytes sent. - --list-only prints transfer-relative names, directory entries and ls-style grouped sizes. - --stats prints rsync's multi-line block on stdout; -h uses decimal units. Tests: unit tests for the filter ordering, format primitives, itemize columns; integration + differential tests against real rsync 3.4.1 for itemize/out-format/list-only/selection and -x. Golden wire len/hash and protocol version strings updated for 2.23.0.
95 lines
2.9 KiB
C
95 lines
2.9 KiB
C
#include "test_format.h"
|
|
#include "format.h"
|
|
#include "test_utils.h"
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <sys/socket.h>
|
|
#include <time.h>
|
|
#include <unistd.h>
|
|
|
|
static void expect_big_num(unsigned long long value, bool human, const char* expected) {
|
|
char buffer[64];
|
|
EXPECT_TRUE(format_big_num(value, human, buffer, sizeof(buffer)));
|
|
EXPECT_EQ_STR(buffer, expected);
|
|
}
|
|
|
|
static void test_human_size_decimal() {
|
|
/* Values below 1000 print verbatim; larger values use the largest unit that
|
|
* keeps the value below 1000 and exactly two decimals (rsync human_num). */
|
|
expect_big_num(0, true, "0");
|
|
expect_big_num(999, true, "999");
|
|
expect_big_num(1000, true, "1.00K");
|
|
expect_big_num(1500, true, "1.50K");
|
|
expect_big_num(9999, true, "10.00K");
|
|
expect_big_num(999999, true, "1000.00K");
|
|
expect_big_num(1000000, true, "1.00M");
|
|
expect_big_num(1500000, true, "1.50M");
|
|
}
|
|
|
|
static void test_big_num_grouping() {
|
|
/* Non-human numbers are comma-grouped every three digits (rsync big_num). */
|
|
expect_big_num(0, false, "0");
|
|
expect_big_num(1, false, "1");
|
|
expect_big_num(999, false, "999");
|
|
expect_big_num(1000, false, "1,000");
|
|
expect_big_num(4096, false, "4,096");
|
|
expect_big_num(1234567, false, "1,234,567");
|
|
expect_big_num(1000000000ULL, false, "1,000,000,000");
|
|
}
|
|
|
|
static void test_datetime_format() {
|
|
char buffer[32];
|
|
time_t when = 1700000000;
|
|
EXPECT_TRUE(format_rsync_datetime(when, true, buffer, sizeof(buffer)));
|
|
/* %M shape: YYYY/MM/DD-HH:MM:SS */
|
|
EXPECT_EQ_INT(strlen(buffer), 19);
|
|
EXPECT_EQ_INT(buffer[4], '/');
|
|
EXPECT_EQ_INT(buffer[7], '/');
|
|
EXPECT_EQ_INT(buffer[10], '-');
|
|
EXPECT_EQ_INT(buffer[13], ':');
|
|
EXPECT_EQ_INT(buffer[16], ':');
|
|
|
|
char space_form[32];
|
|
EXPECT_TRUE(format_rsync_datetime(when, false, space_form, sizeof(space_form)));
|
|
EXPECT_EQ_INT(space_form[10], ' ');
|
|
}
|
|
|
|
static void test_dest_state_roundtrip() {
|
|
/* The wire codec is exercised over a socketpair so the real send/receive
|
|
* primitives run. */
|
|
int fds[2];
|
|
if (socketpair(AF_UNIX, SOCK_STREAM, 0, fds) != 0)
|
|
return;
|
|
OutputDestState out;
|
|
memset(&out, 0, sizeof(out));
|
|
out.known = true;
|
|
out.existed = true;
|
|
out.size = 123456789ULL;
|
|
out.mtime_sec = 1700000000;
|
|
out.mtime_nsec = 123456789;
|
|
out.mode = 0100644;
|
|
out.uid = 1000;
|
|
out.gid = 1000;
|
|
OutputDestState in;
|
|
memset(&in, 0, sizeof(in));
|
|
EXPECT_TRUE(format_dest_state_send(fds[0], &out));
|
|
EXPECT_TRUE(format_dest_state_receive(fds[1], &in));
|
|
EXPECT_TRUE(in.known);
|
|
EXPECT_TRUE(in.existed);
|
|
EXPECT_TRUE(in.size == out.size);
|
|
EXPECT_TRUE(in.mtime_sec == out.mtime_sec);
|
|
EXPECT_TRUE(in.mtime_nsec == out.mtime_nsec);
|
|
EXPECT_TRUE(in.mode == out.mode);
|
|
EXPECT_TRUE(in.uid == out.uid);
|
|
EXPECT_TRUE(in.gid == out.gid);
|
|
close(fds[0]);
|
|
close(fds[1]);
|
|
}
|
|
|
|
void test_format(void) {
|
|
test_human_size_decimal();
|
|
test_big_num_grouping();
|
|
test_datetime_format();
|
|
test_dest_state_roundtrip();
|
|
}
|