Add support for %(hascolor), and a new function for parameterized

[nmh] / uip / mhfixmsg.c

diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c
index 20bb28356fd23683789b40aeb9d61520f145f4a5..fd777699c8fd322f93bfdf2324f84d45132a8cb1 100644 (file)
--- a/uip/mhfixmsg.c
+++ b/uip/mhfixmsg.c
@@ -1734,8 +1734,8 @@ strip_crs (CT ct, int *message_mods) {
 
                     ++*message_mods;
                     if (verbosw) {
-                        report (NULL,
-                                 begin == 0 && end == 0 ? "(tmpfile)" : *file,
+                        report (ct->c_partno,
+                                begin == 0 && end == 0  ?  ""  :  *file,
                                 "stripped CRs");
                     }
                 }
@@ -1885,7 +1885,8 @@ convert_codeset (CT ct, char *dest_codeset, int *message_mods) {
                                      min (bytes_to_read, sizeof src_buffer),
                                      *fp)) > 0) {
                 char dest_buffer[BUFSIZ];
-                char *ib = src_buffer, *ob = dest_buffer;
+                ICONV_CONST char *ib = src_buffer;
+                char *ob = dest_buffer;
                 size_t outbytes = sizeof dest_buffer;
                 size_t outbytes_before = outbytes;