@@ -211,7 +211,7 @@ static int ssl_socket_connect(struct imap_socket *sock UNUSED,
211
211
const struct imap_server_conf * cfg UNUSED ,
212
212
int use_tls_only UNUSED )
213
213
{
214
- fprintf (stderr , "SSL requested but SSL support not compiled in\n" );
214
+ fprintf (stderr , "SSL requested, but SSL support is not compiled in\n" );
215
215
return -1 ;
216
216
}
217
217
@@ -1026,7 +1026,7 @@ static int auth_cram_md5(struct imap_store *ctx, const char *prompt)
1026
1026
ret = socket_write (& ctx -> imap -> buf .sock , response , strlen (response ));
1027
1027
if (ret != strlen (response )) {
1028
1028
free (response );
1029
- return error ("IMAP error: sending response failed" );
1029
+ return error ("IMAP error: sending CRAM-MD5 response failed" );
1030
1030
}
1031
1031
1032
1032
free (response );
@@ -1166,7 +1166,7 @@ static struct imap_store *imap_open_store(struct imap_server_conf *srvc, const c
1166
1166
imap -> buf .sock .fd [0 ] = tunnel .out ;
1167
1167
imap -> buf .sock .fd [1 ] = tunnel .in ;
1168
1168
1169
- imap_info ("ok \n" );
1169
+ imap_info ("OK \n" );
1170
1170
} else {
1171
1171
#ifndef NO_IPV6
1172
1172
struct addrinfo hints , * ai0 , * ai ;
@@ -1185,7 +1185,7 @@ static struct imap_store *imap_open_store(struct imap_server_conf *srvc, const c
1185
1185
fprintf (stderr , "getaddrinfo: %s\n" , gai_strerror (gai ));
1186
1186
goto bail ;
1187
1187
}
1188
- imap_info ("ok \n" );
1188
+ imap_info ("OK \n" );
1189
1189
1190
1190
for (ai0 = ai ; ai ; ai = ai -> ai_next ) {
1191
1191
char addr [NI_MAXHOST ];
@@ -1223,7 +1223,7 @@ static struct imap_store *imap_open_store(struct imap_server_conf *srvc, const c
1223
1223
perror ("gethostbyname" );
1224
1224
goto bail ;
1225
1225
}
1226
- imap_info ("ok \n" );
1226
+ imap_info ("OK \n" );
1227
1227
1228
1228
addr .sin_addr .s_addr = * ((int * ) he -> h_addr_list [0 ]);
1229
1229
@@ -1237,7 +1237,7 @@ static struct imap_store *imap_open_store(struct imap_server_conf *srvc, const c
1237
1237
}
1238
1238
#endif
1239
1239
if (s < 0 ) {
1240
- fputs ("Error : unable to connect to server. \n" , stderr );
1240
+ fputs ("error : unable to connect to server\n" , stderr );
1241
1241
goto bail ;
1242
1242
}
1243
1243
@@ -1249,7 +1249,7 @@ static struct imap_store *imap_open_store(struct imap_server_conf *srvc, const c
1249
1249
close (s );
1250
1250
goto bail ;
1251
1251
}
1252
- imap_info ("ok \n" );
1252
+ imap_info ("OK \n" );
1253
1253
}
1254
1254
1255
1255
/* read the greeting string */
@@ -1302,12 +1302,12 @@ static struct imap_store *imap_open_store(struct imap_server_conf *srvc, const c
1302
1302
if (try_auth_method (srvc , ctx , imap , "XOAUTH2" , AUTH_XOAUTH2 , auth_xoauth2 ))
1303
1303
goto bail ;
1304
1304
} else {
1305
- fprintf (stderr , "Unknown authentication method: %s\n" , srvc -> host );
1305
+ fprintf (stderr , "unknown authentication mechanism: %s\n" , srvc -> auth_method );
1306
1306
goto bail ;
1307
1307
}
1308
1308
} else {
1309
1309
if (CAP (NOLOGIN )) {
1310
- fprintf (stderr , "Skipping account %s@%s, server forbids LOGIN\n" ,
1310
+ fprintf (stderr , "skipping account %s@%s, server forbids LOGIN\n" ,
1311
1311
srvc -> user , srvc -> host );
1312
1312
goto bail ;
1313
1313
}
@@ -1811,7 +1811,7 @@ int cmd_main(int argc, const char **argv)
1811
1811
1812
1812
if (!server .host ) {
1813
1813
if (!server .tunnel ) {
1814
- fprintf (stderr , "no imap host specified\n" );
1814
+ fprintf (stderr , "no IMAP host specified\n" );
1815
1815
ret = 1 ;
1816
1816
goto out ;
1817
1817
}
@@ -1831,7 +1831,7 @@ int cmd_main(int argc, const char **argv)
1831
1831
}
1832
1832
1833
1833
if (!server .folder ) {
1834
- fprintf (stderr , "no imap store specified\n" );
1834
+ fprintf (stderr , "no IMAP store specified\n" );
1835
1835
ret = 1 ;
1836
1836
goto out ;
1837
1837
}
@@ -1851,7 +1851,7 @@ int cmd_main(int argc, const char **argv)
1851
1851
1852
1852
total = count_messages (& all_msgs );
1853
1853
if (!total ) {
1854
- fprintf (stderr , "no messages to send\n" );
1854
+ fprintf (stderr , "no messages found to send\n" );
1855
1855
ret = 1 ;
1856
1856
goto out ;
1857
1857
}
0 commit comments