Print this page
make: translate using gettext, rather than the unmaintainable catgets
*** 33,45 ****
/*
* Included files
*/
#include <mksh/misc.h> /* retmem() */
#include <mksh/read.h>
- #include <mksdmsi18n/mksdmsi18n.h>
#include <sys/uio.h> /* read() */
#include <unistd.h> /* close(), unlink(), read() */
#define STRING_LEN_TO_CONVERT (8*1024)
/*
* get_next_block_fn(source)
--- 33,45 ----
/*
* Included files
*/
#include <mksh/misc.h> /* retmem() */
#include <mksh/read.h>
#include <sys/uio.h> /* read() */
#include <unistd.h> /* close(), unlink(), read() */
+ #include <libintl.h>
#define STRING_LEN_TO_CONVERT (8*1024)
/*
* get_next_block_fn(source)
*** 108,121 ****
source->inp_buf_end = source->inp_buf + to_read;
length = read(source->fd, source->inp_buf, (unsigned int) to_read);
if (length != to_read) {
WCSTOMBS(mbs_buffer, file_being_read);
if (length == 0) {
! fatal_mksh(catgets(libmksdmsi18n_catd, 1, 140, "Error reading `%s': Premature EOF"),
mbs_buffer);
} else {
! fatal_mksh(catgets(libmksdmsi18n_catd, 1, 141, "Error reading `%s': %s"),
mbs_buffer,
errmsg(errno));
}
}
*source->inp_buf_end = nul_char;
--- 108,121 ----
source->inp_buf_end = source->inp_buf + to_read;
length = read(source->fd, source->inp_buf, (unsigned int) to_read);
if (length != to_read) {
WCSTOMBS(mbs_buffer, file_being_read);
if (length == 0) {
! fatal_mksh(gettext("Error reading `%s': Premature EOF"),
mbs_buffer);
} else {
! fatal_mksh(gettext("Error reading `%s': %s"),
mbs_buffer,
errmsg(errno));
}
}
*source->inp_buf_end = nul_char;
*** 151,161 ****
*source->string.text.end = 0;
if (source->inp_buf_ptr >= source->inp_buf_end) {
if (*(source->string.text.end - 1) != (int) newline_char) {
WCSTOMBS(mbs_buffer, file_being_read);
! warning_mksh(catgets(libmksdmsi18n_catd, 1, 142, "newline is not last character in file %s"),
mbs_buffer);
*source->string.text.end++ = (int) newline_char;
*source->string.text.end = (int) nul_char;
*source->string.buffer.end++;
}
--- 151,161 ----
*source->string.text.end = 0;
if (source->inp_buf_ptr >= source->inp_buf_end) {
if (*(source->string.text.end - 1) != (int) newline_char) {
WCSTOMBS(mbs_buffer, file_being_read);
! warning_mksh(gettext("newline is not last character in file %s"),
mbs_buffer);
*source->string.text.end++ = (int) newline_char;
*source->string.text.end = (int) nul_char;
*source->string.buffer.end++;
}