Browse Source

trivial: O_EXCL makes O_TRUNC redundant

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
Alex Riesen 19 years ago committed by Junio C Hamano
parent
commit
781411ed46
  1. 2
      apply.c
  2. 2
      entry.c

2
apply.c

@ -1588,7 +1588,7 @@ static int try_create_file(const char *path, unsigned int mode, const char *buf, @@ -1588,7 +1588,7 @@ static int try_create_file(const char *path, unsigned int mode, const char *buf,

if (S_ISLNK(mode))
return symlink(buf, path);
fd = open(path, O_CREAT | O_EXCL | O_WRONLY | O_TRUNC, (mode & 0100) ? 0777 : 0666);
fd = open(path, O_CREAT | O_EXCL | O_WRONLY, (mode & 0100) ? 0777 : 0666);
if (fd < 0)
return -1;
while (size) {

2
entry.c

@ -60,7 +60,7 @@ static void remove_subtree(const char *path) @@ -60,7 +60,7 @@ static void remove_subtree(const char *path)
static int create_file(const char *path, unsigned int mode)
{
mode = (mode & 0100) ? 0777 : 0666;
return open(path, O_WRONLY | O_TRUNC | O_CREAT | O_EXCL, mode);
return open(path, O_WRONLY | O_CREAT | O_EXCL, mode);
}

static int write_entry(struct cache_entry *ce, const char *path, struct checkout *state)

Loading…
Cancel
Save