Put generated lex and yacc files also in distribution.

[gedcom-parse.git] / gedcom / message.c

diff --git a/gedcom/message.c b/gedcom/message.c
index f2f41301d17a5093b17d992076edb2e57f181ccb..5f0bdc38ab9dbfde2263e095bb0675865c9d9093 100644 (file)
--- a/gedcom/message.c
+++ b/gedcom/message.c
@@ -24,7 +24,13 @@
 #include "gedcom_internal.h"
 #include "gedcom.h"
 
+#if HAVE_VSNPRINTF
 #define INITIAL_BUF_SIZE 256
+#else
+/* Risk on overflowing buffer, so make size big */
+#define INITIAL_BUF_SIZE 65536
+#endif
+
 char *mess_buffer = NULL;
 size_t bufsize;
 
@@ -41,39 +47,66 @@ void reset_mess_buffer()
     mess_buffer[0] = '\0';
 }
 
+void cleanup_mess_buffer()
+{
+  if (mess_buffer)
+    free(mess_buffer);
+}
+
 void init_mess_buffer()
 {
   if (mess_buffer == NULL) {
     mess_buffer = (char *)malloc(INITIAL_BUF_SIZE);
-    mess_buffer[0] = '\0';
-    bufsize = INITIAL_BUF_SIZE;
+    if (mess_buffer) {
+      mess_buffer[0] = '\0';
+      bufsize = INITIAL_BUF_SIZE;
+      if (atexit(cleanup_mess_buffer) != 0)
+       gedcom_warning(_("Could not register buffer cleanup function"));
+    }
+    else {
+      fprintf(stderr, _("Could not allocate memory at %s, %d"),
+             __FILE__, __LINE__);
+      fprintf(stderr, "\n");
+    }
   }
 }
 
-int safe_buf_vappend(char *s, va_list ap)
+int safe_buf_vappend(const char *s, va_list ap)
 {
-  int res;
+  int res = 0;
   int len;
   init_mess_buffer();
-  len = strlen(mess_buffer);
-  while (1) {
-    char *buf_ptr = mess_buffer + len;
-    int rest_size = bufsize - len;
-    
-    res = vsnprintf(buf_ptr, rest_size, s, ap);
-    
-    if (res > -1 && res < rest_size) {
+  if (mess_buffer) {
+    len = strlen(mess_buffer);
+    while (1) {
+      char *buf_ptr = mess_buffer + len;
+      int rest_size = bufsize - len;
+      
+#if HAVE_VSNPRINTF
+      res = vsnprintf(buf_ptr, rest_size, s, ap);
+      
+      if (res > -1 && res < rest_size) {
+       break;
+      }
+      else  {
+       bufsize *= 2;
+       mess_buffer = realloc(mess_buffer, bufsize);
+      }
+#else /* not HAVE_VSNPRINTF */
+#  if HAVE_VSPRINTF
+#     warning "Using VSPRINTF. Buffer overflow could happen!"
+      vsprintf(buf_ptr, s, ap);
       break;
-    }
-    else  {
-      bufsize *= 2;
-      mess_buffer = realloc(mess_buffer, bufsize);
+#  else /* not HAVE_VPRINTF */
+#     error "Your standard library has neither vsnprintf nor vsprintf defined. One of them is required!"
+#  endif
+#endif
     }
   }
-  return res;  
+  return res;
 }
 
-int safe_buf_append(char *s, ...)
+int safe_buf_append(const char *s, ...)
 {
   int res;
   va_list ap;
@@ -85,7 +118,7 @@ int safe_buf_append(char *s, ...)
   return res;
 }
 
-int gedcom_message(char* s, ...)
+int gedcom_message(const char* s, ...)
 {
   int res;
   va_list ap;
@@ -94,42 +127,50 @@ int gedcom_message(char* s, ...)
   reset_mess_buffer();
   res = safe_buf_vappend(s, ap);
   va_end(ap);
-  safe_buf_append("\n");
   if (msg_handler)
     (*msg_handler)(MESSAGE, mess_buffer);
   return res;
 }
 
-int gedcom_warning(char* s, ...)
+int gedcom_warning(const char* s, ...)
 {
   int res;
   va_list ap;
 
   reset_mess_buffer();
-  safe_buf_append("Warning on line %d: ", line_no);
+  if (line_no != 0) 
+    safe_buf_append(_("Warning on line %d: "), line_no);
+  else
+    safe_buf_append(_("Warning: "));
   va_start(ap, s);
   res = safe_buf_vappend(s, ap);
   va_end(ap);
-  safe_buf_append("\n");
   if (msg_handler)
     (*msg_handler)(WARNING, mess_buffer);
   
   return res;
 }
 
-int gedcom_error(char* s, ...)
+int gedcom_error(const char* s, ...)
 {
   int res;
   va_list ap;
 
   reset_mess_buffer();
-  safe_buf_append("Error on line %d: ", line_no);
+  if (line_no != 0)
+    safe_buf_append(_("Error on line %d: "), line_no);
+  else
+    safe_buf_append(_("Error: "));
   va_start(ap, s);
   res = safe_buf_vappend(s, ap);
   va_end(ap);
-  safe_buf_append("\n");
   if (msg_handler)
     (*msg_handler)(ERROR, mess_buffer);
   
   return res;
 }
+
+void gedcom_mem_error(const char *filename, int line)
+{
+  gedcom_error(_("Could not allocate memory at %s, %d"), filename, line);
+}