diff options
| -rw-r--r-- | builtin/am.c | 10 | ||||
| -rw-r--r-- | wrapper.c | 1 |
2 files changed, 3 insertions, 8 deletions
diff --git a/builtin/am.c b/builtin/am.c index 9c576779c3..486ff594d7 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -199,19 +199,13 @@ 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) { - const char *fmt; - - if (*string && string[strlen(string) - 1] != '\n') - fmt = "%s\n"; - else - fmt = "%s"; - return write_file(am_path(state, name), fmt, string); + return write_file(am_path(state, name), "%s", string); } static int write_state_count(const struct am_state *state, const char *name, int value) { - return write_file(am_path(state, name), "%d\n", value); + return write_file(am_path(state, name), "%d", value); } static int write_state_bool(const struct am_state *state, @@ -632,6 +632,7 @@ static int write_file_v(const char *path, int fatal, return -1; } strbuf_vaddf(&sb, fmt, params); + strbuf_complete_line(&sb); if (write_in_full(fd, sb.buf, sb.len) != sb.len) { int err = errno; close(fd); |