l10n: git.pot: v2.11.0 round 2 (1 new, 1 removed)

diff --git a/tempfile.c b/tempfile.c
index d840f0452ab3dc1e601fd4a8539047761186f1ce..2990c92424832d288d5bbab2dfe79b5db361e0b0 100644 (file)
--- a/tempfile.c
+++ b/tempfile.c
@@ -120,7 +120,12 @@ int create_tempfile(struct tempfile *tempfile, const char *path)
        prepare_tempfile_object(tempfile);
 
        strbuf_add_absolute_path(&tempfile->filename, path);
-       tempfile->fd = open(tempfile->filename.buf, O_RDWR | O_CREAT | O_EXCL, 0666);
+       tempfile->fd = open(tempfile->filename.buf,
+                           O_RDWR | O_CREAT | O_EXCL | O_CLOEXEC, 0666);
+       if (O_CLOEXEC && tempfile->fd < 0 && errno == EINVAL)
+               /* Try again w/o O_CLOEXEC: the kernel might not support it */
+               tempfile->fd = open(tempfile->filename.buf,
+                                   O_RDWR | O_CREAT | O_EXCL, 0666);
        if (tempfile->fd < 0) {
                strbuf_reset(&tempfile->filename);
                return -1;
@@ -137,6 +142,67 @@ int create_tempfile(struct tempfile *tempfile, const char *path)
        return tempfile->fd;
 }
 
+void register_tempfile(struct tempfile *tempfile, const char *path)
+{
+       prepare_tempfile_object(tempfile);
+       strbuf_add_absolute_path(&tempfile->filename, path);
+       tempfile->owner = getpid();
+       tempfile->active = 1;
+}
+
+int mks_tempfile_sm(struct tempfile *tempfile,
+                   const char *template, int suffixlen, int mode)
+{
+       prepare_tempfile_object(tempfile);
+
+       strbuf_add_absolute_path(&tempfile->filename, template);
+       tempfile->fd = git_mkstemps_mode(tempfile->filename.buf, suffixlen, mode);
+       if (tempfile->fd < 0) {
+               strbuf_reset(&tempfile->filename);
+               return -1;
+       }
+       tempfile->owner = getpid();
+       tempfile->active = 1;
+       return tempfile->fd;
+}
+
+int mks_tempfile_tsm(struct tempfile *tempfile,
+                    const char *template, int suffixlen, int mode)
+{
+       const char *tmpdir;
+
+       prepare_tempfile_object(tempfile);
+
+       tmpdir = getenv("TMPDIR");
+       if (!tmpdir)
+               tmpdir = "/tmp";
+
+       strbuf_addf(&tempfile->filename, "%s/%s", tmpdir, template);
+       tempfile->fd = git_mkstemps_mode(tempfile->filename.buf, suffixlen, mode);
+       if (tempfile->fd < 0) {
+               strbuf_reset(&tempfile->filename);
+               return -1;
+       }
+       tempfile->owner = getpid();
+       tempfile->active = 1;
+       return tempfile->fd;
+}
+
+int xmks_tempfile_m(struct tempfile *tempfile, const char *template, int mode)
+{
+       int fd;
+       struct strbuf full_template = STRBUF_INIT;
+
+       strbuf_add_absolute_path(&full_template, template);
+       fd = mks_tempfile_m(tempfile, full_template.buf, mode);
+       if (fd < 0)
+               die_errno("Unable to create temporary file '%s'",
+                         full_template.buf);
+
+       strbuf_release(&full_template);
+       return fd;
+}
+
 FILE *fdopen_tempfile(struct tempfile *tempfile, const char *mode)
 {
        if (!tempfile->active)