Use xmkstemp() instead of mkstemp()
PATCH 2/2 Use xmkstemp() instead of mkstemp()
xmkstemp() performs error checking and prints a standard error message when an error occur.
Signed-off-by Luiz Fernando N. Capitulino <[email protected]>
--- builtin-pack-objects.c | 4 +--- fast-import.c | 8 ++------ index-pack.c | 2 +- merge-recursive.c | 4 +--- pack-write.c | 2 +- unpack-file.c | 4 +--- 6 files changed, 7 insertions(+), 17 deletions(-)
builtin-pack-objects.c +1 -3
@@ -586,7 +586,7 @@ static off_t write_one(struct sha1file *f,static int open_object_dir_tmp (const char *path) {snprintf (tmpname,sizeof (tmpname),"%s/%s" ,get_object_directory (), path); -return mkstemp (tmpname); +return xmkstemp (tmpname); }/* forward declaration for write_pack_file */
@@ -612,8 +612,6 @@ static void write_pack_file(void) f =sha1fd (1 ,"<stdout>" ); }else {int fd =open_object_dir_tmp ("tmp_pack_XXXXXX" ); -if (fd <0 ) -die ("unable to create %s: %s\n" , tmpname,strerror (errno)); pack_tmp_name =xstrdup (tmpname); f =sha1fd (fd, pack_tmp_name); }
fast-import.c +2 -6
@@ -663,9 +663,7 @@ static void start_packfile(void)snprintf (tmpfile,sizeof (tmpfile),"%s/tmp_pack_XXXXXX" ,get_object_directory ()); - pack_fd =mkstemp (tmpfile); -if (pack_fd <0 ) -die ("Can't create %s: %s" , tmpfile,strerror (errno)); + pack_fd =xmkstemp (tmpfile); p =xcalloc (1 ,sizeof (*p) +strlen (tmpfile) +2 );strcpy (p->pack_name, tmpfile); p->pack_fd = pack_fd;
@@ -727,9 +725,7 @@ static char *create_index(void)snprintf (tmpfile,sizeof (tmpfile),"%s/tmp_idx_XXXXXX" ,get_object_directory ()); - idx_fd =mkstemp (tmpfile); -if (idx_fd <0 ) -die ("Can't create %s: %s" , tmpfile,strerror (errno)); + idx_fd =xmkstemp (tmpfile); f =sha1fd (idx_fd, tmpfile);sha1write (f, array,256 *sizeof (int ));SHA1_Init (&ctx);
index-pack.c +1 -1
@@ -114,7 +114,7 @@ static const char *open_pack_file(const char *pack_name)static char tmpfile[PATH_MAX ];snprintf (tmpfile,sizeof (tmpfile),"%s/tmp_pack_XXXXXX" ,get_object_directory ()); - output_fd =mkstemp (tmpfile); + output_fd =xmkstemp (tmpfile); pack_name =xstrdup (tmpfile); }else output_fd =open (pack_name,O_CREAT |O_EXCL |O_RDWR ,0600 );
merge-recursive.c +1 -3
@@ -777,9 +777,7 @@ static void create_temp(mmfile_t *src, char *path)int fd;strcpy (path,".merge_file_XXXXXX" ); - fd =mkstemp (path); -if (fd <0 ) -die ("unable to create temp-file" ); + fd =xmkstemp (path);if (write_in_full (fd, src->ptr, src->size) != src->size)die ("unable to write temp-file" );close (fd);
pack-write.c +1 -1
@@ -45,7 +45,7 @@ const char *write_idx_file(const char *index_name, struct pack_idx_entry **objecstatic char tmpfile[PATH_MAX ];snprintf (tmpfile,sizeof (tmpfile),"%s/tmp_idx_XXXXXX" ,get_object_directory ()); - fd =mkstemp (tmpfile); + fd =xmkstemp (tmpfile); index_name =xstrdup (tmpfile); }else {unlink (index_name);
unpack-file.c +1 -3
@@ -14,9 +14,7 @@ static char *create_temp_file(unsigned char *sha1)die ("unable to read blob object %s" ,sha1_to_hex (sha1));strcpy (path,".merge_file_XXXXXX" ); - fd =mkstemp (path); -if (fd <0 ) -die ("unable to create temp-file" ); + fd =xmkstemp (path);if (write_in_full (fd, buf, size) != size)die ("unable to write temp-file" );close (fd);
Signature · 6 lines
1.5.3.GIT -- Luiz Fernando N. Capitulino