PublicArchive/gnu-coreutils
2
0
Fork 0
mirror of git://git.sv.gnu.org/coreutils synced 2026-06-04 06:45:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

(touch): Simplify code a tad, using fd == -1 instead

Browse Source 
of separate valid_fd variable.
This commit is contained in:
Jim Meyering
1999-11-14 20:44:56 +00:00
parent a3fc960f32
commit 2f50c6930d
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/touch.c
+4 -10
View File
@@ -110,16 +110,10 @@ touch (const char *file)
{
int status;
struct stat sbuf;
int fd IF_LINT (= 99);
int valid_fd;
int fd = -1;
if (no_create)
if (! no_create)
{
valid_fd = 0;
}
else
{
valid_fd = 1;
/* Try to open FILE, creating it if necessary. */
fd = open (file, O_WRONLY | O_CREAT,
S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
@@ -131,7 +125,7 @@ touch (const char *file)
the other one. If we have the file descriptor already, use fstat.
Otherwise, either we're in no-create mode (and hence didn't call open)
or FILE is inaccessible or a directory, so we have to use stat. */
if ((valid_fd && fd != -1) ? fstat (fd, &sbuf) : stat (file, &sbuf))
if (fd != -1 ? fstat (fd, &sbuf) : stat (file, &sbuf))
{
error (0, errno, "%s", file);
close (fd);
@@ -139,7 +133,7 @@ touch (const char *file)
}
}
if (valid_fd && fd != -1 && close (fd) < 0)
if (fd != -1 && close (fd) < 0)
{
error (0, errno, "%s", file);
return 1;