Pull out a chomp_newline function from "notmuch setup"

We'll want this same thing with "notmuch restore", (and really
anything using getline).
This commit is contained in:
Carl Worth 2009-10-21 15:59:11 -07:00
parent defd216487
commit f96f4fe427

View file

@ -55,6 +55,13 @@ typedef struct {
struct timeval tv_start; struct timeval tv_start;
} add_files_state_t; } add_files_state_t;
static void
chomp_newline (char *str)
{
if (str && str[strlen(str)-1] == '\n')
str[strlen(str)-1] = '\0';
}
/* Compute the number of seconds elapsed from start to end. */ /* Compute the number of seconds elapsed from start to end. */
double double
tv_elapsed (struct timeval start, struct timeval end) tv_elapsed (struct timeval start, struct timeval end)
@ -289,13 +296,9 @@ setup_command (int argc, char *argv[])
mail_directory = NULL; mail_directory = NULL;
getline (&mail_directory, &line_size, stdin); getline (&mail_directory, &line_size, stdin);
printf ("\n"); chomp_newline (mail_directory);
if (mail_directory && printf ("\n");
mail_directory[strlen(mail_directory)-1] == '\n')
{
mail_directory[strlen(mail_directory)-1] = '\0';
}
if (mail_directory == NULL || strlen (mail_directory) == 0) { if (mail_directory == NULL || strlen (mail_directory) == 0) {
if (mail_directory) if (mail_directory)