Don't abort in doprnt when passed unsupported %ll modifier.

 src/doprnt.c (doprnt) [!HAVE_LONG_LONG_INT]: Error out instead of
 aborting when %lld or %lll format is passed.
 [!HAVE_UNSIGNED_LONG_LONG_INT]: Error out instead of aborting when
 %llo or %llx format is passed.  (Bug#8545)

diff --git a/src/ChangeLog b/src/ChangeLog
index f029daa684d43ad3b8e1c290de53c8b01e1eb18c..14d5ac9de4850ad3e814111e996b5e42125b857d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
 2011-04-29  Eli Zaretskii  <eliz@gnu.org>
 
+       * doprnt.c (doprnt) [!HAVE_LONG_LONG_INT]: Error out instead of
+       aborting when %lld or %lll format is passed.
+       [!HAVE_UNSIGNED_LONG_LONG_INT]: Error out instead of aborting when
+       %llo or %llx format is passed.  (Bug#8545)
+
        * window.c (window_scroll_line_based): Use a marker instead of
        simple variables to record original value of point.  (Bug#7952)
 

diff --git a/src/doprnt.c b/src/doprnt.c
index 2508ddd831a0dc2a85d5e97c69ff43788a4d7b76..7b4bd35d5b11cba4ff3f9c5c2572031233c9848e 100644 (file)
--- a/src/doprnt.c
+++ b/src/doprnt.c
@@ -269,7 +269,7 @@ doprnt (char *buffer, register size_t bufsize, const char *format,
                    long long ll = va_arg (ap, long long);
                    sprintf (sprintf_buffer, fmtcpy, ll);
 #else
-                   abort ();
+                   error ("Invalid format operation %%ll%c", fmt[-1]);
 #endif
                  }
                else if (long_flag)
@@ -299,7 +299,7 @@ doprnt (char *buffer, register size_t bufsize, const char *format,
                    unsigned long long ull = va_arg (ap, unsigned long long);
                    sprintf (sprintf_buffer, fmtcpy, ull);
 #else
-                   abort ();
+                   error ("Invalid format operation %%ll%c", fmt[-1]);
 #endif
                  }
                else if (long_flag)