ncurses 5.7 - patch 20100306

[ncurses.git] / ncurses / base / safe_sprintf.c

diff --git a/ncurses/base/safe_sprintf.c b/ncurses/base/safe_sprintf.c
index cb48365f7f51074571dd196b8dfebae1161409b7..2c82be9ed3b14975fa80e40be0df64c5ccfafaca 100644 (file)
--- a/ncurses/base/safe_sprintf.c
+++ b/ncurses/base/safe_sprintf.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998,1999,2000 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -33,7 +33,7 @@
 #include <curses.priv.h>
 #include <ctype.h>
 
-MODULE_ID("$Id: safe_sprintf.c,v 1.14 2001/07/08 00:58:34 tom Exp $")
+MODULE_ID("$Id: safe_sprintf.c,v 1.23 2010/03/06 20:26:10 tom Exp $")
 
 #if USE_SAFE_SPRINTF
 
@@ -56,10 +56,13 @@ _nc_printf_length(const char *fmt, va_list ap)
     char *buffer;
     char *format;
     int len = 0;
+    size_t fmt_len;
+    char fmt_arg[BUFSIZ];
 
     if (fmt == 0 || *fmt == '\0')
-       return -1;
-    if ((format = typeMalloc(char, strlen(fmt) + 1)) == 0)
+       return 0;
+    fmt_len = strlen(fmt) + 1;
+    if ((format = typeMalloc(char, fmt_len)) == 0)
          return -1;
     if ((buffer = typeMalloc(char, length)) == 0) {
        free(format);
@@ -106,7 +109,12 @@ _nc_printf_length(const char *fmt, va_list ap)
                    } else if (state == Prec) {
                        prec = ival;
                    }
-                   sprintf(&format[--f], "%d", ival);
+                   sprintf(fmt_arg, "%d", ival);
+                   fmt_len += strlen(fmt_arg);
+                   if ((format = _nc_doalloc(format, fmt_len)) == 0) {
+                       return -1;
+                   }
+                   strcpy(&format[--f], fmt_arg);
                    f = strlen(format);
                } else if (isalpha(UChar(*fmt))) {
                    done = TRUE;
@@ -199,46 +207,73 @@ _nc_printf_length(const char *fmt, va_list ap)
 }
 #endif
 
+#define my_buffer _nc_globals.safeprint_buf
+#define my_length _nc_globals.safeprint_used
+
 /*
  * Wrapper for vsprintf that allocates a buffer big enough to hold the result.
  */
 NCURSES_EXPORT(char *)
-_nc_printf_string
-(const char *fmt, va_list ap)
+NCURSES_SP_NAME(_nc_printf_string) (NCURSES_SP_DCLx
+                                   const char *fmt,
+                                   va_list ap)
 {
+    char *result = 0;
+
+    if (fmt != 0) {
 #if USE_SAFE_SPRINTF
-    char *buf = 0;
-    int len = _nc_printf_length(fmt, ap);
+       va_list ap2;
+       int len;
 
-    if (len > 0) {
-       if ((buf = typeMalloc(char, len + 1)) == 0)
-             return (0);
-       vsprintf(buf, fmt, ap);
-    }
+       begin_va_copy(ap2, ap);
+       len = _nc_printf_length(fmt, ap2);
+       end_va_copy(ap2);
+
+       if ((int) my_length < len + 1) {
+           my_length = 2 * (len + 1);
+           my_buffer = typeRealloc(char, my_length, my_buffer);
+       }
+       if (my_buffer != 0) {
+           *my_buffer = '\0';
+           if (len >= 0) {
+               vsprintf(my_buffer, fmt, ap);
+           }
+           result = my_buffer;
+       }
 #else
-    static int rows, cols;
-    static char *buf;
-    static size_t len;
-
-    if (screen_lines > rows || screen_columns > cols) {
-       if (screen_lines > rows)
-           rows = screen_lines;
-       if (screen_columns > cols)
-           cols = screen_columns;
-       len = (rows * (cols + 1)) + 1;
-       buf = typeRealloc(char, len, buf);
-       if (buf == 0) {
-           return (0);
+#define MyCols _nc_globals.safeprint_cols
+#define MyRows _nc_globals.safeprint_rows
+
+       if (screen_lines(SP_PARM) > MyRows || screen_columns(SP_PARM) > MyCols) {
+           if (screen_lines(SP_PARM) > MyRows)
+               MyRows = screen_lines(SP_PARM);
+           if (screen_columns(SP_PARM) > MyCols)
+               MyCols = screen_columns(SP_PARM);
+           my_length = (MyRows * (MyCols + 1)) + 1;
+           my_buffer = typeRealloc(char, my_length, my_buffer);
        }
-    }
 
-    if (buf != 0) {
+       if (my_buffer != 0) {
 # if HAVE_VSNPRINTF
-       vsnprintf(buf, len, fmt, ap);   /* GNU extension */
+           vsnprintf(my_buffer, my_length, fmt, ap);   /* GNU extension */
 # else
-       vsprintf(buf, fmt, ap); /* ANSI */
+           vsprintf(my_buffer, fmt, ap);       /* ANSI */
 # endif
-    }
+           result = my_buffer;
+       }
 #endif
-    return buf;
+    } else if (my_buffer != 0) {       /* see _nc_freeall() */
+       free(my_buffer);
+       my_buffer = 0;
+       my_length = 0;
+    }
+    return result;
 }
+
+#if NCURSES_SP_FUNCS
+NCURSES_EXPORT(char *)
+_nc_printf_string(const char *fmt, va_list ap)
+{
+    return NCURSES_SP_NAME(_nc_printf_string) (CURRENT_SCREEN, fmt, ap);
+}
+#endif