diff options
| author | ed <ed@FreeBSD.org> | 2010-03-28 13:16:08 +0000 |
|---|---|---|
| committer | ed <ed@FreeBSD.org> | 2010-03-28 13:16:08 +0000 |
| commit | 543b5e901b744468356547ee61975d9d44fa8f32 (patch) | |
| tree | 5c6d55680c37f3cbfd9460fbab60d39b1ecb8ae7 /usr.bin/touch | |
| parent | 4f08ecd7ed8b39a0e0cd094967835fa85d105793 (diff) | |
| download | FreeBSD-src-543b5e901b744468356547ee61975d9d44fa8f32.zip FreeBSD-src-543b5e901b744468356547ee61975d9d44fa8f32.tar.gz | |
Change all our own code to use st_*tim instead of st_*timespec.
Also remove some local patches to diff(1) which are now unneeded.
Diffstat (limited to 'usr.bin/touch')
| -rw-r--r-- | usr.bin/touch/touch.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/touch/touch.c b/usr.bin/touch/touch.c index 5ceb175..2148939 100644 --- a/usr.bin/touch/touch.c +++ b/usr.bin/touch/touch.c @@ -187,9 +187,9 @@ main(int argc, char *argv[]) } if (!aflag) - TIMESPEC_TO_TIMEVAL(&tv[0], &sb.st_atimespec); + TIMESPEC_TO_TIMEVAL(&tv[0], &sb.st_atim); if (!mflag) - TIMESPEC_TO_TIMEVAL(&tv[1], &sb.st_mtimespec); + TIMESPEC_TO_TIMEVAL(&tv[1], &sb.st_mtim); /* * We're adjusting the times based on the file times, not a @@ -197,11 +197,11 @@ main(int argc, char *argv[]) */ if (Aflag) { if (aflag) { - TIMESPEC_TO_TIMEVAL(&tv[0], &sb.st_atimespec); + TIMESPEC_TO_TIMEVAL(&tv[0], &sb.st_atim); tv[0].tv_sec += Aflag; } if (mflag) { - TIMESPEC_TO_TIMEVAL(&tv[1], &sb.st_mtimespec); + TIMESPEC_TO_TIMEVAL(&tv[1], &sb.st_mtim); tv[1].tv_sec += Aflag; } } @@ -368,8 +368,8 @@ stime_file(char *fname, struct timeval *tvp) if (stat(fname, &sb)) err(1, "%s", fname); - TIMESPEC_TO_TIMEVAL(tvp, &sb.st_atimespec); - TIMESPEC_TO_TIMEVAL(tvp + 1, &sb.st_mtimespec); + TIMESPEC_TO_TIMEVAL(tvp, &sb.st_atim); + TIMESPEC_TO_TIMEVAL(tvp + 1, &sb.st_mtim); } int |
