Commit Diff

Commit:
b06f7fc373d58b68acddef2cd8ec7ada8e94bef3
From:
Mark Jamsek <mark@jamsek.dev>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
Message:
tog diff 'p' keymap: show id prefix in diff filename This helps identify diffs when several have been written. Suggested by stsp on IRC. ok stsp@
Actions:
Patch | Tree
commit - 6d921bc281f87405ca22c72c97fd7db2b6f2c977
commit + b06f7fc373d58b68acddef2cd8ec7ada8e94bef3
blob - 098e4b046181f90210370e992a808076c688abc6
blob + aef5e53ec70381644eb56e603bd13c6f3e721e5e
--- tog/tog.c
+++ tog/tog.c
@@ -5821,11 +5821,12 @@ diff_write_patch(struct tog_view *view)
 {
 	const struct got_error		*err;
 	struct tog_diff_view_state	*s = &view->state.diff;
-	FILE				*f;
-	char				 buf[BUFSIZ];
-	char				*path;
+	FILE				*f = NULL;
+	char				 buf[BUFSIZ], pathbase[PATH_MAX];
+	char				*idstr2, *idstr1 = NULL, *path = NULL;
 	size_t				 r;
 	off_t				 pos;
+	int				 rc;
 
 	if (s->action != NULL) {
 		free(s->action);
@@ -5838,9 +5839,25 @@ diff_write_patch(struct tog_view *view)
 	if (fseeko(s->f, 0L, SEEK_SET) == -1)
 		return got_error_from_errno("fseeko");
 
-	err = got_opentemp_named(&path, &f, GOT_TMPDIR_STR "/tog", ".diff");
+	if (s->id1 != NULL) {
+		err = got_object_id_str(&idstr1, s->id1);
+		if (err != NULL)
+			return err;
+	}
+	err = got_object_id_str(&idstr2, s->id2);
 	if (err != NULL)
-		return err;
+		goto done;
+
+	rc = snprintf(pathbase, sizeof(pathbase), "%s/tog-%.8s-%.8s",
+	    GOT_TMPDIR_STR, idstr1 != NULL ? idstr1 : "empty", idstr2);
+	if (rc < 0 || (size_t)rc >= sizeof(pathbase)) {
+		err = got_error(rc < 0 ? GOT_ERR_IO : GOT_ERR_NO_SPACE);
+		goto done;
+	}
+
+	err = got_opentemp_named(&path, &f, pathbase, ".diff");
+	if (err != NULL)
+		goto done;
 
 	while ((r = fread(buf, 1, sizeof(buf), s->f)) > 0) {
 		if (fwrite(buf, 1, r, f) != r) {
@@ -5874,6 +5891,8 @@ done:
 	if (f != NULL && fclose(f) == EOF && err == NULL)
 		err = got_error_from_errno2("fclose", path);
 	free(path);
+	free(idstr1);
+	free(idstr2);
 	return err;
 }