diff options
Diffstat (limited to 'mailutils')
| -rw-r--r-- | mailutils/mail.c | 6 | ||||
| -rw-r--r-- | mailutils/popmaildir.c | 2 | ||||
| -rw-r--r-- | mailutils/sendmail.c | 2 |
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) { #define err signo if (SIGALRM == signo) { - bb_error_msg_and_die("timed out"); + bb_simple_error_msg_and_die("timed out"); } // SIGCHLD. reap zombies @@ -128,7 +128,7 @@ static void encode_n_base64(const char *fname, const char *text, size_t len) if (fname) { size = fread((char *)src_buf, 1, SRC_BUF_SIZE, fp); if ((ssize_t)size < 0) - bb_perror_msg_and_die(bb_msg_read_error); + bb_simple_perror_msg_and_die(bb_msg_read_error); } else { size = len; if (len > SRC_BUF_SIZE) @@ -179,5 +179,5 @@ void FAST_FUNC get_cred_or_die(int fd) G.pass = xmalloc_reads(fd, /* maxsize: */ NULL); } if (!G.user || !*G.user || !G.pass) - bb_error_msg_and_die("no username or password"); + bb_simple_error_msg_and_die("no username or password"); } 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) fp = popen(delivery, "w"); unsetenv("FILENAME"); if (!fp) { - bb_perror_msg("delivery helper"); + bb_simple_perror_msg("delivery helper"); break; } } 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) smtp_check(NULL, 250); else if (code != 250) - bb_error_msg_and_die("SMTP init failed"); + bb_simple_error_msg_and_die("SMTP init failed"); } else { // vanilla connection int fd; |