From 687892afd9100450fcc19c706d2c49807b83a90d Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Apr 27 2005 22:05:13 +0000 Subject: - don't try to hardlink 0 byte files (#154404) --- diff --git a/hardlink.c b/hardlink.c index 52cb41f..7a6cf6f 100644 --- a/hardlink.c +++ b/hardlink.c @@ -175,7 +175,7 @@ void rf (char *name) fprintf(stderr, "\r%*s\r", (int)strlen(name)+2, ""); return; } - if (fp) { + if (fp && st.st_size > 0) { p = mmap (NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0); nmmap++; if (p == (void *)-1) { @@ -191,7 +191,7 @@ void rf (char *name) st2.st_dev == st.st_dev) { int fd2 = open (fp2->name, O_RDONLY); if (fd2 < 0) continue; - if (fstat (fd2, &st2) || !S_ISREG (st2.st_mode)) { + if (fstat (fd2, &st2) || !S_ISREG (st2.st_mode) || st2.st_size == 0) { close (fd2); continue; } diff --git a/hardlink.spec b/hardlink.spec index 08c3015..83b70fc 100644 --- a/hardlink.spec +++ b/hardlink.spec @@ -32,6 +32,9 @@ chmod -R a-s %{buildroot} /usr/sbin/hardlink %changelog +* Wed Apr 27 2005 Jeremy Katz +- don't try to hardlink 0 byte files (#154404) + * Fri Apr 15 2005 Florian La Roche - remove empty scripts