From ffba380a466e010e475462bdfacf0a7045f9e00b Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Sat, 10 Nov 2012 14:34:01 -0600 Subject: Fix reversed test: patch creates a file if /dev/null or dated the epoch _and_ first hunk being replaced is 0 lines at start of file, not one or the other. --- toys/posix/patch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toys/posix/patch.c b/toys/posix/patch.c index fae908db..5af07a14 100644 --- a/toys/posix/patch.c +++ b/toys/posix/patch.c @@ -387,7 +387,7 @@ void patch_main(void) // If we've got a file to open, do so. } else if (!(toys.optflags & FLAG_p) || i <= TT.prefix) { // If the old file was null, we're creating a new one. - if (!strcmp(oldname, "/dev/null") || !oldsum) { + if (!strcmp(oldname, "/dev/null") && !oldsum) { printf("creating %s\n", name); s = strrchr(name, '/'); if (s) { -- cgit v1.2.3