builtin/am: make sure state files are text

gitster · gitster · commit 57c867efe4e0 · 2015-08-24T13:01:59.000-07:00
We forgot to terminate the payload given to write_file() with LF,
resulting in files that end with an incomplete line.  Teach the
wrappers builtin/am uses to make sure it adds LF at the end as
necessary.

Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/am.c b/builtin/am.c
@@ -199,13 +199,19 @@ static inline const char *am_path(const struct am_state *state, const char *path
 static int write_state_text(const struct am_state *state,
 			    const char *name, const char *string)
 {
-	return write_file(am_path(state, name), 1, "%s", string);
+	const char *fmt;
+
+	if (*string && string[strlen(string) - 1] != '\n')
+		fmt = "%s\n";
+	else
+		fmt = "%s";
+	return write_file(am_path(state, name), 1, fmt, string);
 }
 
 static int write_state_count(const struct am_state *state,
 			     const char *name, int value)
 {
-	return write_file(am_path(state, name), 1, "%d", value);
+	return write_file(am_path(state, name), 1, "%d\n", value);
 }
 
 static int write_state_bool(const struct am_state *state,

Original file line number	Diff line number	Diff line change
`@@ -199,13 +199,19 @@ static inline const char am_path(const struct am_state state, const char *path`
`199`	`199`	`static int write_state_text(const struct am_state *state,`
`200`	`200`	`const char name, const char string)`
`201`	`201`	`{`
`202`		`- return write_file(am_path(state, name), 1, "%s", string);`
	`202`	`+ const char *fmt;`
	`203`	`+`
	`204`	`+ if (*string && string[strlen(string) - 1] != '\n')`
	`205`	`+ fmt = "%s\n";`
	`206`	`+ else`
	`207`	`+ fmt = "%s";`
	`208`	`+ return write_file(am_path(state, name), 1, fmt, string);`
`203`	`209`	`}`
`204`	`210`
`205`	`211`	`static int write_state_count(const struct am_state *state,`
`206`	`212`	`const char *name, int value)`
`207`	`213`	`{`
`208`		`- return write_file(am_path(state, name), 1, "%d", value);`
	`214`	`+ return write_file(am_path(state, name), 1, "%d\n", value);`
`209`	`215`	`}`
`210`	`216`
`211`	`217`	`static int write_state_bool(const struct am_state *state,`