aboutsummaryrefslogtreecommitdiff
path: root/mailutils
diff options
context:
space:
mode:
Diffstat (limited to 'mailutils')
-rw-r--r--mailutils/mail.c6
-rw-r--r--mailutils/popmaildir.c2
-rw-r--r--mailutils/sendmail.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/mailutils/mail.c b/mailutils/mail.c
index 6726654f7..3a1fd6949 100644
--- a/mailutils/mail.c
+++ b/mailutils/mail.c
@@ -15,7 +15,7 @@ static void signal_handler(int signo)
15{ 15{
16#define err signo 16#define err signo
17 if (SIGALRM == signo) { 17 if (SIGALRM == signo) {
18 bb_error_msg_and_die("timed out"); 18 bb_simple_error_msg_and_die("timed out");
19 } 19 }
20 20
21 // SIGCHLD. reap zombies 21 // SIGCHLD. reap zombies
@@ -128,7 +128,7 @@ static void encode_n_base64(const char *fname, const char *text, size_t len)
128 if (fname) { 128 if (fname) {
129 size = fread((char *)src_buf, 1, SRC_BUF_SIZE, fp); 129 size = fread((char *)src_buf, 1, SRC_BUF_SIZE, fp);
130 if ((ssize_t)size < 0) 130 if ((ssize_t)size < 0)
131 bb_perror_msg_and_die(bb_msg_read_error); 131 bb_simple_perror_msg_and_die(bb_msg_read_error);
132 } else { 132 } else {
133 size = len; 133 size = len;
134 if (len > SRC_BUF_SIZE) 134 if (len > SRC_BUF_SIZE)
@@ -179,5 +179,5 @@ void FAST_FUNC get_cred_or_die(int fd)
179 G.pass = xmalloc_reads(fd, /* maxsize: */ NULL); 179 G.pass = xmalloc_reads(fd, /* maxsize: */ NULL);
180 } 180 }
181 if (!G.user || !*G.user || !G.pass) 181 if (!G.user || !*G.user || !G.pass)
182 bb_error_msg_and_die("no username or password"); 182 bb_simple_error_msg_and_die("no username or password");
183} 183}
diff --git a/mailutils/popmaildir.c b/mailutils/popmaildir.c
index 589456715..6927e3a58 100644
--- a/mailutils/popmaildir.c
+++ b/mailutils/popmaildir.c
@@ -222,7 +222,7 @@ int popmaildir_main(int argc UNUSED_PARAM, char **argv)
222 fp = popen(delivery, "w"); 222 fp = popen(delivery, "w");
223 unsetenv("FILENAME"); 223 unsetenv("FILENAME");
224 if (!fp) { 224 if (!fp) {
225 bb_perror_msg("delivery helper"); 225 bb_simple_perror_msg("delivery helper");
226 break; 226 break;
227 } 227 }
228 } else 228 } else
diff --git a/mailutils/sendmail.c b/mailutils/sendmail.c
index 32c50ba84..1bdc1c300 100644
--- a/mailutils/sendmail.c
+++ b/mailutils/sendmail.c
@@ -338,7 +338,7 @@ int sendmail_main(int argc UNUSED_PARAM, char **argv)
338 smtp_check(NULL, 250); 338 smtp_check(NULL, 250);
339 else 339 else
340 if (code != 250) 340 if (code != 250)
341 bb_error_msg_and_die("SMTP init failed"); 341 bb_simple_error_msg_and_die("SMTP init failed");
342 } else { 342 } else {
343 // vanilla connection 343 // vanilla connection
344 int fd; 344 int fd;