Commit 678bc1f5 authored by Chong Yidong's avatar Chong Yidong

* b2m.c (main): Ensure that each message ends in two newlines.

parent 88d03607
2009-07-08 E. Jay Berkenbilt <ejb@ql.org> (tiny change)
* b2m.c (main): Ensure that each message ends in two newlines.
2009-07-03 Jason Rumney <jasonr@gnu.org> 2009-07-03 Jason Rumney <jasonr@gnu.org>
* emacsclient.c (w32_set_user_model_id): Use standard types. * emacsclient.c (w32_set_user_model_id): Use standard types.
......
...@@ -94,7 +94,7 @@ main (argc, argv) ...@@ -94,7 +94,7 @@ main (argc, argv)
int argc; int argc;
char **argv; char **argv;
{ {
logical labels_saved, printing, header; logical labels_saved, printing, header, first, last_was_blank_line;
time_t ltoday; time_t ltoday;
struct tm *tm; struct tm *tm;
char *labels, *p, *today; char *labels, *p, *today;
...@@ -139,7 +139,8 @@ main (argc, argv) ...@@ -139,7 +139,8 @@ main (argc, argv)
exit (EXIT_SUCCESS); exit (EXIT_SUCCESS);
} }
labels_saved = printing = header = FALSE; labels_saved = printing = header = last_was_blank_line = FALSE;
first = TRUE;
ltoday = time (0); ltoday = time (0);
/* Convert to a string, checking for out-of-range time stamps. /* Convert to a string, checking for out-of-range time stamps.
Don't use 'ctime', as that might dump core if the hardware clock Don't use 'ctime', as that might dump core if the hardware clock
...@@ -170,6 +171,10 @@ main (argc, argv) ...@@ -170,6 +171,10 @@ main (argc, argv)
continue; continue;
else if (data.buffer[1] == '\f') else if (data.buffer[1] == '\f')
{ {
if (first)
first = FALSE;
else if (! last_was_blank_line)
puts("");
/* Save labels. */ /* Save labels. */
readline (&data, stdin); readline (&data, stdin);
p = strtok (data.buffer, " ,\r\n\t"); p = strtok (data.buffer, " ,\r\n\t");
...@@ -195,7 +200,13 @@ main (argc, argv) ...@@ -195,7 +200,13 @@ main (argc, argv)
} }
if (printing) if (printing)
puts (data.buffer); {
puts (data.buffer);
if (data.buffer[0] == '\0')
last_was_blank_line = TRUE;
else
last_was_blank_line = FALSE;
}
} }
return EXIT_SUCCESS; return EXIT_SUCCESS;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment