@@ -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 );
@@ -1128,7 +1128,7 @@ static struct imap_store *imap_open_store(struct imap_server_conf *srvc, const c
1128
1128
imap -> buf .sock .fd [0 ] = tunnel .out ;
1129
1129
imap -> buf .sock .fd [1 ] = tunnel .in ;
1130
1130
1131
- imap_info ("ok \n" );
1131
+ imap_info ("OK \n" );
1132
1132
} else {
1133
1133
#ifndef NO_IPV6
1134
1134
struct addrinfo hints , * ai0 , * ai ;
@@ -1147,7 +1147,7 @@ static struct imap_store *imap_open_store(struct imap_server_conf *srvc, const c
1147
1147
fprintf (stderr , "getaddrinfo: %s\n" , gai_strerror (gai ));
1148
1148
goto bail ;
1149
1149
}
1150
- imap_info ("ok \n" );
1150
+ imap_info ("OK \n" );
1151
1151
1152
1152
for (ai0 = ai ; ai ; ai = ai -> ai_next ) {
1153
1153
char addr [NI_MAXHOST ];
@@ -1185,7 +1185,7 @@ static struct imap_store *imap_open_store(struct imap_server_conf *srvc, const c
1185
1185
perror ("gethostbyname" );
1186
1186
goto bail ;
1187
1187
}
1188
- imap_info ("ok \n" );
1188
+ imap_info ("OK \n" );
1189
1189
1190
1190
addr .sin_addr .s_addr = * ((int * ) he -> h_addr_list [0 ]);
1191
1191
@@ -1199,7 +1199,7 @@ static struct imap_store *imap_open_store(struct imap_server_conf *srvc, const c
1199
1199
}
1200
1200
#endif
1201
1201
if (s < 0 ) {
1202
- fputs ("Error : unable to connect to server. \n" , stderr );
1202
+ fputs ("error : unable to connect to server\n" , stderr );
1203
1203
goto bail ;
1204
1204
}
1205
1205
@@ -1211,7 +1211,7 @@ static struct imap_store *imap_open_store(struct imap_server_conf *srvc, const c
1211
1211
close (s );
1212
1212
goto bail ;
1213
1213
}
1214
- imap_info ("ok \n" );
1214
+ imap_info ("OK \n" );
1215
1215
}
1216
1216
1217
1217
/* read the greeting string */
@@ -1342,12 +1342,12 @@ static struct imap_store *imap_open_store(struct imap_server_conf *srvc, const c
1342
1342
goto bail ;
1343
1343
}
1344
1344
} else {
1345
- fprintf (stderr , "Unknown authentication method:%s\n" , srvc -> host );
1345
+ fprintf (stderr , "unknown authentication method:%s\n" , srvc -> host );
1346
1346
goto bail ;
1347
1347
}
1348
1348
} else {
1349
1349
if (CAP (NOLOGIN )) {
1350
- fprintf (stderr , "Skipping account %s@%s, server forbids LOGIN\n" ,
1350
+ fprintf (stderr , "skipping account %s@%s, server forbids LOGIN\n" ,
1351
1351
srvc -> user , srvc -> host );
1352
1352
goto bail ;
1353
1353
}
@@ -1603,7 +1603,7 @@ static int append_msgs_to_imap(struct imap_server_conf *server,
1603
1603
}
1604
1604
ctx -> name = server -> folder ;
1605
1605
1606
- fprintf (stderr , "sending %d message%s\n" , total , (total != 1 ) ? "s" : "" );
1606
+ fprintf (stderr , "Sending %d message%s\n" , total , (total != 1 ) ? "s" : "" );
1607
1607
while (1 ) {
1608
1608
unsigned percent = n * 100 / total ;
1609
1609
@@ -1712,7 +1712,7 @@ static int curl_append_msgs_to_imap(struct imap_server_conf *server,
1712
1712
curl = setup_curl (server , & cred );
1713
1713
curl_easy_setopt (curl , CURLOPT_READDATA , & msgbuf );
1714
1714
1715
- fprintf (stderr , "sending %d message%s\n" , total , (total != 1 ) ? "s" : "" );
1715
+ fprintf (stderr , "Sending %d message%s\n" , total , (total != 1 ) ? "s" : "" );
1716
1716
while (1 ) {
1717
1717
unsigned percent = n * 100 / total ;
1718
1718
int prev_len ;
@@ -1796,13 +1796,13 @@ int cmd_main(int argc, const char **argv)
1796
1796
server .port = server .use_ssl ? 993 : 143 ;
1797
1797
1798
1798
if (!server .folder ) {
1799
- fprintf (stderr , "no imap store specified\n" );
1799
+ fprintf (stderr , "no IMAP store specified\n" );
1800
1800
ret = 1 ;
1801
1801
goto out ;
1802
1802
}
1803
1803
if (!server .host ) {
1804
1804
if (!server .tunnel ) {
1805
- fprintf (stderr , "no imap host specified\n" );
1805
+ fprintf (stderr , "no IMAP host specified\n" );
1806
1806
ret = 1 ;
1807
1807
goto out ;
1808
1808
}
@@ -1824,7 +1824,7 @@ int cmd_main(int argc, const char **argv)
1824
1824
1825
1825
total = count_messages (& all_msgs );
1826
1826
if (!total ) {
1827
- fprintf (stderr , "no messages to send\n" );
1827
+ fprintf (stderr , "no messages found to send\n" );
1828
1828
ret = 1 ;
1829
1829
goto out ;
1830
1830
}
0 commit comments