@@ -205,7 +205,7 @@ static int ssl_socket_connect(struct imap_socket *sock UNUSED,
205
205
const struct imap_server_conf * cfg UNUSED ,
206
206
int use_tls_only UNUSED )
207
207
{
208
- fprintf (stderr , "SSL requested but SSL support not compiled in\n" );
208
+ fprintf (stderr , "SSL requested, but SSL support is not compiled in\n" );
209
209
return -1 ;
210
210
}
211
211
@@ -1020,7 +1020,7 @@ static int auth_cram_md5(struct imap_store *ctx, const char *prompt)
1020
1020
ret = socket_write (& ctx -> imap -> buf .sock , response , strlen (response ));
1021
1021
if (ret != strlen (response )) {
1022
1022
free (response );
1023
- return error ("IMAP error: sending response failed" );
1023
+ return error ("IMAP error: sending CRAM-MD5 response failed" );
1024
1024
}
1025
1025
1026
1026
free (response );
@@ -1160,7 +1160,7 @@ static struct imap_store *imap_open_store(struct imap_server_conf *srvc, const c
1160
1160
imap -> buf .sock .fd [0 ] = tunnel .out ;
1161
1161
imap -> buf .sock .fd [1 ] = tunnel .in ;
1162
1162
1163
- imap_info ("ok \n" );
1163
+ imap_info ("OK \n" );
1164
1164
} else {
1165
1165
#ifndef NO_IPV6
1166
1166
struct addrinfo hints , * ai0 , * ai ;
@@ -1179,7 +1179,7 @@ static struct imap_store *imap_open_store(struct imap_server_conf *srvc, const c
1179
1179
fprintf (stderr , "getaddrinfo: %s\n" , gai_strerror (gai ));
1180
1180
goto bail ;
1181
1181
}
1182
- imap_info ("ok \n" );
1182
+ imap_info ("OK \n" );
1183
1183
1184
1184
for (ai0 = ai ; ai ; ai = ai -> ai_next ) {
1185
1185
char addr [NI_MAXHOST ];
@@ -1217,7 +1217,7 @@ static struct imap_store *imap_open_store(struct imap_server_conf *srvc, const c
1217
1217
perror ("gethostbyname" );
1218
1218
goto bail ;
1219
1219
}
1220
- imap_info ("ok \n" );
1220
+ imap_info ("OK \n" );
1221
1221
1222
1222
addr .sin_addr .s_addr = * ((int * ) he -> h_addr_list [0 ]);
1223
1223
@@ -1231,7 +1231,7 @@ static struct imap_store *imap_open_store(struct imap_server_conf *srvc, const c
1231
1231
}
1232
1232
#endif
1233
1233
if (s < 0 ) {
1234
- fputs ("Error : unable to connect to server. \n" , stderr );
1234
+ fputs ("error : unable to connect to server\n" , stderr );
1235
1235
goto bail ;
1236
1236
}
1237
1237
@@ -1243,7 +1243,7 @@ static struct imap_store *imap_open_store(struct imap_server_conf *srvc, const c
1243
1243
close (s );
1244
1244
goto bail ;
1245
1245
}
1246
- imap_info ("ok \n" );
1246
+ imap_info ("OK \n" );
1247
1247
}
1248
1248
1249
1249
/* read the greeting string */
@@ -1296,12 +1296,12 @@ static struct imap_store *imap_open_store(struct imap_server_conf *srvc, const c
1296
1296
if (try_auth_method (srvc , ctx , imap , "XOAUTH2" , AUTH_XOAUTH2 , auth_xoauth2 ))
1297
1297
goto bail ;
1298
1298
} else {
1299
- fprintf (stderr , "Unknown authentication method:%s\n" , srvc -> host );
1299
+ fprintf (stderr , "unknown authentication method:%s\n" , srvc -> host );
1300
1300
goto bail ;
1301
1301
}
1302
1302
} else {
1303
1303
if (CAP (NOLOGIN )) {
1304
- fprintf (stderr , "Skipping account %s@%s, server forbids LOGIN\n" ,
1304
+ fprintf (stderr , "skipping account %s@%s, server forbids LOGIN\n" ,
1305
1305
srvc -> user , srvc -> host );
1306
1306
goto bail ;
1307
1307
}
@@ -1557,7 +1557,7 @@ static int append_msgs_to_imap(struct imap_server_conf *server,
1557
1557
}
1558
1558
ctx -> name = server -> folder ;
1559
1559
1560
- fprintf (stderr , "sending %d message%s\n" , total , (total != 1 ) ? "s" : "" );
1560
+ fprintf (stderr , "Sending %d message%s\n" , total , (total != 1 ) ? "s" : "" );
1561
1561
while (1 ) {
1562
1562
unsigned percent = n * 100 / total ;
1563
1563
@@ -1671,7 +1671,7 @@ static int curl_append_msgs_to_imap(struct imap_server_conf *server,
1671
1671
curl = setup_curl (server , & cred );
1672
1672
curl_easy_setopt (curl , CURLOPT_READDATA , & msgbuf );
1673
1673
1674
- fprintf (stderr , "sending %d message%s\n" , total , (total != 1 ) ? "s" : "" );
1674
+ fprintf (stderr , "Sending %d message%s\n" , total , (total != 1 ) ? "s" : "" );
1675
1675
while (1 ) {
1676
1676
unsigned percent = n * 100 / total ;
1677
1677
int prev_len ;
@@ -1755,13 +1755,13 @@ int cmd_main(int argc, const char **argv)
1755
1755
server .port = server .use_ssl ? 993 : 143 ;
1756
1756
1757
1757
if (!server .folder ) {
1758
- fprintf (stderr , "no imap store specified\n" );
1758
+ fprintf (stderr , "no IMAP store specified\n" );
1759
1759
ret = 1 ;
1760
1760
goto out ;
1761
1761
}
1762
1762
if (!server .host ) {
1763
1763
if (!server .tunnel ) {
1764
- fprintf (stderr , "no imap host specified\n" );
1764
+ fprintf (stderr , "no IMAP host specified\n" );
1765
1765
ret = 1 ;
1766
1766
goto out ;
1767
1767
}
@@ -1783,7 +1783,7 @@ int cmd_main(int argc, const char **argv)
1783
1783
1784
1784
total = count_messages (& all_msgs );
1785
1785
if (!total ) {
1786
- fprintf (stderr , "no messages to send\n" );
1786
+ fprintf (stderr , "no messages found to send\n" );
1787
1787
ret = 1 ;
1788
1788
goto out ;
1789
1789
}
0 commit comments