mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ar/unlink-err' into maint

Browse Source 
* ar/unlink-err:
  print unlink(2) errno in copy_or_link_directory
  replace direct calls to unlink(2) with unlink_or_warn
  Introduce an unlink(2) wrapper which gives warning if unlink failed
This commit is contained in:
Junio C Hamano
2009-05-25 19:01:50 -07:00
parent 43f8f560c0 f6a5f1bb50
commit 2c5942dbae
26 changed files with 68 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
http-push.c
View File

@ -315,9 +315,9 @@ static void start_fetch_loose(struct transfer_request *request)
"%s.temp", filename);
snprintf(prevfile, sizeof(prevfile), "%s.prev", request->filename);
unlink(prevfile);
unlink_or_warn(prevfile);
rename(request->tmpfile, prevfile);
unlink(request->tmpfile);
unlink_or_warn(request->tmpfile);
if (request->local_fileno != -1)
error("fd leakage in start: %d", request->local_fileno);
@ -372,7 +372,7 @@ static void start_fetch_loose(struct transfer_request *request)
} while (prev_read > 0);
close(prevlocal);
}
unlink(prevfile);
unlink_or_warn(prevfile);
/* Reset inflate/SHA1 if there was an error reading the previous temp
file; also rewind to the beginning of the local file. */
@ -784,7 +784,7 @@ static void finish_request(struct transfer_request *request)
request->http_code != 416) {
if (stat(request->tmpfile, &st) == 0) {
if (st.st_size == 0)
unlink(request->tmpfile);
unlink_or_warn(request->tmpfile);
}
} else {
if (request->http_code == 416)
@ -793,9 +793,9 @@ static void finish_request(struct transfer_request *request)
git_inflate_end(&request->stream);
git_SHA1_Final(request->real_sha1, &request->c);
if (request->zret != Z_STREAM_END) {
unlink(request->tmpfile);
unlink_or_warn(request->tmpfile);
} else if (hashcmp(request->obj->sha1, request->real_sha1)) {
unlink(request->tmpfile);
unlink_or_warn(request->tmpfile);
} else {
request->rename =
move_temp_to_file(