path: implement common_dir handling in git_pathdup_submodule()

diff --git a/tempfile.c b/tempfile.c
index d8358187f84fa1dc243df9ad57cbe8be93faf228..0af7ebf016745c4a114a12d207381342b29ccf4f 100644 (file)
--- a/tempfile.c
+++ b/tempfile.c
@@ -85,11 +85,11 @@ static void remove_tempfiles_on_signal(int signo)
        raise(signo);
 }
 
-/* Make sure errno contains a meaningful value on error */
-int create_tempfile(struct tempfile *tempfile, const char *path)
+/*
+ * Initialize *tempfile if necessary and add it to tempfile_list.
+ */
+static void prepare_tempfile_object(struct tempfile *tempfile)
 {
-       size_t pathlen = strlen(path);
-
        if (!tempfile_list) {
                /* One-time initialization */
                sigchain_push_common(remove_tempfiles_on_signal);
@@ -97,21 +97,27 @@ int create_tempfile(struct tempfile *tempfile, const char *path)
        }
 
        if (tempfile->active)
-               die("BUG: create_tempfile called for active object");
+               die("BUG: prepare_tempfile_object called for active object");
        if (!tempfile->on_list) {
                /* Initialize *tempfile and add it to tempfile_list: */
                tempfile->fd = -1;
                tempfile->fp = NULL;
                tempfile->active = 0;
                tempfile->owner = 0;
-               strbuf_init(&tempfile->filename, pathlen);
+               strbuf_init(&tempfile->filename, 0);
                tempfile->next = tempfile_list;
                tempfile_list = tempfile;
                tempfile->on_list = 1;
        } else if (tempfile->filename.len) {
                /* This shouldn't happen, but better safe than sorry. */
-               die("BUG: create_tempfile called for improperly-reset object");
+               die("BUG: prepare_tempfile_object called for improperly-reset object");
        }
+}
+
+/* Make sure errno contains a meaningful value on error */
+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);
@@ -131,6 +137,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)