Skip to content

Commit 64cb4c3

Browse files
committed
Merge branch 'mt/rot13-in-c'
Test portability improvements. * mt/rot13-in-c: tests: use the new C rot13-filter helper to avoid PERL prereq t0021: implementation the rot13-filter.pl script in C t0021: avoid grepping for a Perl-specific string at filter output
2 parents c068a3b + 4d1d843 commit 64cb4c3

File tree

10 files changed

+434
-296
lines changed

10 files changed

+434
-296
lines changed

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -772,6 +772,7 @@ TEST_BUILTINS_OBJS += test-read-midx.o
772772
TEST_BUILTINS_OBJS += test-ref-store.o
773773
TEST_BUILTINS_OBJS += test-reftable.o
774774
TEST_BUILTINS_OBJS += test-regex.o
775+
TEST_BUILTINS_OBJS += test-rot13-filter.o
775776
TEST_BUILTINS_OBJS += test-repository.o
776777
TEST_BUILTINS_OBJS += test-revision-walking.o
777778
TEST_BUILTINS_OBJS += test-run-command.o

pkt-line.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,8 @@ int write_packetized_from_fd_no_flush(int fd_in, int fd_out)
309309
return err;
310310
}
311311

312-
int write_packetized_from_buf_no_flush(const char *src_in, size_t len, int fd_out)
312+
int write_packetized_from_buf_no_flush_count(const char *src_in, size_t len,
313+
int fd_out, int *packet_counter)
313314
{
314315
int err = 0;
315316
size_t bytes_written = 0;
@@ -324,6 +325,8 @@ int write_packetized_from_buf_no_flush(const char *src_in, size_t len, int fd_ou
324325
break;
325326
err = packet_write_gently(fd_out, src_in + bytes_written, bytes_to_write);
326327
bytes_written += bytes_to_write;
328+
if (packet_counter)
329+
(*packet_counter)++;
327330
}
328331
return err;
329332
}

pkt-line.h

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,13 @@ void packet_buf_write(struct strbuf *buf, const char *fmt, ...) __attribute__((f
3232
int packet_flush_gently(int fd);
3333
int packet_write_fmt_gently(int fd, const char *fmt, ...) __attribute__((format (printf, 2, 3)));
3434
int write_packetized_from_fd_no_flush(int fd_in, int fd_out);
35-
int write_packetized_from_buf_no_flush(const char *src_in, size_t len, int fd_out);
35+
int write_packetized_from_buf_no_flush_count(const char *src_in, size_t len,
36+
int fd_out, int *packet_counter);
37+
static inline int write_packetized_from_buf_no_flush(const char *src_in,
38+
size_t len, int fd_out)
39+
{
40+
return write_packetized_from_buf_no_flush_count(src_in, len, fd_out, NULL);
41+
}
3642

3743
/*
3844
* Stdio versions of packet_write functions. When mixing these with fd

0 commit comments

Comments
 (0)