Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove read-write code because it's dangerous. 

there's no point to try this hard anyway.
This commit is contained in:
yamt 2009-04-28 02:47:12 +00:00
parent 167587fd07
commit a26c5cc0c2
1 changed files with 4 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
usr.bin/touch/touch.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: touch.c,v 1.27 2008/07/21 14:19:27 lukem Exp $ */
/* $NetBSD: touch.c,v 1.28 2009/04/28 02:47:12 yamt Exp $ */
/*
* Copyright (c) 1993
@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1993\
#if 0
static char sccsid[] = "@(#)touch.c 8.2 (Berkeley) 4/28/95";
#endif
__RCSID("$NetBSD: touch.c,v 1.27 2008/07/21 14:19:27 lukem Exp $");
__RCSID("$NetBSD: touch.c,v 1.28 2009/04/28 02:47:12 yamt Exp $");
#endif /* not lint */
#include <sys/types.h>
@ -190,9 +190,8 @@ main(argc, argv)
if (!(*change_file_times)(*argv, NULL))
continue;
/* Try reading/writing. */
if (!S_ISLNK(sb.st_mode) && rw(*argv, &sb, fflag))
rval = 1;
rval = 1;
warn("%s", *argv);
}
exit(rval);
}
@ -314,58 +313,6 @@ stime_file(fname, tvp)
TIMESPEC_TO_TIMEVAL(&tvp[1], &sb.st_mtimespec);
}
int
rw(fname, sbp, force)
char *fname;
struct stat *sbp;
int force;
{
int fd, needed_chmod, rval;
u_char byte;
/* Try regular files and directories. */
if (!S_ISREG(sbp->st_mode) && !S_ISDIR(sbp->st_mode)) {
warnx("%s: %s", fname, strerror(EFTYPE));
return (1);
}
needed_chmod = rval = 0;
if ((fd = open(fname, O_RDWR, 0)) == -1) {
if (!force || chmod(fname, DEFFILEMODE))
goto err;
if ((fd = open(fname, O_RDWR, 0)) == -1)
goto err;
needed_chmod = 1;
}
if (sbp->st_size != 0) {
if (read(fd, &byte, sizeof(byte)) != sizeof(byte))
goto err;
if (lseek(fd, (off_t)0, SEEK_SET) == -1)
goto err;
if (write(fd, &byte, sizeof(byte)) != sizeof(byte))
goto err;
} else {
if (write(fd, &byte, sizeof(byte)) != sizeof(byte)) {
err: rval = 1;
warn("%s", fname);
} else if (ftruncate(fd, (off_t)0)) {
rval = 1;
warn("%s: file modified", fname);
}
}
if (fd >= 0 && close(fd) && rval != 1) {
rval = 1;
warn("%s", fname);
}
if (needed_chmod && chmod(fname, sbp->st_mode) && rval != 1) {
rval = 1;
warn("%s: permissions modified", fname);
}
return (rval);
}
__dead void
usage()
{