Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
at fix-function-merge 90 lines 2.2 kB view raw
1--- copy/copy.c 2+++ copy/copy.c 3@@ -46,7 +46,6 @@ static const char sccsid[] USED = "@(#)copy.sl 1.15 (gritter) 5/29/05"; 4 #include <libgen.h> 5 #include <limits.h> 6 #include <dirent.h> 7-#include <utime.h> 8 #include <stdarg.h> 9 #include "sfile.h" 10 #include "memalign.h" 11@@ -441,12 +440,6 @@ attribs(const char *dst, const struct stat *sp) 12 if (oflag && ((sp->st_mode&S_IFMT) == S_IFLNK ? 13 lchown:chown)(dst, sp->st_uid, sp->st_gid) < 0) 14 complain("Unable to chown %s", dst); 15- if (mflag && (sp->st_mode&S_IFMT) != S_IFLNK) { 16- struct utimbuf ut; 17- ut.actime = sp->st_atime; 18- ut.modtime = sp->st_mtime; 19- utime(dst, &ut); 20- } 21 } 22 23 static void 24--- cp/cp.c 25+++ cp/cp.c 26@@ -56,7 +56,6 @@ static const char sccsid[] USED = "@(#)cp.sl 1.84 (gritter) 3/4/06"; 27 #include <libgen.h> 28 #include <limits.h> 29 #include <dirent.h> 30-#include <utime.h> 31 #include "sfile.h" 32 #include "memalign.h" 33 #include "alloca.h" 34@@ -354,18 +353,6 @@ permissions(const char *path, const struct stat *ssp) 35 36 mode = ssp->st_mode & 07777; 37 if (pflag) { 38- struct utimbuf ut; 39- ut.actime = ssp->st_atime; 40- ut.modtime = ssp->st_mtime; 41- if (utime(path, &ut) < 0) { 42-#if defined (SUS) || defined (S42) 43- fprintf(stderr, "%s: cannot set times for %s\n%s: %s\n", 44- progname, path, 45- progname, strerror(errno)); 46-#endif /* SUS || S42 */ 47- if (pers != PERS_MV) 48- errcnt |= 010; 49- } 50 if (myuid == 0) { 51 if (chown(path, ssp->st_uid, ssp->st_gid) < 0) { 52 #if defined (SUS) || defined (S42) 53--- touch/touch.c 54+++ touch/touch.c 55@@ -47,7 +47,6 @@ static const char sccsid[] USED = "@(#)touch.sl 1.21 (gritter) 5/29/05"; 56 #include <stdlib.h> 57 #include <errno.h> 58 #include <libgen.h> 59-#include <utime.h> 60 #include <ctype.h> 61 #include <time.h> 62 63@@ -80,7 +79,6 @@ static void 64 touch(const char *fn) 65 { 66 struct stat st; 67- struct utimbuf ut; 68 69 if (stat(fn, &st) < 0) { 70 if (errno == ENOENT) { 71@@ -113,19 +111,6 @@ touch(const char *fn) 72 return; 73 } 74 } 75- if (aflag) 76- ut.actime = nacc; 77- else 78- ut.actime = st.st_atime; 79- if (mflag) 80- ut.modtime = nmod; 81- else 82- ut.modtime = st.st_mtime; 83- if (utime(fn, nulltime ? NULL : &ut) < 0) { 84- fprintf(stderr, "%s: cannot change times on %s\n", 85- progname, fn); 86- errcnt++; 87- } 88 } 89 90 static void