From 7f97e72df5db764cb428591b36f1718cd05b8f6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rodolphe=20Br=C3=A9ard?= <rodolphe@what.tf>
Date: Sun, 16 Jul 2023 13:50:13 +0200
Subject: [PATCH] Exit when stdin is closed

---
 src/service.rs | 46 ++++++++++++++++++++++++----------------------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/src/service.rs b/src/service.rs
index 1087b00..136f884 100644
--- a/src/service.rs
+++ b/src/service.rs
@@ -1,27 +1,31 @@
 use crate::address::KeyedAddress;
 use crate::config::Config;
 use crate::input::{parse_input, Input};
-use anyhow::Result;
+use anyhow::{anyhow, Result};
 use clap::Parser;
 use std::collections::HashSet;
 use std::io;
 
-pub const BUFF_SIZE: usize = 4096;
-pub const CONFIG_END: &str = "config|ready\n";
+pub const CONFIG_END: &str = "config|ready";
 pub const ANSWER_OK: &str = "proceed";
 pub const ANSWER_ERR: &str = "reject|550 No such recipient here";
 
+macro_rules! next_line {
+	($it: ident) => {
+		$it.next()
+			.ok_or(anyhow!("standard input has been closed"))??
+	};
+}
+
 pub fn start_service() -> Result<()> {
 	let cfg = Config::parse();
 	let addresses = cfg.addresses()?;
-	let mut buffer = String::with_capacity(BUFF_SIZE);
-	let stdin = io::stdin();
+	let mut lines = io::stdin().lines();
 
 	// Handshake
 	loop {
-		buffer.clear();
-		stdin.read_line(&mut buffer)?;
-		if buffer == CONFIG_END {
+		let input = next_line!(lines);
+		if input.trim_end() == CONFIG_END {
 			break;
 		}
 	}
@@ -30,21 +34,19 @@ pub fn start_service() -> Result<()> {
 
 	// Input processing
 	loop {
-		buffer.clear();
-		stdin.read_line(&mut buffer)?;
-		if buffer.is_empty() {
-			continue;
-		}
-		match parse_input(&buffer, cfg.get_separator()) {
-			Ok(input) => {
-				if allow_email(&input, &addresses) {
-					input.answer(ANSWER_OK);
-				} else {
-					input.answer(ANSWER_ERR);
+		let input = next_line!(lines);
+		if !input.is_empty() {
+			match parse_input(&input, cfg.get_separator()) {
+				Ok(input) => {
+					if allow_email(&input, &addresses) {
+						input.answer(ANSWER_OK);
+					} else {
+						input.answer(ANSWER_ERR);
+					}
+				}
+				Err(e) => {
+					eprintln!("error: {e:#}");
 				}
-			}
-			Err(e) => {
-				eprintln!("error: {e:#}");
 			}
 		}
 	}